2nd round of renaming

1 files changed, 76 insertions, 76 deletions

diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index 6fac3b0c..6026ad7d 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -35,11 +35,11 @@
 #include "collection.h"
 #include "namespace.h"
 
-struct FSUI_Context *ctx;
+struct GNUNET_FSUI_Context *ctx;
 
-struct GE_Context *ectx;
+struct GNUNET_GEContext *ectx;
 
-struct GC_Configuration *cfg;
+struct GNUNET_GC_Configuration *cfg;
 
 SearchList *search_head;
 
@@ -99,7 +99,7 @@ on_anonymity_spin_changed_fs (GtkWidget * w, gpointer dummy)
   spin = GTK_SPIN_BUTTON (w);
   if (spin == NULL)
     {
-      GE_BREAK (NULL, 0);
+      GNUNET_GEBREAK (NULL, 0);
       return;
     }
   val = gtk_spin_button_get_value_as_int (spin);
@@ -120,38 +120,38 @@ on_anonymity_spin_changed_fs (GtkWidget * w, gpointer dummy)
 static void *
 saveEventProcessor (void *cls)
 {
-  const FSUI_Event *event = cls;
+  const GNUNET_FSUI_Event *event = cls;
   void *ret;
 
   ret = NULL;
   switch (event->type)
     {
       /* search events */
-    case FSUI_search_started:
+    case GNUNET_FSUI_search_started:
       ret = fs_search_started (event->data.SearchStarted.sc.pos,
                                event->data.SearchStarted.searchURI,
                                event->data.SearchStarted.anonymityLevel,
-                               0, NULL, FSUI_ACTIVE);
+                               0, NULL, GNUNET_FSUI_ACTIVE);
       break;
-    case FSUI_search_result:
+    case GNUNET_FSUI_search_result:
       fs_search_result_received (event->data.SearchResult.sc.cctx,
                                  &event->data.SearchResult.fi,
                                  event->data.SearchResult.searchURI);
       break;
-    case FSUI_search_error:
+    case GNUNET_FSUI_search_error:
       fs_search_aborted (event->data.SearchError.sc.cctx);
       break;
-    case FSUI_search_aborted:
+    case GNUNET_FSUI_search_aborted:
       fs_search_aborted (event->data.SearchAborted.sc.cctx);
       break;
-    case FSUI_search_completed:
+    case GNUNET_FSUI_search_completed:
       // FIXME...
       fs_search_aborted (event->data.SearchCompleted.sc.cctx);
       break;
-    case FSUI_search_suspended:
+    case GNUNET_FSUI_search_suspended:
       fs_search_aborted (event->data.SearchSuspended.sc.cctx);
       break;
-    case FSUI_search_resumed:
+    case GNUNET_FSUI_search_resumed:
       ret = fs_search_started (event->data.SearchResumed.sc.pos,
                                event->data.SearchResumed.searchURI,
                                event->data.SearchResumed.anonymityLevel,
@@ -159,33 +159,33 @@ saveEventProcessor (void *cls)
                                event->data.SearchResumed.fis,
                                event->data.SearchResumed.state);
       break;
-    case FSUI_search_stopped:
+    case GNUNET_FSUI_search_stopped:
       fs_search_stopped (event->data.SearchStopped.sc.cctx);
       break;
 
       /* download events */
-    case FSUI_download_aborted:
+    case GNUNET_FSUI_download_aborted:
       fs_download_aborted (event->data.DownloadAborted.dc.cctx);
       break;
-    case FSUI_download_error:
+    case GNUNET_FSUI_download_error:
       fs_download_aborted (event->data.DownloadError.dc.cctx);
       break;
-    case FSUI_download_suspended:
+    case GNUNET_FSUI_download_suspended:
       fs_download_stopped (event->data.DownloadSuspended.dc.cctx);
       break;
-    case FSUI_download_progress:
+    case GNUNET_FSUI_download_progress:
       fs_download_update (event->data.DownloadProgress.dc.cctx,
                           event->data.DownloadProgress.completed,
                           event->data.DownloadProgress.last_block,
                           event->data.DownloadProgress.last_size);
       break;
-    case FSUI_download_completed:
+    case GNUNET_FSUI_download_completed:
       fs_download_completed (event->data.DownloadCompleted.dc.cctx);
       break;
-    case FSUI_download_stopped:
+    case GNUNET_FSUI_download_stopped:
       fs_download_stopped (event->data.DownloadStopped.dc.cctx);
       break;
-    case FSUI_download_started:
+    case GNUNET_FSUI_download_started:
       ret = fs_download_started (event->data.DownloadStarted.dc.pos,
                                  event->data.DownloadStarted.dc.pcctx,
                                  event->data.DownloadStarted.dc.sctx,
@@ -193,9 +193,9 @@ saveEventProcessor (void *cls)
                                  event->data.DownloadStarted.anonymityLevel,
                                  &event->data.DownloadStarted.fi,
                                  event->data.DownloadStarted.filename,
-                                 0, GNUNET_get_time (), FSUI_ACTIVE);
+                                 0, GNUNET_get_time (), GNUNET_FSUI_ACTIVE);
       break;
