5 files changed, 53 insertions, 53 deletions

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,
     /* another thread will run the save calls */
     SEMAPHORE_DOWN(cls.sig, YES);
   } else {
-    while (OK != SEMAPHORE_DOWN(cls.sig, NO)) {
+    while (SYSERR == SEMAPHORE_DOWN(cls.sig, NO)) {
       MUTEX_LOCK(sclock);
       if (pscCount > 0) {
         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,
   DEBUG_END();
 }
 
-void on_downloadButton_clicked(GtkWidget * treeview,
-                               GtkWidget * downloadButton) {
+void on_downloadButton_clicked_fs(GtkWidget * treeview,
+                                  GtkWidget * downloadButton) {
   GtkTreeSelection * selection;
 
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
@@ -386,8 +386,8 @@ void on_downloadButton_clicked(GtkWidget * treeview,
 }
 
 
-void on_statusDownloadURIEntry_editing_done(GtkWidget * entry,
-                                            GtkWidget * downloadButton) {
+void on_statusDownloadURIEntry_editing_done_fs(GtkWidget * entry,
+                                               GtkWidget * downloadButton) {
   InitiateDownloadCls idc;
   const char * uris;
   char * urid;
@@ -678,8 +678,8 @@ static void abortDownloadCallback(GtkTreeModel * model,
     ECRS_freeUri(u);
 }
 
-void on_abortDownloadButton_clicked(void * unused,
-                                    GtkWidget * clearButton) {
+void on_abortDownloadButton_clicked_fs(void * unused,
+                                       GtkWidget * clearButton) {
   GtkTreeSelection * selection;
   GtkWidget * downloadList;
 
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 @@
  /*
      This file is part of GNUnet.
-     (C) 2005 Christian Grothoff (and other contributing authors)
+     (C) 2005, 2006 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -372,8 +372,8 @@ static void updateContentList(void * unused) {
   gtkSaveCall(&doUpdateContentList, NULL);
 }
 
-void on_refreshContentListButton_clicked(gpointer dummy,
-                                         gpointer dummy1) {
+void on_refreshContentListButton_clickedfs_(gpointer dummy,
+                                            gpointer dummy1) {
   updateContentList(NULL);
 }
 
@@ -538,23 +538,23 @@ static int addTabForNamespace(void * unused,
   return OK;
 }
 
-void on_namespacemetaDataDialogKeywordAddButton_clicked(gpointer dummy,
-                                                        GtkWidget * uploadButton) {
+void on_namespacemetaDataDialogKeywordAddButton_clicked_fs(gpointer dummy,
+                                                           GtkWidget * uploadButton) {
   handleKeywordListUpdate(metaXML,
                           "namespaceKeywordEntry",
                           "namespaceMetaDataDialogKeywordList");
 }
 
-void on_namespacemetaDataDialogMetaDataAddButton_clicked(gpointer dummy,
-                                                         GtkWidget * uploadButton) {
+void on_namespacemetaDataDialogMetaDataAddButton_clicked_fs(gpointer dummy,
+                                                            GtkWidget * uploadButton) {
   handleMetaDataListUpdate(metaXML,
                            "namespaceMetaDataDialogMetaTypeComboBox",
                            "namespaceMetaDataValueEntry",
                            "namespaceMetaDataDialogMetaDataList");
 }
 
-void create_namespace_clicked(GtkWidget * dummy1,
-                              GtkWidget * dummy2) {
+void create_namespace_clicked_fs(GtkWidget * dummy1,
+                                 GtkWidget * dummy2) {
   const char * namespaceName;
   GtkWidget * nameLine;
   GtkWidget * dialog;
@@ -649,8 +649,8 @@ void create_namespace_clicked(GtkWidget * dummy1,
   DEBUG_END();
 }
 
-void namespaceDelete_clicked(GtkWidget * dummy1,
-                             GtkWidget * dummy2) {
+void namespaceDelete_clicked_fs(GtkWidget * dummy1,
+                                GtkWidget * dummy2) {
   GtkWidget * notebook;
   NamespaceList * list;
   NamespaceList * prev;
@@ -807,16 +807,16 @@ static void initiateUpload(GtkTreeModel * model,
   DEBUG_END();
 }
 
-void on_namespaceInsertMetaDataDialogMetaDataAddButton_clicked(GtkWidget * dummy1,
-                                                               GtkWidget * dummy2) {
+void on_namespaceInsertMetaDataDialogMetaDataAddButton_clicked_fs(GtkWidget * dummy1,
+                                                                  GtkWidget * dummy2) {
   handleMetaDataListUpdate(metaXML,
                            "namespaceInsertMetaTypeComboBox",
                            "metaDataValueEntry",
                            "metaDataTreeView");
 }
 
-void on_namespaceInsertButton_clicked(GtkWidget * dummy1,
-                                      GtkWidget * dummy2) {
+void on_namespaceInsertButton_clicked_fs(GtkWidget * dummy1,
+                                         GtkWidget * dummy2) {
   const char * identifierName;
   NamespaceList * list;
   GtkWidget * nameLine;
@@ -953,8 +953,8 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1,
   DEBUG_END();
 }
 
-void on_namespaceUpdateButton_clicked(GtkWidget * dummy1,
-                                      GtkWidget * dummy2) {
+void on_namespaceUpdateButton_clicked_fs(GtkWidget * dummy1,
+                                         GtkWidget * dummy2) {
   const char * identifierName;
   NamespaceList * list;
   GtkWidget * nameLine;
@@ -1177,8 +1177,8 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1,
   DEBUG_END();
 }
 
-void on_clearAvailableContentButton_clicked(GtkWidget * dummy1,
-                                            GtkWidget * dummy2) {
+void on_clearAvailableContentButton_clicked_fs(GtkWidget * dummy1,
+                                               GtkWidget * dummy2) {
   GtkWidget * contentList;
   GtkTreeModel * model;
 
@@ -1195,8 +1195,8 @@ void on_clearAvailableContentButton_clicked(GtkWidget * dummy1,
   DEBUG_END();
 }
 
-void on_trackingCheckButton_toggled(GtkWidget * dummy1,
-                                    GtkWidget * dummy2) {
+void on_trackingCheckButton_toggled_fs(GtkWidget * dummy1,
+                                       GtkWidget * dummy2) {
   GtkWidget * trackCheckButton;
 
   trackCheckButton
@@ -1307,8 +1307,8 @@ void fs_namespace_start(struct GE_Context * e,
 }
 
 #if 0
-void on_availableContentList_destroy(GtkWidget * dummy1,
-                                     GtkWidget * dummy2) {
+void on_availableContentList_destroy_fs(GtkWidget * dummy1,
+                                        GtkWidget * dummy2) {
   GtkWidget * contentList;
   GtkTreeModel * model;
 
@@ -1323,8 +1323,8 @@ void on_availableContentList_destroy(GtkWidget * dummy1,
   clearContentList(model);
 }
 
-void on_localNamespacesNotebook_destroy(GtkWidget * dummy1,
-                                        GtkWidget * dummy2) {
+void on_localNamespacesNotebook_destroy_fs(GtkWidget * dummy1,
+                                           GtkWidget * dummy2) {
   NamespaceList * pos;
   GtkTreeIter iter;
   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,
  * The spin button giving the rating for a particular namespace
  * has been changed.  Store the new rating for the namespace.
  */
-void on_namespaceRatingSpinButton_changed(GtkWidget * dummy,
-                                          GtkWidget * dummy2) {
+void on_namespaceRatingSpinButton_changed_fs(GtkWidget * dummy,
+                                             GtkWidget * dummy2) {
   GtkWidget * spin;
   GtkWidget * ncbe;
   GtkTreeModel * model;
@@ -281,8 +281,8 @@ void on_namespaceRatingSpinButton_changed(GtkWidget * dummy,
  * Update the trust level (possibly changing sensitivity)
  * and set the search string to the root (if available).
  */
-void on_searchNamespaceComboBoxEntry_changed(GtkWidget * dummy,
-                                             GtkWidget * dummy2) {
+void on_searchNamespaceComboBoxEntry_changed_fs(GtkWidget * dummy,
+                                                GtkWidget * dummy2) {
   GtkWidget * keyword;
   GtkWidget * spin;
   GtkWidget * ncbe;
@@ -349,8 +349,8 @@ void on_searchNamespaceComboBoxEntry_changed(GtkWidget * dummy,
   DEBUG_END();
 }
 
-void on_searchResults_destroy(GtkWidget * dummy,
-                              GtkWidget * treeview) {
+void on_searchResults_destroy_fs(GtkWidget * dummy,
+                                 GtkWidget * treeview) {
   GtkTreeStore * tree;
   GtkTreeIter iter;
 
@@ -573,8 +573,8 @@ static void closeSearchPage(SearchList * list) {
   GE_BREAK(ectx, 0);
 }
 
-void on_closeSearchButton_clicked(GtkWidget * searchPage,
-                                  GtkWidget * closeButton) {
+void on_closeSearchButton_clicked_fs(GtkWidget * searchPage,
+                                     GtkWidget * closeButton) {
   SearchList * list;
   SearchList * prev;
 
@@ -744,8 +744,8 @@ static void * startSearch(void * cls) {
   return NULL;
 }
 
-void on_fssearchbutton_clicked(gpointer dummy2,
-                               GtkWidget * searchButton) {
+void on_fssearchbutton_clicked_fs(gpointer dummy2,
+                                  GtkWidget * searchButton) {
   GtkWidget * searchKeywordGtkCB;
   GtkWidget * searchNamespaceGtkCB;
   GtkWidget * notebook;
@@ -1290,7 +1290,7 @@ GtkWidget *buildSearchTabLabel(GtkWidget *searchPage,
 
   g_signal_connect_swapped(close_button,
                            "clicked",
-                           G_CALLBACK (on_closeSearchButton_clicked),
+                           G_CALLBACK (on_closeSearchButton_clicked_fs),
                            searchPage);
         
   /* 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,
 }
 
 
-void on_selectAlternativePreviewButton_selection_changed(GtkWidget * preview,
-                                                         GtkWidget * fileChooser) {
+void on_selectAlternativePreviewButton_selection_changed_fs(GtkWidget * preview,
+                                                            GtkWidget * fileChooser) {
   char * fn;
 
   fn = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fileChooser));
@@ -108,15 +108,15 @@ void on_selectAlternativePreviewButton_selection_changed(GtkWidget * preview,
   }
 }
 
-void on_metaDataDialogKeywordAddButton_clicked(gpointer dummy,
-                                               GtkWidget * uploadButton) {
+void on_metaDataDialogKeywordAddButton_clicked_fs(gpointer dummy,
+                                                  GtkWidget * uploadButton) {
   handleKeywordListUpdate(metaXML,
                           "fileInformationKeywordEntry",
                           "metaDataDialogKeywordList");
 }
 
-void on_metaDataDialogMetaDataAddButton_clicked(gpointer dummy,
-                                                GtkWidget * uploadButton) {
+void on_metaDataDialogMetaDataAddButton_clicked_fs(gpointer dummy,
+                                                   GtkWidget * uploadButton) {
   handleMetaDataListUpdate(metaXML,
                            "metaDataDialogMetaTypeComboBox",
                            "metaDataDialogValueEntry",
@@ -153,8 +153,8 @@ static void * doUpload(void * cls) {
   return NULL;
 }
 
-void on_fsinsertuploadbutton_clicked(gpointer dummy,
-                                     GtkWidget * uploadButton) {
+void on_fsinsertuploadbutton_clicked_fs(gpointer dummy,
+                                        GtkWidget * uploadButton) {
   UploadClosure uc;
   const char * filenamerest;
   GtkWidget * uploadLine;
@@ -314,8 +314,8 @@ static char * selectFile(const char *oldfilename) {
 #endif /* MINGW */
 }
 
-void on_mainFileSharingInsertBrowseButton_clicked(GtkWidget * browseButton,
-                                                  gpointer dummy) {
+void on_mainFileSharingInsertBrowseButton_clicked_fs(GtkWidget * browseButton,
+                                                     gpointer dummy) {
   char * filename;
   const char *oldfilename;
   GtkWidget * uploadLine;