diff options
Diffstat (limited to 'src/plugins/fs')
-rw-r--r-- | src/plugins/fs/collection.c | 3 | ||||
-rw-r--r-- | src/plugins/fs/fs.c | 26 | ||||
-rw-r--r-- | src/plugins/fs/namespace.c | 8 | ||||
-rw-r--r-- | src/plugins/fs/namespace_search.c | 19 | ||||
-rw-r--r-- | src/plugins/fs/search.c | 39 |
5 files changed, 50 insertions, 45 deletions
diff --git a/src/plugins/fs/collection.c b/src/plugins/fs/collection.c index 067dce3c..5009b0a2 100644 --- a/src/plugins/fs/collection.c +++ b/src/plugins/fs/collection.c | |||
@@ -137,7 +137,8 @@ deleteCollection_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2) | |||
137 | } | 137 | } |
138 | else | 138 | else |
139 | { | 139 | { |
140 | GNUNET_GTK_show_info_message (_("Failed to stop collection (consult logs).\n")); | 140 | GNUNET_GTK_show_info_message (_ |
141 | ("Failed to stop collection (consult logs).\n")); | ||
141 | } | 142 | } |
142 | } | 143 | } |
143 | 144 | ||
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c index e00668a0..55505074 100644 --- a/src/plugins/fs/fs.c +++ b/src/plugins/fs/fs.c | |||
@@ -676,23 +676,21 @@ fs_summary_stop () | |||
676 | 676 | ||
677 | } | 677 | } |
678 | 678 | ||
679 | static void | 679 | static void |
680 | init_cron_job(void * arg) | 680 | init_cron_job (void *arg) |
681 | { | 681 | { |
682 | GtkWidget * tab = arg; | 682 | GtkWidget *tab = arg; |
683 | 683 | ||
684 | ctx = GNUNET_FSUI_start (ectx, cfg, "gnunet-gtk", | 684 | ctx = GNUNET_FSUI_start (ectx, cfg, "gnunet-gtk", 8, /* FIXME: allow user to configure download parallelism */ |
685 | 8, /* FIXME: allow user to configure download parallelism */ | ||
686 | GNUNET_YES, &eventProcessor, NULL); | 685 | GNUNET_YES, &eventProcessor, NULL); |
687 | GNUNET_GTK_save_call((GNUNET_ThreadMainFunction) >k_widget_show, | 686 | GNUNET_GTK_save_call ((GNUNET_ThreadMainFunction) & gtk_widget_show, tab); |
688 | tab); | ||
689 | } | 687 | } |
690 | 688 | ||
691 | void | 689 | void |
692 | init_fs (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration *c) | 690 | init_fs (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration *c) |
693 | { | 691 | { |
694 | GtkWidget *tab; | 692 | GtkWidget *tab; |
695 | struct GNUNET_CronManager * cron; | 693 | struct GNUNET_CronManager *cron; |
696 | 694 | ||
697 | ectx = e; | 695 | ectx = e; |
698 | cfg = c; | 696 | cfg = c; |
@@ -701,8 +699,8 @@ init_fs (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration *c) | |||
701 | fs_collection_start (); | 699 | fs_collection_start (); |
702 | fs_namespace_start (); | 700 | fs_namespace_start (); |
703 | tab = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "fsnotebook"); | 701 | tab = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "fsnotebook"); |
704 | cron = GNUNET_GTK_get_cron_manager(); | 702 | cron = GNUNET_GTK_get_cron_manager (); |
705 | GNUNET_cron_add_job(cron, &init_cron_job, 0, 0, tab); | 703 | GNUNET_cron_add_job (cron, &init_cron_job, 0, 0, tab); |
706 | } | 704 | } |
707 | 705 | ||
708 | static void * | 706 | static void * |
@@ -712,19 +710,19 @@ cleanup_save_call (void *arg) | |||
712 | 710 | ||
713 | fs_summary_stop (); | 711 | fs_summary_stop (); |
714 | fs_namespace_stop (); | 712 | fs_namespace_stop (); |
715 | gtk_widget_hide(tab); | 713 | gtk_widget_hide (tab); |
716 | return NULL; | 714 | return NULL; |
717 | } | 715 | } |
718 | 716 | ||
719 | void | 717 | void |
720 | done_fs () | 718 | done_fs () |
721 | { | 719 | { |
722 | struct GNUNET_CronManager * cron; | 720 | struct GNUNET_CronManager *cron; |
723 | GtkWidget *tab; | 721 | GtkWidget *tab; |
724 | 722 | ||
725 | tab = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "fsnotebook"); | 723 | tab = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "fsnotebook"); |
726 | cron = GNUNET_GTK_get_cron_manager(); | 724 | cron = GNUNET_GTK_get_cron_manager (); |
727 | GNUNET_cron_del_job(cron, &init_cron_job, 0, tab); | 725 | GNUNET_cron_del_job (cron, &init_cron_job, 0, tab); |
728 | if (ctx != NULL) | 726 | if (ctx != NULL) |
729 | GNUNET_FSUI_stop (ctx); | 727 | GNUNET_FSUI_stop (ctx); |
730 | GNUNET_GTK_save_call (&cleanup_save_call, tab); | 728 | GNUNET_GTK_save_call (&cleanup_save_call, tab); |
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c index 987d0264..3e7108f1 100644 --- a/src/plugins/fs/namespace.c +++ b/src/plugins/fs/namespace.c | |||
@@ -120,9 +120,11 @@ makeNamespaceFrame (NamespaceList * entry) | |||
120 | = glade_xml_new (GNUNET_GTK_get_glade_filename (), | 120 | = glade_xml_new (GNUNET_GTK_get_glade_filename (), |
121 | "namespaceContentFrame", PACKAGE_NAME); | 121 | "namespaceContentFrame", PACKAGE_NAME); |
122 | GNUNET_GTK_connect_glade_with_plugins (namespaceXML); | 122 | GNUNET_GTK_connect_glade_with_plugins (namespaceXML); |
123 | child = GNUNET_GTK_extract_main_widget_from_window (namespaceXML, "namespaceContentFrame"); | 123 | child = |
124 | resultList = glade_xml_get_widget (namespaceXML, | 124 | GNUNET_GTK_extract_main_widget_from_window (namespaceXML, |
125 | "namespaceContentFrameTreeView"); | 125 | "namespaceContentFrame"); |
126 | resultList = | ||
127 | glade_xml_get_widget (namespaceXML, "namespaceContentFrameTreeView"); | ||
126 | entry->addButton = glade_xml_get_widget (namespaceXML, "addButton"); | 128 | entry->addButton = glade_xml_get_widget (namespaceXML, "addButton"); |
127 | entry->updateButton = glade_xml_get_widget (namespaceXML, | 129 | entry->updateButton = glade_xml_get_widget (namespaceXML, |
128 | "namespaceUpdateButton"); | 130 | "namespaceUpdateButton"); |
diff --git a/src/plugins/fs/namespace_search.c b/src/plugins/fs/namespace_search.c index ed134192..83c0848e 100644 --- a/src/plugins/fs/namespace_search.c +++ b/src/plugins/fs/namespace_search.c | |||
@@ -80,10 +80,10 @@ on_namespaceRatingSpinButton_changed_fs (GtkWidget * dummy, | |||
80 | { | 80 | { |
81 | if (nsName != NULL) | 81 | if (nsName != NULL) |
82 | { | 82 | { |
83 | GNUNET_GE_ASSERT(NULL, | 83 | GNUNET_GE_ASSERT (NULL, |
84 | GNUNET_OK == | 84 | GNUNET_OK == |
85 | GNUNET_pseudonym_name_to_id(ectx, cfg, | 85 | GNUNET_pseudonym_name_to_id (ectx, cfg, |
86 | nsName, &nsid)); | 86 | nsName, &nsid)); |
87 | newrating = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin)); | 87 | newrating = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin)); |
88 | rating = GNUNET_pseudonym_rank (ectx, | 88 | rating = GNUNET_pseudonym_rank (ectx, |
89 | cfg, &nsid, newrating - rating); | 89 | cfg, &nsid, newrating - rating); |
@@ -157,10 +157,10 @@ on_searchNamespaceComboBoxEntry_changed_fs (GtkWidget * dummy, | |||
157 | } | 157 | } |
158 | else if (nsName != NULL) | 158 | else if (nsName != NULL) |
159 | { | 159 | { |
160 | GNUNET_GE_ASSERT(NULL, | 160 | GNUNET_GE_ASSERT (NULL, |
161 | GNUNET_OK == | 161 | GNUNET_OK == |
162 | GNUNET_pseudonym_name_to_id(ectx, cfg, | 162 | GNUNET_pseudonym_name_to_id (ectx, cfg, |
163 | nsName, &ns)); | 163 | nsName, &ns)); |
164 | gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), rating); | 164 | gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), rating); |
165 | gtk_widget_set_sensitive (spin, TRUE); | 165 | gtk_widget_set_sensitive (spin, TRUE); |
166 | keyword | 166 | keyword |
@@ -261,7 +261,8 @@ saveDiscovery (void *cls) | |||
261 | } | 261 | } |
262 | if (found == GNUNET_NO) | 262 | if (found == GNUNET_NO) |
263 | { | 263 | { |
264 | GNUNET_GTK_show_info_message (_("Namespace `%s' found: %s.\n"), nni->namespaceName, desc); | 264 | GNUNET_GTK_show_info_message (_("Namespace `%s' found: %s.\n"), |
265 | nni->namespaceName, desc); | ||
265 | gtk_list_store_append (model, &iter); | 266 | gtk_list_store_append (model, &iter); |
266 | gtk_list_store_set (model, | 267 | gtk_list_store_set (model, |
267 | &iter, | 268 | &iter, |
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c index aaabb079..889e5ff1 100644 --- a/src/plugins/fs/search.c +++ b/src/plugins/fs/search.c | |||
@@ -255,13 +255,13 @@ addEntryToSearchTree (SearchList * searchContext, | |||
255 | } | 255 | } |
256 | } | 256 | } |
257 | #else | 257 | #else |
258 | mime = GNUNET_strdup(rawMime); | 258 | mime = GNUNET_strdup (rawMime); |
259 | #endif | 259 | #endif |
260 | 260 | ||
261 | gtk_tree_store_set (searchContext->tree, iter, | 261 | gtk_tree_store_set (searchContext->tree, iter, |
262 | SEARCH_NAME, name, SEARCH_SIZE, size, SEARCH_HSIZE, | 262 | SEARCH_NAME, name, SEARCH_SIZE, size, SEARCH_HSIZE, |
263 | size_h, SEARCH_MIME, mime, | 263 | size_h, SEARCH_MIME, mime, |
264 | SEARCH_RAW_MIME, rawMime, SEARCH_DESC, desc, | 264 | SEARCH_RAW_MIME, rawMime, SEARCH_DESC, desc, |
265 | SEARCH_PIXBUF, pixbuf, SEARCH_URI, | 265 | SEARCH_PIXBUF, pixbuf, SEARCH_URI, |
266 | GNUNET_ECRS_uri_duplicate (info->uri), SEARCH_META, | 266 | GNUNET_ECRS_uri_duplicate (info->uri), SEARCH_META, |
267 | GNUNET_meta_data_duplicate (info->meta), | 267 | GNUNET_meta_data_duplicate (info->meta), |
@@ -270,11 +270,11 @@ addEntryToSearchTree (SearchList * searchContext, | |||
270 | searchContext, SEARCH_INTERNAL_PARENT, downloadParent, | 270 | searchContext, SEARCH_INTERNAL_PARENT, downloadParent, |
271 | SEARCH_STATUS, getStatusName (state), | 271 | SEARCH_STATUS, getStatusName (state), |
272 | SEARCH_APPLICABILITY_RANK, 1, SEARCH_RANK_SORT, | 272 | SEARCH_APPLICABILITY_RANK, 1, SEARCH_RANK_SORT, |
273 | (long long) 1, SEARCH_RANK_PIXBUF, rankbuf, | 273 | (long long) 1, SEARCH_RANK_PIXBUF, rankbuf, |
274 | #ifdef HAVE_GIO | 274 | #ifdef HAVE_GIO |
275 | SEARCH_ICON, icon, | 275 | SEARCH_ICON, icon, |
276 | #endif | 276 | #endif |
277 | -1); | 277 | -1); |
278 | g_object_unref (rankbuf); | 278 | g_object_unref (rankbuf); |
279 | if (pixbuf != NULL) | 279 | if (pixbuf != NULL) |
280 | g_object_unref (pixbuf); | 280 | g_object_unref (pixbuf); |
@@ -711,15 +711,16 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list, | |||
711 | PACKAGE_NAME); | 711 | PACKAGE_NAME); |
712 | GNUNET_GTK_connect_glade_with_plugins (list->searchXML); | 712 | GNUNET_GTK_connect_glade_with_plugins (list->searchXML); |
713 | list->searchpage | 713 | list->searchpage |
714 | = GNUNET_GTK_extract_main_widget_from_window (list->searchXML, "searchResultsFrame"); | 714 | = |
715 | GNUNET_GTK_extract_main_widget_from_window (list->searchXML, | ||
716 | "searchResultsFrame"); | ||
715 | /* setup tree view and renderers */ | 717 | /* setup tree view and renderers */ |
716 | list->treeview = GTK_TREE_VIEW (glade_xml_get_widget (list->searchXML, | 718 | list->treeview = GTK_TREE_VIEW (glade_xml_get_widget (list->searchXML, |
717 | "searchResults")); | 719 | "searchResults")); |
718 | g_signal_connect_swapped (list->treeview, | 720 | g_signal_connect_swapped (list->treeview, |
719 | "button-press-event", | 721 | "button-press-event", |
720 | G_CALLBACK (search_click_handler), list); | 722 | G_CALLBACK (search_click_handler), list); |
721 | list->tree = gtk_tree_store_new (SEARCH_NUM, | 723 | list->tree = gtk_tree_store_new (SEARCH_NUM, G_TYPE_STRING, /* name */ |
722 | G_TYPE_STRING, /* name */ | ||
723 | G_TYPE_UINT64, /* size */ | 724 | G_TYPE_UINT64, /* size */ |
724 | G_TYPE_STRING, /* human-readable size */ | 725 | G_TYPE_STRING, /* human-readable size */ |
725 | G_TYPE_STRING, /* mime-type */ | 726 | G_TYPE_STRING, /* mime-type */ |
@@ -739,7 +740,7 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list, | |||
739 | GDK_TYPE_PIXBUF, /* ranking visualization */ | 740 | GDK_TYPE_PIXBUF, /* ranking visualization */ |
740 | G_TYPE_INT64 /* numeric sort */ | 741 | G_TYPE_INT64 /* numeric sort */ |
741 | #ifdef HAVE_GIO | 742 | #ifdef HAVE_GIO |
742 | , GDK_TYPE_PIXBUF /* icon */ | 743 | , GDK_TYPE_PIXBUF /* icon */ |
743 | #endif | 744 | #endif |
744 | ); | 745 | ); |
745 | 746 | ||
@@ -935,7 +936,9 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list, | |||
935 | "searchTabLabelWindow", PACKAGE_NAME); | 936 | "searchTabLabelWindow", PACKAGE_NAME); |
936 | GNUNET_GTK_connect_glade_with_plugins (list->labelXML); | 937 | GNUNET_GTK_connect_glade_with_plugins (list->labelXML); |
937 | list->tab_label | 938 | list->tab_label |
938 | = GNUNET_GTK_extract_main_widget_from_window (list->labelXML, "searchTabLabelWindow"); | 939 | = |
940 | GNUNET_GTK_extract_main_widget_from_window (list->labelXML, | ||
941 | "searchTabLabelWindow"); | ||
939 | /* process existing results */ | 942 | /* process existing results */ |
940 | for (i = 0; i < resultCount; i++) | 943 | for (i = 0; i < resultCount; i++) |
941 | fs_search_result_received (list, &results[i], uri); | 944 | fs_search_result_received (list, &results[i], uri); |
@@ -1186,14 +1189,14 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton) | |||
1186 | if (nsName != NULL) | 1189 | if (nsName != NULL) |
1187 | { | 1190 | { |
1188 | char *ustring; | 1191 | char *ustring; |
1189 | GNUNET_EncName enc; | 1192 | GNUNET_EncName enc; |
1190 | GNUNET_HashCode nsid; | 1193 | GNUNET_HashCode nsid; |
1191 | 1194 | ||
1192 | GNUNET_GE_ASSERT(NULL, | 1195 | GNUNET_GE_ASSERT (NULL, |
1193 | GNUNET_OK == | 1196 | GNUNET_OK == |
1194 | GNUNET_pseudonym_name_to_id(ectx, cfg, | 1197 | GNUNET_pseudonym_name_to_id (ectx, cfg, |
1195 | nsName, &nsid)); | 1198 | nsName, &nsid)); |
1196 | GNUNET_hash_to_enc(&nsid, &enc); | 1199 | GNUNET_hash_to_enc (&nsid, &enc); |
1197 | 1200 | ||
1198 | ustring = | 1201 | ustring = |
1199 | GNUNET_malloc (strlen (searchString) + sizeof (GNUNET_EncName) + | 1202 | GNUNET_malloc (strlen (searchString) + sizeof (GNUNET_EncName) + |
@@ -1201,7 +1204,7 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton) | |||
1201 | strlen (GNUNET_ECRS_SUBSPACE_INFIX) + 10); | 1204 | strlen (GNUNET_ECRS_SUBSPACE_INFIX) + 10); |
1202 | strcpy (ustring, GNUNET_ECRS_URI_PREFIX); | 1205 | strcpy (ustring, GNUNET_ECRS_URI_PREFIX); |
1203 | strcat (ustring, GNUNET_ECRS_SUBSPACE_INFIX); | 1206 | strcat (ustring, GNUNET_ECRS_SUBSPACE_INFIX); |
1204 | strcat (ustring, (const char*)&enc); | 1207 | strcat (ustring, (const char *) &enc); |
1205 | strcat (ustring, "/"); | 1208 | strcat (ustring, "/"); |
1206 | strcat (ustring, searchString); | 1209 | strcat (ustring, searchString); |
1207 | fsss.uri = GNUNET_ECRS_string_to_uri (ectx, ustring); | 1210 | fsss.uri = GNUNET_ECRS_string_to_uri (ectx, ustring); |