-    case FSUI_download_resumed:
+    case GNUNET_FSUI_download_resumed:
       ret = fs_download_started (event->data.DownloadResumed.dc.pos,
                                  event->data.DownloadResumed.dc.pcctx,
                                  event->data.DownloadResumed.dc.sctx,
@@ -209,36 +209,36 @@ saveEventProcessor (void *cls)
       break;
 
       /* upload events */
-    case FSUI_upload_progress:
+    case GNUNET_FSUI_upload_progress:
       fs_upload_update (event->data.UploadProgress.uc.cctx,
                         event->data.UploadProgress.completed,
                         event->data.UploadProgress.total);
       break;
-    case FSUI_upload_completed:
+    case GNUNET_FSUI_upload_completed:
       fs_upload_complete (event->data.UploadCompleted.uc.cctx,
                           event->data.UploadCompleted.uri);
       break;
-    case FSUI_upload_error:
+    case GNUNET_FSUI_upload_error:
       fs_upload_error (event->data.UploadError.uc.cctx);
       break;
-    case FSUI_upload_aborted:
+    case GNUNET_FSUI_upload_aborted:
       fs_upload_error (event->data.UploadAborted.uc.cctx);
       break;
-    case FSUI_upload_stopped:
+    case GNUNET_FSUI_upload_stopped:
       fs_upload_stopped (event->data.UploadStopped.uc.cctx);
       break;
-    case FSUI_upload_suspended:
+    case GNUNET_FSUI_upload_suspended:
       fs_upload_stopped (event->data.UploadSuspended.uc.cctx);
       break;
-    case FSUI_upload_started:
+    case GNUNET_FSUI_upload_started:
       ret = fs_upload_started (event->data.UploadStarted.uc.pos,
                                event->data.UploadStarted.uc.pcctx,
                                event->data.UploadStarted.filename,
                                NULL,
                                event->data.UploadStarted.total,
-                               0, FSUI_ACTIVE);
+                               0, GNUNET_FSUI_ACTIVE);
       break;
-    case FSUI_upload_resumed:
+    case GNUNET_FSUI_upload_resumed:
       ret = fs_upload_started (event->data.UploadResumed.uc.pos,
                                event->data.UploadResumed.uc.pcctx,
                                event->data.UploadResumed.filename,
@@ -249,9 +249,9 @@ saveEventProcessor (void *cls)
       break;
       /* TODO: unindex events */
     default:
-      GE_BREAK (ectx, 0);
-      GE_LOG (ectx,
-              GE_ERROR,
+      GNUNET_GEBREAK (ectx, 0);
+      GNUNET_GELOG (ectx,
+              GNUNET_GEERROR,
               _("Unhandled (unknown) FSUI event: %u.\n"), event->type);
       break;
     }
@@ -259,9 +259,9 @@ saveEventProcessor (void *cls)
 }
 
 static void *
