diff options
author | Christian Grothoff <christian@grothoff.org> | 2006-10-24 21:56:49 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2006-10-24 21:56:49 +0000 |
commit | 6af3cb961a2e9ad2117170521b6b1ea5f42ece29 (patch) | |
tree | f46831e635ed8f28cf4388139b84f8eadef0db1e | |
parent | 2fb5671f1521c7660a948a2a33b7e31a2545fd56 (diff) | |
download | gnunet-gtk-6af3cb961a2e9ad2117170521b6b1ea5f42ece29.tar.gz gnunet-gtk-6af3cb961a2e9ad2117170521b6b1ea5f42ece29.zip |
fix
-rw-r--r-- | gnunet-gtk.glade | 88 | ||||
-rw-r--r-- | src/common/helper.c | 2 | ||||
-rw-r--r-- | src/plugins/fs/download.c | 12 | ||||
-rw-r--r-- | src/plugins/fs/namespace.c | 50 | ||||
-rw-r--r-- | src/plugins/fs/search.c | 22 | ||||
-rw-r--r-- | src/plugins/fs/upload.c | 20 |
6 files changed, 97 insertions, 97 deletions
diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade index 3f1b0229..6d353f69 100644 --- a/gnunet-gtk.glade +++ b/gnunet-gtk.glade | |||
@@ -75,7 +75,7 @@ | |||
75 | <property name="use_stock">True</property> | 75 | <property name="use_stock">True</property> |
76 | <property name="relief">GTK_RELIEF_NORMAL</property> | 76 | <property name="relief">GTK_RELIEF_NORMAL</property> |
77 | <property name="focus_on_click">True</property> | 77 | <property name="focus_on_click">True</property> |
78 | <signal name="clicked" handler="on_about_clicked" last_modification_time="Sat, 28 May 2005 14:28:13 GMT"/> | 78 | <signal name="clicked" handler="on_about_clicked_" last_modification_time="Sat, 28 May 2005 14:28:13 GMT"/> |
79 | </widget> | 79 | </widget> |
80 | <packing> | 80 | <packing> |
81 | <property name="padding">0</property> | 81 | <property name="padding">0</property> |
@@ -288,7 +288,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
288 | <property name="can_focus">True</property> | 288 | <property name="can_focus">True</property> |
289 | <property name="relief">GTK_RELIEF_NORMAL</property> | 289 | <property name="relief">GTK_RELIEF_NORMAL</property> |
290 | <property name="focus_on_click">True</property> | 290 | <property name="focus_on_click">True</property> |
291 | <signal name="clicked" handler="on_startDaemon_clicked" last_modification_time="Mon, 23 May 2005 19:05:11 GMT"/> | 291 | <signal name="clicked" handler="on_startDaemon_clicked_" last_modification_time="Mon, 23 May 2005 19:05:11 GMT"/> |
292 | 292 | ||
293 | <child> | 293 | <child> |
294 | <widget class="GtkAlignment" id="alignment1"> | 294 | <widget class="GtkAlignment" id="alignment1"> |
@@ -368,7 +368,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
368 | <property name="can_focus">True</property> | 368 | <property name="can_focus">True</property> |
369 | <property name="relief">GTK_RELIEF_NORMAL</property> | 369 | <property name="relief">GTK_RELIEF_NORMAL</property> |
370 | <property name="focus_on_click">True</property> | 370 | <property name="focus_on_click">True</property> |
371 | <signal name="clicked" handler="on_stopDaemon_clicked" last_modification_time="Mon, 23 May 2005 19:05:25 GMT"/> | 371 | <signal name="clicked" handler="on_stopDaemon_clicked_" last_modification_time="Mon, 23 May 2005 19:05:25 GMT"/> |
372 | 372 | ||
373 | <child> | 373 | <child> |
374 | <widget class="GtkAlignment" id="alignment2"> | 374 | <widget class="GtkAlignment" id="alignment2"> |
@@ -590,7 +590,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
590 | <property name="can_focus">True</property> | 590 | <property name="can_focus">True</property> |
591 | <property name="relief">GTK_RELIEF_NORMAL</property> | 591 | <property name="relief">GTK_RELIEF_NORMAL</property> |
592 | <property name="focus_on_click">True</property> | 592 | <property name="focus_on_click">True</property> |
593 | <signal name="clicked" handler="on_startDaemonConfWizard_clicked" last_modification_time="Sun, 11 Jun 2006 16:32:49 GMT"/> | 593 | <signal name="clicked" handler="on_startDaemonConfWizard_clicked_" last_modification_time="Sun, 11 Jun 2006 16:32:49 GMT"/> |
594 | 594 | ||
595 | <child> | 595 | <child> |
596 | <widget class="GtkAlignment" id="alignment22"> | 596 | <widget class="GtkAlignment" id="alignment22"> |
@@ -669,7 +669,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
669 | <property name="can_focus">True</property> | 669 | <property name="can_focus">True</property> |
670 | <property name="relief">GTK_RELIEF_NORMAL</property> | 670 | <property name="relief">GTK_RELIEF_NORMAL</property> |
671 | <property name="focus_on_click">True</property> | 671 | <property name="focus_on_click">True</property> |
672 | <signal name="clicked" handler="on_startDaemonConfTool_clicked" last_modification_time="Thu, 22 Jun 2006 17:05:35 GMT"/> | 672 | <signal name="clicked" handler="on_startDaemonConfTool_clicked_" last_modification_time="Thu, 22 Jun 2006 17:05:35 GMT"/> |
673 | 673 | ||
674 | <child> | 674 | <child> |
675 | <widget class="GtkAlignment" id="alignment23"> | 675 | <widget class="GtkAlignment" id="alignment23"> |
@@ -915,7 +915,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
915 | <property name="use_stock">True</property> | 915 | <property name="use_stock">True</property> |
916 | <property name="relief">GTK_RELIEF_NORMAL</property> | 916 | <property name="relief">GTK_RELIEF_NORMAL</property> |
917 | <property name="focus_on_click">True</property> | 917 | <property name="focus_on_click">True</property> |
918 | <signal name="clicked" handler="on_abortSearchButton_clicked" last_modification_time="Sun, 22 Oct 2006 06:07:10 GMT"/> | 918 | <signal name="clicked" handler="on_abortSearchButton_clicked_" last_modification_time="Sun, 22 Oct 2006 06:07:10 GMT"/> |
919 | </widget> | 919 | </widget> |
920 | <packing> | 920 | <packing> |
921 | <property name="padding">0</property> | 921 | <property name="padding">0</property> |
@@ -933,7 +933,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
933 | <property name="use_stock">True</property> | 933 | <property name="use_stock">True</property> |
934 | <property name="relief">GTK_RELIEF_NORMAL</property> | 934 | <property name="relief">GTK_RELIEF_NORMAL</property> |
935 | <property name="focus_on_click">True</property> | 935 | <property name="focus_on_click">True</property> |
936 | <signal name="clicked" handler="on_stopSearchButton_clicked" last_modification_time="Sun, 22 Oct 2006 06:07:31 GMT"/> | 936 | <signal name="clicked" handler="on_stopSearchButton_clicked_" last_modification_time="Sun, 22 Oct 2006 06:07:31 GMT"/> |
937 | </widget> | 937 | </widget> |
938 | <packing> | 938 | <packing> |
939 | <property name="padding">0</property> | 939 | <property name="padding">0</property> |
@@ -1090,7 +1090,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
1090 | <property name="can_focus">True</property> | 1090 | <property name="can_focus">True</property> |
1091 | <property name="relief">GTK_RELIEF_NORMAL</property> | 1091 | <property name="relief">GTK_RELIEF_NORMAL</property> |
1092 | <property name="focus_on_click">True</property> | 1092 | <property name="focus_on_click">True</property> |
1093 | <signal name="clicked" handler="on_statusDownloadURIEntry_editing_done" object="statusDownloadURIEntry" last_modification_time="Tue, 02 May 2006 05:03:46 GMT"/> | 1093 | <signal name="clicked" handler="on_statusDownloadURIEntry_editing_done_" object="statusDownloadURIEntry" last_modification_time="Tue, 02 May 2006 05:03:46 GMT"/> |
1094 | 1094 | ||
1095 | <child> | 1095 | <child> |
1096 | <widget class="GtkAlignment" id="alignment19"> | 1096 | <widget class="GtkAlignment" id="alignment19"> |
@@ -1255,7 +1255,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
1255 | <property name="use_stock">True</property> | 1255 | <property name="use_stock">True</property> |
1256 | <property name="relief">GTK_RELIEF_NORMAL</property> | 1256 | <property name="relief">GTK_RELIEF_NORMAL</property> |
1257 | <property name="focus_on_click">True</property> | 1257 | <property name="focus_on_click">True</property> |
1258 | <signal name="clicked" handler="on_stopDownloadButton_clicked" last_modification_time="Sun, 22 Oct 2006 06:00:17 GMT"/> | 1258 | <signal name="clicked" handler="on_stopDownloadButton_clicked_" last_modification_time="Sun, 22 Oct 2006 06:00:17 GMT"/> |
1259 | </widget> | 1259 | </widget> |
1260 | <packing> | 1260 | <packing> |
1261 | <property name="padding">0</property> | 1261 | <property name="padding">0</property> |
@@ -1273,7 +1273,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
1273 | <property name="use_stock">True</property> | 1273 | <property name="use_stock">True</property> |
1274 | <property name="relief">GTK_RELIEF_NORMAL</property> | 1274 | <property name="relief">GTK_RELIEF_NORMAL</property> |
1275 | <property name="focus_on_click">True</property> | 1275 | <property name="focus_on_click">True</property> |
1276 | <signal name="clicked" handler="on_clearCompletedDownloadsButton_clicked" last_modification_time="Wed, 01 Jun 2005 19:53:58 GMT"/> | 1276 | <signal name="clicked" handler="on_clearCompletedDownloadsButton_clicked_" last_modification_time="Wed, 01 Jun 2005 19:53:58 GMT"/> |
1277 | </widget> | 1277 | </widget> |
1278 | <packing> | 1278 | <packing> |
1279 | <property name="padding">0</property> | 1279 | <property name="padding">0</property> |
@@ -1379,7 +1379,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
1379 | <property name="use_stock">True</property> | 1379 | <property name="use_stock">True</property> |
1380 | <property name="relief">GTK_RELIEF_NORMAL</property> | 1380 | <property name="relief">GTK_RELIEF_NORMAL</property> |
1381 | <property name="focus_on_click">True</property> | 1381 | <property name="focus_on_click">True</property> |
1382 | <signal name="clicked" handler="on_abortUploadButton_clicked" last_modification_time="Sun, 22 Oct 2006 06:05:17 GMT"/> | 1382 | <signal name="clicked" handler="on_abortUploadButton_clicked_" last_modification_time="Sun, 22 Oct 2006 06:05:17 GMT"/> |
1383 | </widget> | 1383 | </widget> |
1384 | <packing> | 1384 | <packing> |
1385 | <property name="padding">0</property> | 1385 | <property name="padding">0</property> |
@@ -1397,7 +1397,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
1397 | <property name="use_stock">True</property> | 1397 | <property name="use_stock">True</property> |
1398 | <property name="relief">GTK_RELIEF_NORMAL</property> | 1398 | <property name="relief">GTK_RELIEF_NORMAL</property> |
1399 | <property name="focus_on_click">True</property> | 1399 | <property name="focus_on_click">True</property> |
1400 | <signal name="clicked" handler="on_stopUploadButton_clicked" last_modification_time="Sun, 22 Oct 2006 06:05:24 GMT"/> | 1400 | <signal name="clicked" handler="on_stopUploadButton_clicked_" last_modification_time="Sun, 22 Oct 2006 06:05:24 GMT"/> |
1401 | </widget> | 1401 | </widget> |
1402 | <packing> | 1402 | <packing> |
1403 | <property name="padding">0</property> | 1403 | <property name="padding">0</property> |
@@ -1415,7 +1415,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
1415 | <property name="use_stock">True</property> | 1415 | <property name="use_stock">True</property> |
1416 | <property name="relief">GTK_RELIEF_NORMAL</property> | 1416 | <property name="relief">GTK_RELIEF_NORMAL</property> |
1417 | <property name="focus_on_click">True</property> | 1417 | <property name="focus_on_click">True</property> |
1418 | <signal name="clicked" handler="on_clearCompletedDownloadsButton_clicked" last_modification_time="Wed, 01 Jun 2005 19:53:58 GMT"/> | 1418 | <signal name="clicked" handler="on_clearCompletedDownloadsButton_clicked_" last_modification_time="Wed, 01 Jun 2005 19:53:58 GMT"/> |
1419 | </widget> | 1419 | </widget> |
1420 | <packing> | 1420 | <packing> |
1421 | <property name="padding">0</property> | 1421 | <property name="padding">0</property> |
@@ -1604,7 +1604,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
1604 | <property name="can_focus">True</property> | 1604 | <property name="can_focus">True</property> |
1605 | <property name="relief">GTK_RELIEF_NORMAL</property> | 1605 | <property name="relief">GTK_RELIEF_NORMAL</property> |
1606 | <property name="focus_on_click">True</property> | 1606 | <property name="focus_on_click">True</property> |
1607 | <signal name="clicked" handler="on_fssearchbutton_clicked" last_modification_time="Mon, 23 May 2005 19:06:23 GMT"/> | 1607 | <signal name="clicked" handler="on_fssearchbutton_clicked_" last_modification_time="Mon, 23 May 2005 19:06:23 GMT"/> |
1608 | <accelerator key="Return" modifiers="0" signal="activate"/> | 1608 | <accelerator key="Return" modifiers="0" signal="activate"/> |
1609 | 1609 | ||
1610 | <child> | 1610 | <child> |
@@ -1887,7 +1887,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
1887 | <property name="add_tearoffs">False</property> | 1887 | <property name="add_tearoffs">False</property> |
1888 | <property name="has_frame">True</property> | 1888 | <property name="has_frame">True</property> |
1889 | <property name="focus_on_click">True</property> | 1889 | <property name="focus_on_click">True</property> |
1890 | <signal name="changed" handler="on_searchNamespaceComboBoxEntry_changed" last_modification_time="Fri, 26 Aug 2005 07:56:07 GMT"/> | 1890 | <signal name="changed" handler="on_searchNamespaceComboBoxEntry_changed_" last_modification_time="Fri, 26 Aug 2005 07:56:07 GMT"/> |
1891 | </widget> | 1891 | </widget> |
1892 | </child> | 1892 | </child> |
1893 | </widget> | 1893 | </widget> |
@@ -1911,7 +1911,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
1911 | <property name="snap_to_ticks">False</property> | 1911 | <property name="snap_to_ticks">False</property> |
1912 | <property name="wrap">False</property> | 1912 | <property name="wrap">False</property> |
1913 | <property name="adjustment">0 -100000 100000 1 10 10</property> | 1913 | <property name="adjustment">0 -100000 100000 1 10 10</property> |
1914 | <signal name="changed" handler="on_namespaceRatingSpinButton_changed" last_modification_time="Fri, 26 Aug 2005 07:55:50 GMT"/> | 1914 | <signal name="changed" handler="on_namespaceRatingSpinButton_changed_" last_modification_time="Fri, 26 Aug 2005 07:55:50 GMT"/> |
1915 | </widget> | 1915 | </widget> |
1916 | <packing> | 1916 | <packing> |
1917 | <property name="padding">0</property> | 1917 | <property name="padding">0</property> |
@@ -2340,7 +2340,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
2340 | <property name="can_focus">True</property> | 2340 | <property name="can_focus">True</property> |
2341 | <property name="relief">GTK_RELIEF_NORMAL</property> | 2341 | <property name="relief">GTK_RELIEF_NORMAL</property> |
2342 | <property name="focus_on_click">True</property> | 2342 | <property name="focus_on_click">True</property> |
2343 | <signal name="clicked" handler="on_fsinsertuploadbutton_clicked" last_modification_time="Mon, 23 May 2005 19:12:55 GMT"/> | 2343 | <signal name="clicked" handler="on_fsinsertuploadbutton_clicked_" last_modification_time="Mon, 23 May 2005 19:12:55 GMT"/> |
2344 | 2344 | ||
2345 | <child> | 2345 | <child> |
2346 | <widget class="GtkAlignment" id="alignment20"> | 2346 | <widget class="GtkAlignment" id="alignment20"> |
@@ -2513,7 +2513,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
2513 | <property name="can_focus">True</property> | 2513 | <property name="can_focus">True</property> |
2514 | <property name="relief">GTK_RELIEF_NORMAL</property> | 2514 | <property name="relief">GTK_RELIEF_NORMAL</property> |
2515 | <property name="focus_on_click">True</property> | 2515 | <property name="focus_on_click">True</property> |
2516 | <signal name="clicked" handler="on_mainFileSharingInsertBrowseButton_clicked" object="fsinsertfilenamecombo" last_modification_time="Mon, 23 May 2005 17:09:36 GMT"/> | 2516 | <signal name="clicked" handler="on_mainFileSharingInsertBrowseButton_clicked_" object="fsinsertfilenamecombo" last_modification_time="Mon, 23 May 2005 17:09:36 GMT"/> |
2517 | 2517 | ||
2518 | <child> | 2518 | <child> |
2519 | <widget class="GtkAlignment" id="alignment24"> | 2519 | <widget class="GtkAlignment" id="alignment24"> |
@@ -2828,7 +2828,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
2828 | <property name="visible">True</property> | 2828 | <property name="visible">True</property> |
2829 | <property name="label" translatable="yes">_Namespace</property> | 2829 | <property name="label" translatable="yes">_Namespace</property> |
2830 | <property name="use_underline">True</property> | 2830 | <property name="use_underline">True</property> |
2831 | <signal name="activate" handler="create_namespace_clicked" last_modification_time="Sat, 28 May 2005 14:39:59 GMT"/> | 2831 | <signal name="activate" handler="create_namespace_clicked_" last_modification_time="Sat, 28 May 2005 14:39:59 GMT"/> |
2832 | </widget> | 2832 | </widget> |
2833 | </child> | 2833 | </child> |
2834 | 2834 | ||
@@ -2837,7 +2837,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
2837 | <property name="visible">True</property> | 2837 | <property name="visible">True</property> |
2838 | <property name="label" translatable="yes">_Collection</property> | 2838 | <property name="label" translatable="yes">_Collection</property> |
2839 | <property name="use_underline">True</property> | 2839 | <property name="use_underline">True</property> |
2840 | <signal name="activate" handler="createCollection_clicked" last_modification_time="Sat, 28 May 2005 14:39:59 GMT"/> | 2840 | <signal name="activate" handler="createCollection_clicked_" last_modification_time="Sat, 28 May 2005 14:39:59 GMT"/> |
2841 | </widget> | 2841 | </widget> |
2842 | </child> | 2842 | </child> |
2843 | </widget> | 2843 | </widget> |
@@ -2872,7 +2872,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
2872 | <property name="tooltip" translatable="yes">Will prevent future insertions into the namespace (will not delete content in the namespace)</property> | 2872 | <property name="tooltip" translatable="yes">Will prevent future insertions into the namespace (will not delete content in the namespace)</property> |
2873 | <property name="label" translatable="yes">_Namespace</property> | 2873 | <property name="label" translatable="yes">_Namespace</property> |
2874 | <property name="use_underline">True</property> | 2874 | <property name="use_underline">True</property> |
2875 | <signal name="activate" handler="namespaceDelete_clicked" last_modification_time="Sat, 28 May 2005 14:39:59 GMT"/> | 2875 | <signal name="activate" handler="namespaceDelete_clicked_" last_modification_time="Sat, 28 May 2005 14:39:59 GMT"/> |
2876 | </widget> | 2876 | </widget> |
2877 | </child> | 2877 | </child> |
2878 | 2878 | ||
@@ -2882,7 +2882,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
2882 | <property name="tooltip" translatable="yes">end collection (will not delete content already in the collection)</property> | 2882 | <property name="tooltip" translatable="yes">end collection (will not delete content already in the collection)</property> |
2883 | <property name="label" translatable="yes">_Collection</property> | 2883 | <property name="label" translatable="yes">_Collection</property> |
2884 | <property name="use_underline">True</property> | 2884 | <property name="use_underline">True</property> |
2885 | <signal name="activate" handler="deleteCollection_clicked" last_modification_time="Sat, 28 May 2005 14:39:59 GMT"/> | 2885 | <signal name="activate" handler="deleteCollection_clicked_" last_modification_time="Sat, 28 May 2005 14:39:59 GMT"/> |
2886 | </widget> | 2886 | </widget> |
2887 | </child> | 2887 | </child> |
2888 | </widget> | 2888 | </widget> |
@@ -3049,7 +3049,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
3049 | <property name="active">False</property> | 3049 | <property name="active">False</property> |
3050 | <property name="inconsistent">False</property> | 3050 | <property name="inconsistent">False</property> |
3051 | <property name="draw_indicator">True</property> | 3051 | <property name="draw_indicator">True</property> |
3052 | <signal name="toggled" handler="on_trackingCheckButton_toggled" object="trackingCheckButton" last_modification_time="Sun, 21 Aug 2005 02:47:48 GMT"/> | 3052 | <signal name="toggled" handler="on_trackingCheckButton_toggled_" object="trackingCheckButton" last_modification_time="Sun, 21 Aug 2005 02:47:48 GMT"/> |
3053 | 3053 | ||
3054 | <child> | 3054 | <child> |
3055 | <widget class="GtkAlignment" id="alignment13"> | 3055 | <widget class="GtkAlignment" id="alignment13"> |
@@ -3131,7 +3131,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
3131 | <property name="use_stock">True</property> | 3131 | <property name="use_stock">True</property> |
3132 | <property name="relief">GTK_RELIEF_NONE</property> | 3132 | <property name="relief">GTK_RELIEF_NONE</property> |
3133 | <property name="focus_on_click">True</property> | 3133 | <property name="focus_on_click">True</property> |
3134 | <signal name="clicked" handler="on_refreshContentListButton_clicked" last_modification_time="Sun, 21 Aug 2005 03:29:32 GMT"/> | 3134 | <signal name="clicked" handler="on_refreshContentListButton_clicked_" last_modification_time="Sun, 21 Aug 2005 03:29:32 GMT"/> |
3135 | </widget> | 3135 | </widget> |
3136 | <packing> | 3136 | <packing> |
3137 | <property name="padding">0</property> | 3137 | <property name="padding">0</property> |
@@ -3149,7 +3149,7 @@ This release fixes downloads of files from directories. The previous version ha | |||
3149 | <property name="use_stock">True</property> | 3149 | <property name="use_stock">True</property> |
3150 | <property name="relief">GTK_RELIEF_NONE</property> | 3150 | <property name="relief">GTK_RELIEF_NONE</property> |
3151 | <property name="focus_on_click">True</property> | 3151 | <property name="focus_on_click">True</property> |
3152 | <signal name="clicked" handler="on_clearAvailableContentButton_clicked" last_modification_time="Sun, 21 Aug 2005 02:49:49 GMT"/> | 3152 | <signal name="clicked" handler="on_clearAvailableContentButton_clicked_" last_modification_time="Sun, 21 Aug 2005 02:49:49 GMT"/> |
3153 | </widget> | 3153 | </widget> |
3154 | <packing> | 3154 | <packing> |
3155 | <property name="padding">0</property> | 3155 | <property name="padding">0</property> |
@@ -3862,7 +3862,7 @@ Press ENTER to add the data.</atkproperty> | |||
3862 | <property name="use_stock">True</property> | 3862 | <property name="use_stock">True</property> |
3863 | <property name="relief">GTK_RELIEF_NORMAL</property> | 3863 | <property name="relief">GTK_RELIEF_NORMAL</property> |
3864 | <property name="focus_on_click">True</property> | 3864 | <property name="focus_on_click">True</property> |
3865 | <signal name="clicked" handler="on_metaDataDialogMetaDataAddButton_clicked" last_modification_time="Thu, 02 Jun 2005 12:44:47 GMT"/> | 3865 | <signal name="clicked" handler="on_metaDataDialogMetaDataAddButton_clicked_" last_modification_time="Thu, 02 Jun 2005 12:44:47 GMT"/> |
3866 | </widget> | 3866 | </widget> |
3867 | <packing> | 3867 | <packing> |
3868 | <property name="padding">0</property> | 3868 | <property name="padding">0</property> |
@@ -4004,7 +4004,7 @@ Press ENTER to add the data.</atkproperty> | |||
4004 | <property name="use_stock">True</property> | 4004 | <property name="use_stock">True</property> |
4005 | <property name="relief">GTK_RELIEF_NORMAL</property> | 4005 | <property name="relief">GTK_RELIEF_NORMAL</property> |
4006 | <property name="focus_on_click">True</property> | 4006 | <property name="focus_on_click">True</property> |
4007 | <signal name="clicked" handler="on_metaDataDialogKeywordAddButton_clicked" last_modification_time="Thu, 02 Jun 2005 12:46:16 GMT"/> | 4007 | <signal name="clicked" handler="on_metaDataDialogKeywordAddButton_clicked_" last_modification_time="Thu, 02 Jun 2005 12:46:16 GMT"/> |
4008 | </widget> | 4008 | </widget> |
4009 | <packing> | 4009 | <packing> |
4010 | <property name="padding">0</property> | 4010 | <property name="padding">0</property> |
@@ -4161,7 +4161,7 @@ Press ENTER to add the data.</atkproperty> | |||
4161 | <property name="show_hidden">False</property> | 4161 | <property name="show_hidden">False</property> |
4162 | <property name="do_overwrite_confirmation">False</property> | 4162 | <property name="do_overwrite_confirmation">False</property> |
4163 | <property name="width_chars">-1</property> | 4163 | <property name="width_chars">-1</property> |
4164 | <signal name="selection_changed" handler="on_selectAlternativePreviewButton_selection_changed" object="previewImage" last_modification_time="Tue, 20 Dec 2005 04:15:38 GMT"/> | 4164 | <signal name="selection_changed" handler="on_selectAlternativePreviewButton_selection_changed_" object="previewImage" last_modification_time="Tue, 20 Dec 2005 04:15:38 GMT"/> |
4165 | </widget> | 4165 | </widget> |
4166 | <packing> | 4166 | <packing> |
4167 | <property name="padding">0</property> | 4167 | <property name="padding">0</property> |
@@ -4357,7 +4357,7 @@ Press ENTER to add the data.</atkproperty> | |||
4357 | <property name="fixed_height_mode">False</property> | 4357 | <property name="fixed_height_mode">False</property> |
4358 | <property name="hover_selection">False</property> | 4358 | <property name="hover_selection">False</property> |
4359 | <property name="hover_expand">False</property> | 4359 | <property name="hover_expand">False</property> |
4360 | <signal name="destroy" handler="on_searchResults_destroy" object="searchResults" last_modification_time="Sat, 28 May 2005 13:55:09 GMT"/> | 4360 | <signal name="destroy" handler="on_searchResults_destroy_" object="searchResults" last_modification_time="Sat, 28 May 2005 13:55:09 GMT"/> |
4361 | </widget> | 4361 | </widget> |
4362 | </child> | 4362 | </child> |
4363 | </widget> | 4363 | </widget> |
@@ -4405,7 +4405,7 @@ Press ENTER to add the data.</atkproperty> | |||
4405 | <property name="can_focus">True</property> | 4405 | <property name="can_focus">True</property> |
4406 | <property name="relief">GTK_RELIEF_NORMAL</property> | 4406 | <property name="relief">GTK_RELIEF_NORMAL</property> |
4407 | <property name="focus_on_click">False</property> | 4407 | <property name="focus_on_click">False</property> |
4408 | <signal name="clicked" handler="on_downloadButton_clicked" object="searchResults" last_modification_time="Mon, 23 May 2005 18:59:36 GMT"/> | 4408 | <signal name="clicked" handler="on_downloadButton_clicked_" object="searchResults" last_modification_time="Mon, 23 May 2005 18:59:36 GMT"/> |
4409 | <accelerator key="Return" modifiers="GDK_CONTROL_MASK" signal="activate"/> | 4409 | <accelerator key="Return" modifiers="GDK_CONTROL_MASK" signal="activate"/> |
4410 | 4410 | ||
4411 | <child> | 4411 | <child> |
@@ -4546,7 +4546,7 @@ Press ENTER to add the data.</atkproperty> | |||
4546 | <property name="use_stock">True</property> | 4546 | <property name="use_stock">True</property> |
4547 | <property name="relief">GTK_RELIEF_NORMAL</property> | 4547 | <property name="relief">GTK_RELIEF_NORMAL</property> |
4548 | <property name="focus_on_click">False</property> | 4548 | <property name="focus_on_click">False</property> |
4549 | <signal name="clicked" handler="on_searchCancelButton_clicked" object="searchResultsFrame" last_modification_time="Sun, 22 Oct 2006 06:14:18 GMT"/> | 4549 | <signal name="clicked" handler="on_searchCancelButton_clicked_" object="searchResultsFrame" last_modification_time="Sun, 22 Oct 2006 06:14:18 GMT"/> |
4550 | <accelerator key="Return" modifiers="GDK_CONTROL_MASK" signal="activate"/> | 4550 | <accelerator key="Return" modifiers="GDK_CONTROL_MASK" signal="activate"/> |
4551 | </widget> | 4551 | </widget> |
4552 | <packing> | 4552 | <packing> |
@@ -4565,7 +4565,7 @@ Press ENTER to add the data.</atkproperty> | |||
4565 | <property name="use_stock">True</property> | 4565 | <property name="use_stock">True</property> |
4566 | <property name="relief">GTK_RELIEF_NORMAL</property> | 4566 | <property name="relief">GTK_RELIEF_NORMAL</property> |
4567 | <property name="focus_on_click">False</property> | 4567 | <property name="focus_on_click">False</property> |
4568 | <signal name="clicked" handler="on_searchClosedButton_clicked" object="searchResultsFrame" last_modification_time="Sun, 22 Oct 2006 06:14:02 GMT"/> | 4568 | <signal name="clicked" handler="on_searchClosedButton_clicked_" object="searchResultsFrame" last_modification_time="Sun, 22 Oct 2006 06:14:02 GMT"/> |
4569 | <accelerator key="Return" modifiers="GDK_CONTROL_MASK" signal="activate"/> | 4569 | <accelerator key="Return" modifiers="GDK_CONTROL_MASK" signal="activate"/> |
4570 | </widget> | 4570 | </widget> |
4571 | <packing> | 4571 | <packing> |
@@ -4657,7 +4657,7 @@ Press ENTER to add the data.</atkproperty> | |||
4657 | <property name="use_stock">True</property> | 4657 | <property name="use_stock">True</property> |
4658 | <property name="relief">GTK_RELIEF_NORMAL</property> | 4658 | <property name="relief">GTK_RELIEF_NORMAL</property> |
4659 | <property name="focus_on_click">True</property> | 4659 | <property name="focus_on_click">True</property> |
4660 | <signal name="clicked" handler="on_namespaceInsertButton_clicked" last_modification_time="Tue, 23 Aug 2005 08:23:21 GMT"/> | 4660 | <signal name="clicked" handler="on_namespaceInsertButton_clicked_" last_modification_time="Tue, 23 Aug 2005 08:23:21 GMT"/> |
4661 | </widget> | 4661 | </widget> |
4662 | <packing> | 4662 | <packing> |
4663 | <property name="padding">0</property> | 4663 | <property name="padding">0</property> |
@@ -4673,7 +4673,7 @@ Press ENTER to add the data.</atkproperty> | |||
4673 | <property name="can_focus">True</property> | 4673 | <property name="can_focus">True</property> |
4674 | <property name="relief">GTK_RELIEF_NORMAL</property> | 4674 | <property name="relief">GTK_RELIEF_NORMAL</property> |
4675 | <property name="focus_on_click">True</property> | 4675 | <property name="focus_on_click">True</property> |
4676 | <signal name="clicked" handler="on_namespaceUpdateButton_clicked" last_modification_time="Mon, 23 May 2005 19:01:59 GMT"/> | 4676 | <signal name="clicked" handler="on_namespaceUpdateButton_clicked_" last_modification_time="Mon, 23 May 2005 19:01:59 GMT"/> |
4677 | 4677 | ||
4678 | <child> | 4678 | <child> |
4679 | <widget class="GtkAlignment" id="alignment5"> | 4679 | <widget class="GtkAlignment" id="alignment5"> |
@@ -4839,7 +4839,7 @@ Press ENTER to add the data.</atkproperty> | |||
4839 | <property name="add_tearoffs">False</property> | 4839 | <property name="add_tearoffs">False</property> |
4840 | <property name="has_frame">True</property> | 4840 | <property name="has_frame">True</property> |
4841 | <property name="focus_on_click">False</property> | 4841 | <property name="focus_on_click">False</property> |
4842 | <signal name="editing_done" handler="on_chatLineTextEntry_editing_done" last_modification_time="Mon, 23 May 2005 17:18:48 GMT"/> | 4842 | <signal name="editing_done" handler="on_chatLineTextEntry_editing_done_" last_modification_time="Mon, 23 May 2005 17:18:48 GMT"/> |
4843 | </widget> | 4843 | </widget> |
4844 | <packing> | 4844 | <packing> |
4845 | <property name="padding">0</property> | 4845 | <property name="padding">0</property> |
@@ -4855,8 +4855,8 @@ Press ENTER to add the data.</atkproperty> | |||
4855 | <property name="can_focus">True</property> | 4855 | <property name="can_focus">True</property> |
4856 | <property name="relief">GTK_RELIEF_NORMAL</property> | 4856 | <property name="relief">GTK_RELIEF_NORMAL</property> |
4857 | <property name="focus_on_click">True</property> | 4857 | <property name="focus_on_click">True</property> |
4858 | <signal name="activate" handler="on_chatSendButton_clicked" object="chatFrame" last_modification_time="Mon, 23 May 2005 19:03:19 GMT"/> | 4858 | <signal name="activate" handler="on_chatSendButton_clicked_" object="chatFrame" last_modification_time="Mon, 23 May 2005 19:03:19 GMT"/> |
4859 | <signal name="clicked" handler="on_chatSendButton_clicked" object="chatFrame" last_modification_time="Mon, 23 May 2005 19:03:25 GMT"/> | 4859 | <signal name="clicked" handler="on_chatSendButton_clicked_" object="chatFrame" last_modification_time="Mon, 23 May 2005 19:03:25 GMT"/> |
4860 | <accelerator key="Return" modifiers="GDK_CONTROL_MASK" signal="activate"/> | 4860 | <accelerator key="Return" modifiers="GDK_CONTROL_MASK" signal="activate"/> |
4861 | 4861 | ||
4862 | <child> | 4862 | <child> |
@@ -5716,7 +5716,7 @@ Daniel Nylander <po@danielnylander.se> | |||
5716 | <property name="use_stock">True</property> | 5716 | <property name="use_stock">True</property> |
5717 | <property name="relief">GTK_RELIEF_NORMAL</property> | 5717 | <property name="relief">GTK_RELIEF_NORMAL</property> |
5718 | <property name="focus_on_click">True</property> | 5718 | <property name="focus_on_click">True</property> |
5719 | <signal name="clicked" handler="on_namespacemetaDataDialogKeywordAddButton_clicked" last_modification_time="Thu, 02 Jun 2005 23:54:23 GMT"/> | 5719 | <signal name="clicked" handler="on_namespacemetaDataDialogKeywordAddButton_clicked_" last_modification_time="Thu, 02 Jun 2005 23:54:23 GMT"/> |
5720 | </widget> | 5720 | </widget> |
5721 | <packing> | 5721 | <packing> |
5722 | <property name="padding">5</property> | 5722 | <property name="padding">5</property> |
@@ -5897,7 +5897,7 @@ Daniel Nylander <po@danielnylander.se> | |||
5897 | <property name="use_stock">True</property> | 5897 | <property name="use_stock">True</property> |
5898 | <property name="relief">GTK_RELIEF_NORMAL</property> | 5898 | <property name="relief">GTK_RELIEF_NORMAL</property> |
5899 | <property name="focus_on_click">True</property> | 5899 | <property name="focus_on_click">True</property> |
5900 | <signal name="clicked" handler="on_namespacemetaDataDialogMetaDataAddButton_clicked" last_modification_time="Thu, 02 Jun 2005 23:54:34 GMT"/> | 5900 | <signal name="clicked" handler="on_namespacemetaDataDialogMetaDataAddButton_clicked_" last_modification_time="Thu, 02 Jun 2005 23:54:34 GMT"/> |
5901 | </widget> | 5901 | </widget> |
5902 | <packing> | 5902 | <packing> |
5903 | <property name="padding">5</property> | 5903 | <property name="padding">5</property> |
@@ -6036,7 +6036,7 @@ Daniel Nylander <po@danielnylander.se> | |||
6036 | <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> | 6036 | <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> |
6037 | <property name="focus_on_map">True</property> | 6037 | <property name="focus_on_map">True</property> |
6038 | <property name="urgency_hint">False</property> | 6038 | <property name="urgency_hint">False</property> |
6039 | <signal name="delete_event" handler="on_statusWindow_delete_event" object="statusWindow" last_modification_time="Tue, 05 Jul 2005 22:11:54 GMT"/> | 6039 | <signal name="delete_event" handler="on_statusWindow_delete_event_" object="statusWindow" last_modification_time="Tue, 05 Jul 2005 22:11:54 GMT"/> |
6040 | <signal name="delete_event" handler="gtk_widget_hide" object="statusWindow" last_modification_time="Tue, 05 Jul 2005 22:12:30 GMT"/> | 6040 | <signal name="delete_event" handler="gtk_widget_hide" object="statusWindow" last_modification_time="Tue, 05 Jul 2005 22:12:30 GMT"/> |
6041 | <signal name="destroy" handler="gtk_widget_hide" object="statusWindow" last_modification_time="Tue, 05 Jul 2005 22:12:43 GMT"/> | 6041 | <signal name="destroy" handler="gtk_widget_hide" object="statusWindow" last_modification_time="Tue, 05 Jul 2005 22:12:43 GMT"/> |
6042 | 6042 | ||
@@ -6528,7 +6528,7 @@ Daniel Nylander <po@danielnylander.se> | |||
6528 | <property name="use_stock">True</property> | 6528 | <property name="use_stock">True</property> |
6529 | <property name="relief">GTK_RELIEF_NORMAL</property> | 6529 | <property name="relief">GTK_RELIEF_NORMAL</property> |
6530 | <property name="focus_on_click">True</property> | 6530 | <property name="focus_on_click">True</property> |
6531 | <signal name="clicked" handler="on_namespaceInsertMetaDataDialogMetaDataAddButton_clicked" last_modification_time="Wed, 24 Aug 2005 05:39:50 GMT"/> | 6531 | <signal name="clicked" handler="on_namespaceInsertMetaDataDialogMetaDataAddButton_clicked_" last_modification_time="Wed, 24 Aug 2005 05:39:50 GMT"/> |
6532 | </widget> | 6532 | </widget> |
6533 | <packing> | 6533 | <packing> |
6534 | <property name="padding">0</property> | 6534 | <property name="padding">0</property> |
@@ -7060,7 +7060,7 @@ Daniel Nylander <po@danielnylander.se> | |||
7060 | <property name="use_stock">True</property> | 7060 | <property name="use_stock">True</property> |
7061 | <property name="relief">GTK_RELIEF_NORMAL</property> | 7061 | <property name="relief">GTK_RELIEF_NORMAL</property> |
7062 | <property name="focus_on_click">True</property> | 7062 | <property name="focus_on_click">True</property> |
7063 | <signal name="clicked" handler="on_collectionDialogMetaDataAddButton_clicked" last_modification_time="Thu, 07 Jul 2005 23:21:43 GMT"/> | 7063 | <signal name="clicked" handler="on_collectionDialogMetaDataAddButton_clicked_" last_modification_time="Thu, 07 Jul 2005 23:21:43 GMT"/> |
7064 | </widget> | 7064 | </widget> |
7065 | <packing> | 7065 | <packing> |
7066 | <property name="padding">0</property> | 7066 | <property name="padding">0</property> |
@@ -7568,7 +7568,7 @@ Daniel Nylander <po@danielnylander.se> | |||
7568 | <property name="use_stock">True</property> | 7568 | <property name="use_stock">True</property> |
7569 | <property name="relief">GTK_RELIEF_NORMAL</property> | 7569 | <property name="relief">GTK_RELIEF_NORMAL</property> |
7570 | <property name="focus_on_click">True</property> | 7570 | <property name="focus_on_click">True</property> |
7571 | <signal name="clicked" handler="on_namespaceUpdateMetaDataDialogMetaDataAddButton_clicked" last_modification_time="Tue, 23 Aug 2005 08:41:20 GMT"/> | 7571 | <signal name="clicked" handler="on_namespaceUpdateMetaDataDialogMetaDataAddButton_clicked_" last_modification_time="Tue, 23 Aug 2005 08:41:20 GMT"/> |
7572 | </widget> | 7572 | </widget> |
7573 | <packing> | 7573 | <packing> |
7574 | <property name="padding">0</property> | 7574 | <property name="padding">0</property> |
@@ -7807,7 +7807,7 @@ Daniel Nylander <po@danielnylander.se> | |||
7807 | <property name="tooltip" translatable="yes">Stop and close gnunet-gtk.</property> | 7807 | <property name="tooltip" translatable="yes">Stop and close gnunet-gtk.</property> |
7808 | <property name="label" translatable="yes">_Quit</property> | 7808 | <property name="label" translatable="yes">_Quit</property> |
7809 | <property name="use_underline">True</property> | 7809 | <property name="use_underline">True</property> |
7810 | <signal name="activate" handler="on_tray_quit_activate" last_modification_time="Sat, 03 Jun 2006 16:32:53 GMT"/> | 7810 | <signal name="activate" handler="on_tray_quit_activate_" last_modification_time="Sat, 03 Jun 2006 16:32:53 GMT"/> |
7811 | 7811 | ||
7812 | <child internal-child="image"> | 7812 | <child internal-child="image"> |
7813 | <widget class="GtkImage" id="image43"> | 7813 | <widget class="GtkImage" id="image43"> |
diff --git a/src/common/helper.c b/src/common/helper.c index a176eecc..504e5abe 100644 --- a/src/common/helper.c +++ b/src/common/helper.c | |||
@@ -508,7 +508,7 @@ void run_with_save_calls(PThreadMain cb, | |||
508 | /* another thread will run the save calls */ | 508 | /* another thread will run the save calls */ |
509 | SEMAPHORE_DOWN(cls.sig, YES); | 509 | SEMAPHORE_DOWN(cls.sig, YES); |
510 | } else { | 510 | } else { |
511 | while (OK != SEMAPHORE_DOWN(cls.sig, NO)) { | 511 | while (SYSERR == SEMAPHORE_DOWN(cls.sig, NO)) { |
512 | MUTEX_LOCK(sclock); | 512 | MUTEX_LOCK(sclock); |
513 | if (pscCount > 0) { | 513 | if (pscCount > 0) { |
514 | i = weak_randomi(pscCount); | 514 | i = weak_randomi(pscCount); |
diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c index 2e645738..dc7e2ae4 100644 --- a/src/plugins/fs/download.c +++ b/src/plugins/fs/download.c | |||
@@ -374,8 +374,8 @@ static void initiateDownload(GtkTreeModel * model, | |||
374 | DEBUG_END(); | 374 | DEBUG_END(); |
375 | } | 375 | } |
376 | 376 | ||
377 | void on_downloadButton_clicked(GtkWidget * treeview, | 377 | void on_downloadButton_clicked_fs(GtkWidget * treeview, |
378 | GtkWidget * downloadButton) { | 378 | GtkWidget * downloadButton) { |
379 | GtkTreeSelection * selection; | 379 | GtkTreeSelection * selection; |
380 | 380 | ||
381 | selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); | 381 | selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); |
@@ -386,8 +386,8 @@ void on_downloadButton_clicked(GtkWidget * treeview, | |||
386 | } | 386 | } |
387 | 387 | ||
388 | 388 | ||
389 | void on_statusDownloadURIEntry_editing_done(GtkWidget * entry, | 389 | void on_statusDownloadURIEntry_editing_done_fs(GtkWidget * entry, |
390 | GtkWidget * downloadButton) { | 390 | GtkWidget * downloadButton) { |
391 | InitiateDownloadCls idc; | 391 | InitiateDownloadCls idc; |
392 | const char * uris; | 392 | const char * uris; |
393 | char * urid; | 393 | char * urid; |
@@ -678,8 +678,8 @@ static void abortDownloadCallback(GtkTreeModel * model, | |||
678 | ECRS_freeUri(u); | 678 | ECRS_freeUri(u); |
679 | } | 679 | } |
680 | 680 | ||
681 | void on_abortDownloadButton_clicked(void * unused, | 681 | void on_abortDownloadButton_clicked_fs(void * unused, |
682 | GtkWidget * clearButton) { | 682 | GtkWidget * clearButton) { |
683 | GtkTreeSelection * selection; | 683 | GtkTreeSelection * selection; |
684 | GtkWidget * downloadList; | 684 | GtkWidget * downloadList; |
685 | 685 | ||
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c index 4a3041e5..3cbdd65d 100644 --- a/src/plugins/fs/namespace.c +++ b/src/plugins/fs/namespace.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | (C) 2005 Christian Grothoff (and other contributing authors) | 3 | (C) 2005, 2006 Christian Grothoff (and other contributing authors) |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published | 6 | it under the terms of the GNU General Public License as published |
@@ -372,8 +372,8 @@ static void updateContentList(void * unused) { | |||
372 | gtkSaveCall(&doUpdateContentList, NULL); | 372 | gtkSaveCall(&doUpdateContentList, NULL); |
373 | } | 373 | } |
374 | 374 | ||
375 | void on_refreshContentListButton_clicked(gpointer dummy, | 375 | void on_refreshContentListButton_clickedfs_(gpointer dummy, |
376 | gpointer dummy1) { | 376 | gpointer dummy1) { |
377 | updateContentList(NULL); | 377 | updateContentList(NULL); |
378 | } | 378 | } |
379 | 379 | ||
@@ -538,23 +538,23 @@ static int addTabForNamespace(void * unused, | |||
538 | return OK; | 538 | return OK; |
539 | } | 539 | } |
540 | 540 | ||
541 | void on_namespacemetaDataDialogKeywordAddButton_clicked(gpointer dummy, | 541 | void on_namespacemetaDataDialogKeywordAddButton_clicked_fs(gpointer dummy, |
542 | GtkWidget * uploadButton) { | 542 | GtkWidget * uploadButton) { |
543 | handleKeywordListUpdate(metaXML, | 543 | handleKeywordListUpdate(metaXML, |
544 | "namespaceKeywordEntry", | 544 | "namespaceKeywordEntry", |
545 | "namespaceMetaDataDialogKeywordList"); | 545 | "namespaceMetaDataDialogKeywordList"); |
546 | } | 546 | } |
547 | 547 | ||
548 | void on_namespacemetaDataDialogMetaDataAddButton_clicked(gpointer dummy, | 548 | void on_namespacemetaDataDialogMetaDataAddButton_clicked_fs(gpointer dummy, |
549 | GtkWidget * uploadButton) { | 549 | GtkWidget * uploadButton) { |
550 | handleMetaDataListUpdate(metaXML, | 550 | handleMetaDataListUpdate(metaXML, |
551 | "namespaceMetaDataDialogMetaTypeComboBox", | 551 | "namespaceMetaDataDialogMetaTypeComboBox", |
552 | "namespaceMetaDataValueEntry", | 552 | "namespaceMetaDataValueEntry", |
553 | "namespaceMetaDataDialogMetaDataList"); | 553 | "namespaceMetaDataDialogMetaDataList"); |
554 | } | 554 | } |
555 | 555 | ||
556 | void create_namespace_clicked(GtkWidget * dummy1, | 556 | void create_namespace_clicked_fs(GtkWidget * dummy1, |
557 | GtkWidget * dummy2) { | 557 | GtkWidget * dummy2) { |
558 | const char * namespaceName; | 558 | const char * namespaceName; |
559 | GtkWidget * nameLine; | 559 | GtkWidget * nameLine; |
560 | GtkWidget * dialog; | 560 | GtkWidget * dialog; |
@@ -649,8 +649,8 @@ void create_namespace_clicked(GtkWidget * dummy1, | |||
649 | DEBUG_END(); | 649 | DEBUG_END(); |
650 | } | 650 | } |
651 | 651 | ||
652 | void namespaceDelete_clicked(GtkWidget * dummy1, | 652 | void namespaceDelete_clicked_fs(GtkWidget * dummy1, |
653 | GtkWidget * dummy2) { | 653 | GtkWidget * dummy2) { |
654 | GtkWidget * notebook; | 654 | GtkWidget * notebook; |
655 | NamespaceList * list; | 655 | NamespaceList * list; |
656 | NamespaceList * prev; | 656 | NamespaceList * prev; |
@@ -807,16 +807,16 @@ static void initiateUpload(GtkTreeModel * model, | |||
807 | DEBUG_END(); | 807 | DEBUG_END(); |
808 | } | 808 | } |
809 | 809 | ||
810 | void on_namespaceInsertMetaDataDialogMetaDataAddButton_clicked(GtkWidget * dummy1, | 810 | void on_namespaceInsertMetaDataDialogMetaDataAddButton_clicked_fs(GtkWidget * dummy1, |
811 | GtkWidget * dummy2) { | 811 | GtkWidget * dummy2) { |
812 | handleMetaDataListUpdate(metaXML, | 812 | handleMetaDataListUpdate(metaXML, |
813 | "namespaceInsertMetaTypeComboBox", | 813 | "namespaceInsertMetaTypeComboBox", |
814 | "metaDataValueEntry", | 814 | "metaDataValueEntry", |
815 | "metaDataTreeView"); | 815 | "metaDataTreeView"); |
816 | } | 816 | } |
817 | 817 | ||
818 | void on_namespaceInsertButton_clicked(GtkWidget * dummy1, | 818 | void on_namespaceInsertButton_clicked_fs(GtkWidget * dummy1, |
819 | GtkWidget * dummy2) { | 819 | GtkWidget * dummy2) { |
820 | const char * identifierName; | 820 | const char * identifierName; |
821 | NamespaceList * list; | 821 | NamespaceList * list; |
822 | GtkWidget * nameLine; | 822 | GtkWidget * nameLine; |
@@ -953,8 +953,8 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1, | |||
953 | DEBUG_END(); | 953 | DEBUG_END(); |
954 | } | 954 | } |
955 | 955 | ||
956 | void on_namespaceUpdateButton_clicked(GtkWidget * dummy1, | 956 | void on_namespaceUpdateButton_clicked_fs(GtkWidget * dummy1, |
957 | GtkWidget * dummy2) { | 957 | GtkWidget * dummy2) { |
958 | const char * identifierName; | 958 | const char * identifierName; |
959 | NamespaceList * list; | 959 | NamespaceList * list; |
960 | GtkWidget * nameLine; | 960 | GtkWidget * nameLine; |
@@ -1177,8 +1177,8 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1, | |||
1177 | DEBUG_END(); | 1177 | DEBUG_END(); |
1178 | } | 1178 | } |
1179 | 1179 | ||
1180 | void on_clearAvailableContentButton_clicked(GtkWidget * dummy1, | 1180 | void on_clearAvailableContentButton_clicked_fs(GtkWidget * dummy1, |
1181 | GtkWidget * dummy2) { | 1181 | GtkWidget * dummy2) { |
1182 | GtkWidget * contentList; | 1182 | GtkWidget * contentList; |
1183 | GtkTreeModel * model; | 1183 | GtkTreeModel * model; |
1184 | 1184 | ||
@@ -1195,8 +1195,8 @@ void on_clearAvailableContentButton_clicked(GtkWidget * dummy1, | |||
1195 | DEBUG_END(); | 1195 | DEBUG_END(); |
1196 | } | 1196 | } |
1197 | 1197 | ||
1198 | void on_trackingCheckButton_toggled(GtkWidget * dummy1, | 1198 | void on_trackingCheckButton_toggled_fs(GtkWidget * dummy1, |
1199 | GtkWidget * dummy2) { | 1199 | GtkWidget * dummy2) { |
1200 | GtkWidget * trackCheckButton; | 1200 | GtkWidget * trackCheckButton; |
1201 | 1201 | ||
1202 | trackCheckButton | 1202 | trackCheckButton |
@@ -1307,8 +1307,8 @@ void fs_namespace_start(struct GE_Context * e, | |||
1307 | } | 1307 | } |
1308 | 1308 | ||
1309 | #if 0 | 1309 | #if 0 |
1310 | void on_availableContentList_destroy(GtkWidget * dummy1, | 1310 | void on_availableContentList_destroy_fs(GtkWidget * dummy1, |
1311 | GtkWidget * dummy2) { | 1311 | GtkWidget * dummy2) { |
1312 | GtkWidget * contentList; | 1312 | GtkWidget * contentList; |
1313 | GtkTreeModel * model; | 1313 | GtkTreeModel * model; |
1314 | 1314 | ||
@@ -1323,8 +1323,8 @@ void on_availableContentList_destroy(GtkWidget * dummy1, | |||
1323 | clearContentList(model); | 1323 | clearContentList(model); |
1324 | } | 1324 | } |
1325 | 1325 | ||
1326 | void on_localNamespacesNotebook_destroy(GtkWidget * dummy1, | 1326 | void on_localNamespacesNotebook_destroy_fs(GtkWidget * dummy1, |
1327 | GtkWidget * dummy2) { | 1327 | GtkWidget * dummy2) { |
1328 | NamespaceList * pos; | 1328 | NamespaceList * pos; |
1329 | GtkTreeIter iter; | 1329 | GtkTreeIter iter; |
1330 | struct ECRS_URI * u; | 1330 | struct ECRS_URI * u; |
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c index 369eff46..750e7432 100644 --- a/src/plugins/fs/search.c +++ b/src/plugins/fs/search.c | |||
@@ -213,8 +213,8 @@ static void freeIterSubtree(GtkTreeModel * tree, | |||
213 | * The spin button giving the rating for a particular namespace | 213 | * The spin button giving the rating for a particular namespace |
214 | * has been changed. Store the new rating for the namespace. | 214 | * has been changed. Store the new rating for the namespace. |
215 | */ | 215 | */ |
216 | void on_namespaceRatingSpinButton_changed(GtkWidget * dummy, | 216 | void on_namespaceRatingSpinButton_changed_fs(GtkWidget * dummy, |
217 | GtkWidget * dummy2) { | 217 | GtkWidget * dummy2) { |
218 | GtkWidget * spin; | 218 | GtkWidget * spin; |
219 | GtkWidget * ncbe; | 219 | GtkWidget * ncbe; |
220 | GtkTreeModel * model; | 220 | GtkTreeModel * model; |
@@ -281,8 +281,8 @@ void on_namespaceRatingSpinButton_changed(GtkWidget * dummy, | |||
281 | * Update the trust level (possibly changing sensitivity) | 281 | * Update the trust level (possibly changing sensitivity) |
282 | * and set the search string to the root (if available). | 282 | * and set the search string to the root (if available). |
283 | */ | 283 | */ |
284 | void on_searchNamespaceComboBoxEntry_changed(GtkWidget * dummy, | 284 | void on_searchNamespaceComboBoxEntry_changed_fs(GtkWidget * dummy, |
285 | GtkWidget * dummy2) { | 285 | GtkWidget * dummy2) { |
286 | GtkWidget * keyword; | 286 | GtkWidget * keyword; |
287 | GtkWidget * spin; | 287 | GtkWidget * spin; |
288 | GtkWidget * ncbe; | 288 | GtkWidget * ncbe; |
@@ -349,8 +349,8 @@ void on_searchNamespaceComboBoxEntry_changed(GtkWidget * dummy, | |||
349 | DEBUG_END(); | 349 | DEBUG_END(); |
350 | } | 350 | } |
351 | 351 | ||
352 | void on_searchResults_destroy(GtkWidget * dummy, | 352 | void on_searchResults_destroy_fs(GtkWidget * dummy, |
353 | GtkWidget * treeview) { | 353 | GtkWidget * treeview) { |
354 | GtkTreeStore * tree; | 354 | GtkTreeStore * tree; |
355 | GtkTreeIter iter; | 355 | GtkTreeIter iter; |
356 | 356 | ||
@@ -573,8 +573,8 @@ static void closeSearchPage(SearchList * list) { | |||
573 | GE_BREAK(ectx, 0); | 573 | GE_BREAK(ectx, 0); |
574 | } | 574 | } |
575 | 575 | ||
576 | void on_closeSearchButton_clicked(GtkWidget * searchPage, | 576 | void on_closeSearchButton_clicked_fs(GtkWidget * searchPage, |
577 | GtkWidget * closeButton) { | 577 | GtkWidget * closeButton) { |
578 | SearchList * list; | 578 | SearchList * list; |
579 | SearchList * prev; | 579 | SearchList * prev; |
580 | 580 | ||
@@ -744,8 +744,8 @@ static void * startSearch(void * cls) { | |||
744 | return NULL; | 744 | return NULL; |
745 | } | 745 | } |
746 | 746 | ||
747 | void on_fssearchbutton_clicked(gpointer dummy2, | 747 | void on_fssearchbutton_clicked_fs(gpointer dummy2, |
748 | GtkWidget * searchButton) { | 748 | GtkWidget * searchButton) { |
749 | GtkWidget * searchKeywordGtkCB; | 749 | GtkWidget * searchKeywordGtkCB; |
750 | GtkWidget * searchNamespaceGtkCB; | 750 | GtkWidget * searchNamespaceGtkCB; |
751 | GtkWidget * notebook; | 751 | GtkWidget * notebook; |
@@ -1290,7 +1290,7 @@ GtkWidget *buildSearchTabLabel(GtkWidget *searchPage, | |||
1290 | 1290 | ||
1291 | g_signal_connect_swapped(close_button, | 1291 | g_signal_connect_swapped(close_button, |
1292 | "clicked", | 1292 | "clicked", |
1293 | G_CALLBACK (on_closeSearchButton_clicked), | 1293 | G_CALLBACK (on_closeSearchButton_clicked_fs), |
1294 | searchPage); | 1294 | searchPage); |
1295 | 1295 | ||
1296 | /* truncate the description if needed */ | 1296 | /* truncate the description if needed */ |
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c index 6cf8b153..9ef79e80 100644 --- a/src/plugins/fs/upload.c +++ b/src/plugins/fs/upload.c | |||
@@ -88,8 +88,8 @@ void displayUploadComplete(struct FSUI_UploadList * list, | |||
88 | } | 88 | } |
89 | 89 | ||
90 | 90 | ||
91 | void on_selectAlternativePreviewButton_selection_changed(GtkWidget * preview, | 91 | void on_selectAlternativePreviewButton_selection_changed_fs(GtkWidget * preview, |
92 | GtkWidget * fileChooser) { | 92 | GtkWidget * fileChooser) { |
93 | char * fn; | 93 | char * fn; |
94 | 94 | ||
95 | fn = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fileChooser)); | 95 | fn = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fileChooser)); |
@@ -108,15 +108,15 @@ void on_selectAlternativePreviewButton_selection_changed(GtkWidget * preview, | |||
108 | } | 108 | } |
109 | } | 109 | } |
110 | 110 | ||
111 | void on_metaDataDialogKeywordAddButton_clicked(gpointer dummy, | 111 | void on_metaDataDialogKeywordAddButton_clicked_fs(gpointer dummy, |
112 | GtkWidget * uploadButton) { | 112 | GtkWidget * uploadButton) { |
113 | handleKeywordListUpdate(metaXML, | 113 | handleKeywordListUpdate(metaXML, |
114 | "fileInformationKeywordEntry", | 114 | "fileInformationKeywordEntry", |
115 | "metaDataDialogKeywordList"); | 115 | "metaDataDialogKeywordList"); |
116 | } | 116 | } |
117 | 117 | ||
118 | void on_metaDataDialogMetaDataAddButton_clicked(gpointer dummy, | 118 | void on_metaDataDialogMetaDataAddButton_clicked_fs(gpointer dummy, |
119 | GtkWidget * uploadButton) { | 119 | GtkWidget * uploadButton) { |
120 | handleMetaDataListUpdate(metaXML, | 120 | handleMetaDataListUpdate(metaXML, |
121 | "metaDataDialogMetaTypeComboBox", | 121 | "metaDataDialogMetaTypeComboBox", |
122 | "metaDataDialogValueEntry", | 122 | "metaDataDialogValueEntry", |
@@ -153,8 +153,8 @@ static void * doUpload(void * cls) { | |||
153 | return NULL; | 153 | return NULL; |
154 | } | 154 | } |
155 | 155 | ||
156 | void on_fsinsertuploadbutton_clicked(gpointer dummy, | 156 | void on_fsinsertuploadbutton_clicked_fs(gpointer dummy, |
157 | GtkWidget * uploadButton) { | 157 | GtkWidget * uploadButton) { |
158 | UploadClosure uc; | 158 | UploadClosure uc; |
159 | const char * filenamerest; | 159 | const char * filenamerest; |
160 | GtkWidget * uploadLine; | 160 | GtkWidget * uploadLine; |
@@ -314,8 +314,8 @@ static char * selectFile(const char *oldfilename) { | |||
314 | #endif /* MINGW */ | 314 | #endif /* MINGW */ |
315 | } | 315 | } |
316 | 316 | ||
317 | void on_mainFileSharingInsertBrowseButton_clicked(GtkWidget * browseButton, | 317 | void on_mainFileSharingInsertBrowseButton_clicked_fs(GtkWidget * browseButton, |
318 | gpointer dummy) { | 318 | gpointer dummy) { |
319 | char * filename; | 319 | char * filename; |
320 | const char *oldfilename; | 320 | const char *oldfilename; |
321 | GtkWidget * uploadLine; | 321 | GtkWidget * uploadLine; |