-eventProcessor (void *unused, const FSUI_Event * event)
+eventProcessor (void *unused, const GNUNET_FSUI_Event * event)
 {
-  return gtkSaveCall (&saveEventProcessor, (void *) event);
+  return GNUNET_GTK_save_call (&saveEventProcessor, (void *) event);
 }
 
 /**
@@ -277,12 +277,12 @@ on_upload_summary_selection_changed (gpointer signal, gpointer cls)
   selection =
     gtk_tree_view_get_selection (GTK_TREE_VIEW
                                  (glade_xml_get_widget
-                                  (getMainXML (), "activeUploadsList")));
-  button = glade_xml_get_widget (getMainXML (), "cancelUploadButton");
+                                  (GNUNET_GTK_get_main_glade_XML (), "activeUploadsList")));
+  button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "cancelUploadButton");
   gtk_widget_set_sensitive (button,
                             gtk_tree_selection_count_selected_rows (selection)
                             > 0);
-  button = glade_xml_get_widget (getMainXML (), "stopUploadButton");
+  button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "stopUploadButton");
   gtk_widget_set_sensitive (button,
                             gtk_tree_selection_count_selected_rows (selection)
                             > 0);
@@ -301,12 +301,12 @@ on_download_summary_selection_changed (gpointer signal, gpointer cls)
   selection =
     gtk_tree_view_get_selection (GTK_TREE_VIEW
                                  (glade_xml_get_widget
-                                  (getMainXML (), "activeDownloadsList")));
-  button = glade_xml_get_widget (getMainXML (), "abortDownloadButton");
+                                  (GNUNET_GTK_get_main_glade_XML (), "activeDownloadsList")));
+  button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "abortDownloadButton");
   gtk_widget_set_sensitive (button,
                             gtk_tree_selection_count_selected_rows (selection)
                             > 0);
-  button = glade_xml_get_widget (getMainXML (), "stopDownloadButton");
+  button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "stopDownloadButton");
   gtk_widget_set_sensitive (button,
                             gtk_tree_selection_count_selected_rows (selection)
                             > 0);
@@ -325,12 +325,12 @@ on_search_summary_selection_changed (gpointer signal, gpointer cls)
   selection =
     gtk_tree_view_get_selection (GTK_TREE_VIEW
                                  (glade_xml_get_widget
-                                  (getMainXML (), "activeSearchesSummary")));
-  button = glade_xml_get_widget (getMainXML (), "cancelSearchButton");
+                                  (GNUNET_GTK_get_main_glade_XML (), "activeSearchesSummary")));
+  button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "cancelSearchButton");
   gtk_widget_set_sensitive (button,
                             gtk_tree_selection_count_selected_rows (selection)
                             > 0);
-  button = glade_xml_get_widget (getMainXML (), "stopSearchButton");
+  button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "stopSearchButton");
   gtk_widget_set_sensitive (button,
                             gtk_tree_selection_count_selected_rows (selection)
                             > 0);
@@ -342,7 +342,7 @@ on_upload_copy_uri_activate (void *cls, GtkWidget * searchEntry)
   GtkTreeView *uploadList = cls;
   GtkTreePath *path;
   GtkTreeIter iter;
-  struct ECRS_URI *uri;
+  struct GNUNET_ECRS_URI *uri;
   char *str;
   GtkClipboard *clip;
 
@@ -352,13 +352,13 @@ on_upload_copy_uri_activate (void *cls, GtkWidget * searchEntry)
                                               last_y,
                                               &path, NULL, NULL, NULL))
     {
-      GE_BREAK (NULL, 0);
+      GNUNET_GEBREAK (NULL, 0);
       return FALSE;
     }
   if (FALSE == gtk_tree_model_get_iter (GTK_TREE_MODEL (upload_summary),
                                         &iter, path))
     {
-      GE_BREAK (NULL, 0);
+      GNUNET_GEBREAK (NULL, 0);
       gtk_tree_path_free (path);
       return FALSE;
     }
@@ -423,7 +423,7 @@ fs_summary_start ()
 
   /* keyword list setup */
   searchCB
-    = GTK_COMBO_BOX_ENTRY (glade_xml_get_widget (getMainXML (),
+    = GTK_COMBO_BOX_ENTRY (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                                                  "fssearchKeywordComboBoxEntry"));
   model = gtk_list_store_new (1, G_TYPE_STRING /* search string */ );
   gtk_combo_box_set_model (GTK_COMBO_BOX (searchCB), GTK_TREE_MODEL (model));
@@ -431,7 +431,7 @@ fs_summary_start ()
 
   /* search namespace selection setup */
   searchCB
-    = GTK_COMBO_BOX_ENTRY (glade_xml_get_widget (getMainXML (),
+    = GTK_COMBO_BOX_ENTRY (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                                                  "searchNamespaceComboBoxEntry"));
 
   model = gtk_list_store_new (NS_SEARCH_NUM, G_TYPE_STRING,     /* what we show */
@@ -442,7 +442,7 @@ fs_summary_start ()
   gtk_combo_box_entry_set_text_column (searchCB, NS_SEARCH_DESCRIPTION);
 
   /* search summary setup */
-  searchList = GTK_TREE_VIEW (glade_xml_get_widget (getMainXML (),
+  searchList = GTK_TREE_VIEW (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                                                     "activeSearchesSummary"));
   search_summary = gtk_list_store_new (SEARCH_SUMMARY_NUM, G_TYPE_STRING,       /* name */
                                        G_TYPE_INT,      /* # results */
@@ -486,7 +486,7 @@ fs_summary_start ()
   gtk_tree_view_column_set_resizable (column, TRUE);
 
   /* download summary setup */
-  downloadList = GTK_TREE_VIEW (glade_xml_get_widget (getMainXML (),
+  downloadList = GTK_TREE_VIEW (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                                                       "activeDownloadsList"));
   download_summary = gtk_tree_store_new (DOWNLOAD_NUM, G_TYPE_STRING,   /* name (full-path file name) */
                                          G_TYPE_STRING, /* name (user-friendly name) */
@@ -553,7 +553,7 @@ fs_summary_start ()
   gtk_tree_view_column_set_resizable (column, TRUE);
 
   /* upload summary setup */
-  uploadList = GTK_TREE_VIEW (glade_xml_get_widget (getMainXML (),
+  uploadList = GTK_TREE_VIEW (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                                                     "activeUploadsList"));
   g_signal_connect_swapped (uploadList,
                             "button-press-event",
@@ -594,7 +594,7 @@ fs_summary_start ()
                                       TRUE);
   /* upload entry setup */
   uploadEntry
-    = glade_xml_get_widget (getMainXML (), "uploadFilenameComboBoxEntry");
+    = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "uploadFilenameComboBoxEntry");
 
   model = gtk_list_store_new (1, G_TYPE_STRING);
   gtk_combo_box_set_model (GTK_COMBO_BOX (uploadEntry),
@@ -608,13 +608,13 @@ fs_summary_start ()
 static void
 fs_summary_stop ()
 {
-  struct ECRS_MetaData *meta;
+  struct GNUNET_ECRS_MetaData *meta;
   GtkComboBox *searchCB;
   GtkTreeModel *model;
   GtkTreeIter iter;
 
   searchCB
-    = GTK_COMBO_BOX (glade_xml_get_widget (getMainXML (),
+    = GTK_COMBO_BOX (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                                            "searchNamespaceComboBoxEntry"));
   model = gtk_combo_box_get_model (searchCB);
   if (gtk_tree_model_get_iter_first (model, &iter))
@@ -625,7 +625,7 @@ fs_summary_stop ()
           gtk_list_store_set (GTK_LIST_STORE (model),
                               &iter, NS_SEARCH_METADATA, NULL, -1);
           if (meta != NULL)
-            ECRS_freeMetaData (meta);
+            GNUNET_ECRS_meta_data_destroy (meta);
         }
       while (gtk_list_store_remove (GTK_LIST_STORE (model), &iter));
     }
@@ -633,7 +633,7 @@ fs_summary_stop ()
 }
 
 void
-init_fs (struct GE_Context *e, struct GC_Configuration *c)
+init_fs (struct GNUNET_GEContext *e, struct GNUNET_GC_Configuration *c)
 {
   GtkWidget *tab;
   GtkWidget *book;
@@ -641,17 +641,17 @@ init_fs (struct GE_Context *e, struct GC_Configuration *c)
 
   ectx = e;
   cfg = c;
-  CO_init (ectx, cfg);
-  tab = glade_xml_get_widget (getMainXML (), "fsnotebook");
+  GNUNET_CO_init (ectx, cfg);
+  tab = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "fsnotebook");
   gtk_widget_show (tab);
-  book = glade_xml_get_widget (getMainXML (), "mainnotebook");
+  book = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainnotebook");
   num = gtk_notebook_get_current_page (GTK_NOTEBOOK (book));
   gtk_notebook_set_current_page (GTK_NOTEBOOK (book), 1);
   gtk_notebook_set_current_page (GTK_NOTEBOOK (book), num);
   fs_summary_start ();
   fs_collection_start ();
   fs_namespace_start ();
-  ctx = FSUI_start (ectx, cfg, "gnunet-gtk", 8, /* FIXME: allow user to configure download parallelism */
+  ctx = GNUNET_FSUI_start (ectx, cfg, "gnunet-gtk", 8, /* FIXME: allow user to configure download parallelism */
                     GNUNET_YES, &eventProcessor, NULL);
 }
 
@@ -660,7 +660,7 @@ hide_save_call (void *arg)
 {
   GtkWidget *tab;
 
-  tab = glade_xml_get_widget (getMainXML (), "fsnotebook");
+  tab = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "fsnotebook");
   gtk_widget_hide (tab);
   return NULL;
 }
@@ -676,29 +676,29 @@ cleanup_save_call (void *arg)
 void
 done_fs ()
 {
-  gtkSaveCall (&hide_save_call, NULL);
-  FSUI_stop (ctx);
-  gtkSaveCall (&cleanup_save_call, NULL);
-  CO_done ();
+  GNUNET_GTK_save_call (&hide_save_call, NULL);
+  GNUNET_FSUI_stop (ctx);
+  GNUNET_GTK_save_call (&cleanup_save_call, NULL);
+  GNUNET_CO_done ();
 }
 
 
 const char *
-getColorCode (enum URITRACK_STATE state)
+getColorCode (enum GNUNET_URITRACK_STATE state)
 {
-  if (state & (URITRACK_DIRECTORY_ADDED))
+  if (state & (GNUNET_URITRACK_DIRECTORY_ADDED))
     return "blue";
-  if (state & (URITRACK_INSERTED || URITRACK_INDEXED))
+  if (state & (GNUNET_URITRACK_INSERTED || GNUNET_URITRACK_INDEXED))
     return "cyan";
-  if ((state & URITRACK_DOWNLOAD_STARTED) &&
+  if ((state & GNUNET_URITRACK_DOWNLOAD_STARTED) &&
       (0 == (state &
-             (URITRACK_DOWNLOAD_COMPLETED | URITRACK_DOWNLOAD_ABORTED))))
+             (GNUNET_URITRACK_DOWNLOAD_COMPLETED | GNUNET_URITRACK_DOWNLOAD_ABORTED))))
     return "yellow";
-  if (state & URITRACK_DOWNLOAD_COMPLETED)
+  if (state & GNUNET_URITRACK_DOWNLOAD_COMPLETED)
     return "springgreen";
-  if (state & URITRACK_DOWNLOAD_ABORTED)
+  if (state & GNUNET_URITRACK_DOWNLOAD_ABORTED)
     return "red";
-  if (state & (URITRACK_SEARCH_RESULT | URITRACK_DIRECTORY_FOUND))
+  if (state & (GNUNET_URITRACK_SEARCH_RESULT | GNUNET_URITRACK_DIRECTORY_FOUND))
     return "gray";
   return "white";
 }