1 files changed, 105 insertions, 105 deletions

diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 9bb6b84e..3addb5dd 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -73,7 +73,7 @@ updateSearchSummary (SearchList * searchContext)
   if (TRUE !=
       gtk_tree_model_get_iter (GTK_TREE_MODEL (search_summary), &iter, path))
     {
-      GE_BREAK (ectx, 0);
+      GNUNET_GEBREAK (ectx, 0);
       return;
     }
   gtk_tree_path_free (path);
@@ -104,7 +104,7 @@ updateSearchSummary (SearchList * searchContext)
 void
 addEntryToSearchTree (SearchList * searchContext,
                       DownloadList * downloadParent,
-                      const ECRS_FileInfo * info, GtkTreeIter * iter)
+                      const GNUNET_ECRS_FileInfo * info, GtkTreeIter * iter)
 {
   char *name;
   char *mime;
@@ -114,12 +114,12 @@ addEntryToSearchTree (SearchList * searchContext,
   GdkPixbuf *pixbuf;
   enum URITRACK_STATE state;
 
-  state = URITRACK_getState (ectx, cfg, info->uri);
+  state = GNUNET_URITRACK_get_state (ectx, cfg, info->uri);
   mime = getMimeTypeFromMetaData (info->meta);
   desc = getDescriptionFromMetaData (info->meta);
   name = getFileNameFromMetaData (info->meta);
-  size = ECRS_isFileUri (info->uri)
-    || ECRS_isLocationUri (info->uri) ? ECRS_fileSize (info->uri) : 0;
+  size = GNUNET_ECRS_uri_test_chk (info->uri)
+    || GNUNET_ECRS_uri_test_loc (info->uri) ? GNUNET_ECRS_uri_get_file_siz (info->uri) : 0;
   pixbuf = getThumbnailFromMetaData (info->meta);
   size_h = GNUNET_get_byte_size_as_fancy_string (size);
   gtk_tree_store_set (searchContext->tree,
@@ -130,8 +130,8 @@ addEntryToSearchTree (SearchList * searchContext,
                       SEARCH_MIME, mime,
                       SEARCH_DESC, desc,
                       SEARCH_PIXBUF, pixbuf,
-                      SEARCH_URI, ECRS_dupUri (info->uri),
-                      SEARCH_META, ECRS_dupMetaData (info->meta),
+                      SEARCH_URI, GNUNET_ECRS_uri_duplicate (info->uri),
+                      SEARCH_META, GNUNET_ECRS_meta_data_duplicate (info->meta),
                       SEARCH_CELL_BG_COLOR, getColorCode (state),
                       SEARCH_CELL_FG_COLOR, "black",
                       SEARCH_INTERNAL, searchContext,
@@ -154,17 +154,17 @@ addEntryToSearchTree (SearchList * searchContext,
  */
 void
 fs_search_result_received (SearchList * searchContext,
-                           const ECRS_FileInfo * info,
-                           const struct ECRS_URI *uri)
+                           const GNUNET_ECRS_FileInfo * info,
+                           const struct GNUNET_ECRS_URI *uri)
 {
   GtkTreeStore *model;
   GtkTreeIter iter;
   enum URITRACK_STATE state;
 
-  state = URITRACK_getState (ectx, cfg, info->uri);
-  if ((state & (URITRACK_INSERTED |
-                URITRACK_INDEXED)) &&
-      (GNUNET_YES == GC_get_configuration_value_yesno (cfg,
+  state = GNUNET_URITRACK_get_state (ectx, cfg, info->uri);
+  if ((state & (GNUNET_URITRACK_INSERTED |
+                GNUNET_URITRACK_INDEXED)) &&
+      (GNUNET_YES == GNUNET_GC_get_configuration_value_yesno (cfg,
                                                 "GNUNET-GTK",
                                                 "DISABLE-OWN", GNUNET_YES)))
     return;
@@ -181,7 +181,7 @@ on_search_copy_uri_activate (void *cls, GtkWidget * searchEntry)
   SearchList *list = cls;
   GtkTreePath *path;
   GtkTreeIter iter;
-  struct ECRS_URI *uri;
+  struct GNUNET_ECRS_URI *uri;
   char *str;
   GtkClipboard *clip;
 
@@ -191,13 +191,13 @@ on_search_copy_uri_activate (void *cls, GtkWidget * searchEntry)
                                               list->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 (list->tree),
                                         &iter, path))
     {
-      GE_BREAK (NULL, 0);
+      GNUNET_GEBREAK (NULL, 0);
       gtk_tree_path_free (path);
       return FALSE;
     }
@@ -205,7 +205,7 @@ on_search_copy_uri_activate (void *cls, GtkWidget * searchEntry)
   uri = NULL;
   gtk_tree_model_get (GTK_TREE_MODEL (list->tree),
                       &iter, SEARCH_URI, &uri, -1);
-  str = ECRS_uriToString (uri);
+  str = GNUNET_ECRS_uri_to_string (uri);
   clip = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
   gtk_clipboard_set_text (clip, str, strlen (str));
   GNUNET_free (str);
@@ -222,9 +222,9 @@ selectFile ()
   char *ret;
 
   uploadXML
-    = glade_xml_new (getGladeFileName (),
-                     "directorySaveDialog", PACKAGE_NAME);
-  connectGladeWithPlugins (uploadXML);
+    = glade_xml_new (GNUNET_GTK_get_glade_filename (),
+                     "directorySaveDialog", PACKAGNUNET_GENAME);
+  GNUNET_GTK_connect_glade_with_plugins (uploadXML);
   dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML,
                                                    "directorySaveDialog"));
   if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_CANCEL)
@@ -256,8 +256,8 @@ on_save_search_activate (void *cls, GtkWidget * searchEntry)
   char *directory;
   unsigned long long dir_len;
   unsigned int fis_size;
-  ECRS_FileInfo *fis;
-  struct ECRS_MetaData *meta;
+  GNUNET_ECRS_FileInfo *fis;
+  struct GNUNET_ECRS_MetaData *meta;
   GtkTreeModel *model;
   GtkTreeIter iter;
   unsigned int pos;
@@ -265,7 +265,7 @@ on_save_search_activate (void *cls, GtkWidget * searchEntry)
   model = gtk_tree_view_get_model (list->treeview);
   if (TRUE != gtk_tree_model_get_iter_first (model, &iter))
     {
-      addLogEntry (_("No search results yet, cannot save!"));
+      GNUNET_GTK_add_log_entry (_("No search results yet, cannot save!"));
       return FALSE;
     }
 
@@ -287,25 +287,25 @@ on_save_search_activate (void *cls, GtkWidget * searchEntry)
       pos++;
     }
   while (gtk_tree_model_iter_next (model, &iter));
-  meta = ECRS_createMetaData ();
-  ECRS_addToMetaData (meta, EXTRACTOR_KEYWORDS, list->searchString);
-  ECRS_addToMetaData (meta, EXTRACTOR_DESCRIPTION, _("Saved search results"));
-  ECRS_addToMetaData (meta, EXTRACTOR_SOFTWARE, "gnunet-gtk");
-  if (GNUNET_OK != ECRS_createDirectory (NULL,
+  meta = GNUNET_ECRS_meta_data_create ();
+  GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_KEYWORDS, list->searchString);
+  GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_DESCRIPTION, _("Saved search results"));
+  GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_SOFTWARE, "gnunet-gtk");
+  if (GNUNET_OK != GNUNET_ECRS_directory_create (NULL,
                                   &directory, &dir_len, fis_size, fis, meta))
     {
-      addLogEntry (_("Internal error."));
-      GE_BREAK (NULL, 0);
-      ECRS_freeMetaData (meta);
+      GNUNET_GTK_add_log_entry (_("Internal error."));
+      GNUNET_GEBREAK (NULL, 0);
+      GNUNET_ECRS_meta_data_destroy (meta);
       GNUNET_array_grow (fis, fis_size, 0);
       GNUNET_free (name);
       return FALSE;
     }
-  ECRS_freeMetaData (meta);
+  GNUNET_ECRS_meta_data_destroy (meta);
   GNUNET_array_grow (fis, fis_size, 0);
   if (GNUNET_OK != GNUNET_disk_file_write (NULL, name, directory, dir_len, "644"))
     {
-      addLogEntry (_("Error writing file `%s'."), name);
+      GNUNET_GTK_add_log_entry (_("Error writing file `%s'."), name);
     }
   GNUNET_free (directory);
   GNUNET_free (name);
@@ -357,11 +357,11 @@ search_click_handler (void *cls, GdkEvent * event)
  * tab and add an entry to the summary.
  */
 SearchList *
-fs_search_started (struct FSUI_SearchList * fsui_list,
-                   const struct ECRS_URI * uri,
+fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
+                   const struct GNUNET_ECRS_URI * uri,
                    unsigned int anonymityLevel,
                    unsigned int resultCount,
-                   const ECRS_FileInfo * results, FSUI_State state)
+                   const GNUNET_ECRS_FileInfo * results, GNUNET_FSUI_State state)
 {
   SearchList *list;
   gint pages;
@@ -375,29 +375,29 @@ fs_search_started (struct FSUI_SearchList * fsui_list,
   int col;
   int i;
 
-  description = ECRS_uriToString (uri);
+  description = GNUNET_ECRS_uri_to_string (uri);
   if (description == NULL)
     {
-      GE_BREAK (ectx, 0);
+      GNUNET_GEBREAK (ectx, 0);
       return NULL;
     }
-  GE_ASSERT (ectx, strlen (description) >= strlen (ECRS_URI_PREFIX));
-  dhead = &description[strlen (ECRS_URI_PREFIX)];
-  if (0 == strncmp (dhead, ECRS_SEARCH_INFIX, strlen (ECRS_SEARCH_INFIX)))
-    dhead = &dhead[strlen (ECRS_SEARCH_INFIX)];
+  GNUNET_GEASSERT (ectx, strlen (description) >= strlen (GNUNET_ECRS_URI_PREFIX));
+  dhead = &description[strlen (GNUNET_ECRS_URI_PREFIX)];
+  if (0 == strncmp (dhead, GNUNET_ECRS_SEARCH_INFIX, strlen (GNUNET_ECRS_SEARCH_INFIX)))
+    dhead = &dhead[strlen (GNUNET_ECRS_SEARCH_INFIX)];
   else if (0 == strncmp (dhead,
-                         ECRS_SUBSPACE_INFIX, strlen (ECRS_SUBSPACE_INFIX)))
-    dhead = &dhead[strlen (ECRS_SUBSPACE_INFIX)];
+                         GNUNET_ECRS_SUBSPACE_INFIX, strlen (GNUNET_ECRS_SUBSPACE_INFIX)))
+    dhead = &dhead[strlen (GNUNET_ECRS_SUBSPACE_INFIX)];
   list = GNUNET_malloc (sizeof (SearchList));
   memset (list, 0, sizeof (SearchList));
   list->searchString = GNUNET_strdup (dhead);
-  list->uri = ECRS_dupUri (uri);
+  list->uri = GNUNET_ECRS_uri_duplicate (uri);
   list->fsui_list = fsui_list;
   list->next = search_head;
   search_head = list;
   list->searchXML
-    = glade_xml_new (getGladeFileName (), "searchResultsFrame", PACKAGE_NAME);
-  connectGladeWithPlugins (list->searchXML);
+    = glade_xml_new (GNUNET_GTK_get_glade_filename (), "searchResultsFrame", PACKAGNUNET_GENAME);
+  GNUNET_GTK_connect_glade_with_plugins (list->searchXML);
   list->searchpage
     = extractMainWidgetFromWindow (list->searchXML, "searchResultsFrame");
   /* setup tree view and renderers */
@@ -477,7 +477,7 @@ fs_search_started (struct FSUI_SearchList * fsui_list,
   gtk_tree_view_column_set_reorderable (column, TRUE);
   gtk_tree_view_column_set_sort_column_id (column, SEARCH_MIME);
 
-  if (GNUNET_YES != GC_get_configuration_value_yesno (cfg,
+  if (GNUNET_YES != GNUNET_GC_get_configuration_value_yesno (cfg,
                                                "GNUNET-GTK",
                                                "DISABLE-PREVIEWS", GNUNET_NO))
     {
@@ -528,9 +528,9 @@ fs_search_started (struct FSUI_SearchList * fsui_list,
 
   /* load label */
   list->labelXML
-    = glade_xml_new (getGladeFileName (),
-                     "searchTabLabelWindow", PACKAGE_NAME);
-  connectGladeWithPlugins (list->labelXML);
+    = glade_xml_new (GNUNET_GTK_get_glade_filename (),
+                     "searchTabLabelWindow", PACKAGNUNET_GENAME);
+  GNUNET_GTK_connect_glade_with_plugins (list->labelXML);
   list->tab_label
     = extractMainWidgetFromWindow (list->labelXML, "searchTabLabelWindow");
   /* process existing results */
@@ -541,7 +541,7 @@ fs_search_started (struct FSUI_SearchList * fsui_list,
 
   /* insert new page into search notebook */
   notebook
-    = GTK_NOTEBOOK (glade_xml_get_widget (getMainXML (), "downloadNotebook"));
+    = GTK_NOTEBOOK (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "downloadNotebook"));
   pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook));
   gtk_notebook_append_page (notebook, list->searchpage, list->tab_label);
   gtk_notebook_set_current_page (notebook, pages);
@@ -558,8 +558,8 @@ static void
 freeIterSubtree (GtkTreeModel * tree, GtkTreeIter * iter)
 {
   GtkTreeIter child;
-  struct ECRS_URI *uri;
-  struct ECRS_MetaData *meta;
+  struct GNUNET_ECRS_URI *uri;
+  struct GNUNET_ECRS_MetaData *meta;
 
   do
     {
@@ -568,9 +568,9 @@ freeIterSubtree (GtkTreeModel * tree, GtkTreeIter * iter)
       gtk_tree_model_get (tree,
                           iter, SEARCH_URI, &uri, SEARCH_META, &meta, -1);
       if (uri != NULL)
-        ECRS_freeUri (uri);
+        GNUNET_ECRS_uri_destroy (uri);
       if (meta != NULL)
-        ECRS_freeMetaData (meta);
+        GNUNET_ECRS_meta_data_destroy (meta);
       gtk_tree_store_set (GTK_TREE_STORE (tree),
                           iter, SEARCH_URI, NULL, SEARCH_META, NULL, -1);
       if (gtk_tree_model_iter_children (tree, &child, iter))
@@ -632,12 +632,12 @@ fs_search_stopped (SearchList * list)
 
   /* remove page from notebook */
   notebook
-    = GTK_NOTEBOOK (glade_xml_get_widget (getMainXML (), "downloadNotebook"));
+    = GTK_NOTEBOOK (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "downloadNotebook"));
   index = -1;
   for (i = gtk_notebook_get_n_pages (notebook) - 1; i >= 0; i--)
     if (list->searchpage == gtk_notebook_get_nth_page (notebook, i))
       index = i;
-  GE_BREAK (ectx, index != -1);
+  GNUNET_GEBREAK (ectx, index != -1);
   gtk_notebook_remove_page (notebook, index);
   /* recursively free search model */
   if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->tree), &iter))
@@ -653,7 +653,7 @@ fs_search_stopped (SearchList * list)
   UNREF (list->labelXML);
   gtk_tree_row_reference_free (list->summaryViewRowReference);
   GNUNET_free (list->searchString);
-  ECRS_freeUri (list->uri);
+  GNUNET_ECRS_uri_destroy (list->uri);
   GNUNET_free (list);
 }
 
@@ -671,9 +671,9 @@ on_fssearchKeywordComboBoxEntry_changed_fs (gpointer dummy2,
   const char *searchString;
   GtkWidget *searchButton;
 
-  searchString = getEntryLineValue (getMainXML (),
+  searchString = getEntryLineValue (GNUNET_GTK_get_main_glade_XML (),
                                     "fssearchKeywordComboBoxEntry");
-  searchButton = glade_xml_get_widget (getMainXML (), "fssearchbutton");
+  searchButton = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "fssearchbutton");
   gtk_widget_set_sensitive (searchButton, strlen (searchString) > 0);
 }
 
@@ -682,14 +682,14 @@ typedef struct
   unsigned int anonymity;
   unsigned int max;
   GNUNET_CronTime delay;
-  struct ECRS_URI *uri;
+  struct GNUNET_ECRS_URI *uri;
 } FSSS;
 
 static void *
 search_start_helper (void *cls)
 {
   FSSS *fsss = cls;
-  FSUI_startSearch (ctx, fsss->anonymity, fsss->max, fsss->delay, fsss->uri);
+  GNUNET_FSUI_search_start (ctx, fsss->anonymity, fsss->max, fsss->delay, fsss->uri);
   return NULL;
 }
 
@@ -710,19 +710,19 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
   GtkWidget *searchNamespaceGtkCB;
   GtkNotebook *notebook;
 
-  searchString = getEntryLineValue (getMainXML (),
+  searchString = getEntryLineValue (GNUNET_GTK_get_main_glade_XML (),
                                     "fssearchKeywordComboBoxEntry");
   if ((searchString == NULL) || (strlen (searchString) == 0))
     {
-      GE_LOG (ectx,
-              GE_ERROR | GE_USER | GE_IMMEDIATE,
+      GNUNET_GELOG (ectx,
+              GNUNET_GEERROR | GNUNET_GEUSER | GNUNET_GEIMMEDIATE,
               _("Need a keyword to search!\n"));
       return;
     }
   /* add the keyword to the list of keywords that have
      been used so far */
   searchKeywordGtkCB
-    = GTK_COMBO_BOX (glade_xml_get_widget (getMainXML (),
+    = GTK_COMBO_BOX (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                                            "fssearchKeywordComboBoxEntry"));
   i = gtk_combo_box_get_active (searchKeywordGtkCB);
   if (i == -1)
@@ -736,7 +736,7 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
   fsss.uri = NULL;
   /* check for namespace search */
   searchNamespaceGtkCB
-    = glade_xml_get_widget (getMainXML (), "searchNamespaceComboBoxEntry");
+    = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "searchNamespaceComboBoxEntry");
   if (TRUE ==
       gtk_combo_box_get_active_iter (GTK_COMBO_BOX (searchNamespaceGtkCB),
                                      &iter))
@@ -757,7 +757,7 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
         }
       else
         {
-          GE_ASSERT (ectx, strlen (ns) == sizeof (GNUNET_EncName) - 1);
+          GNUNET_GEASSERT (ectx, strlen (ns) == sizeof (GNUNET_EncName) - 1);
           if ((descStr == NULL) && (ns != NULL))
             descStr = GNUNET_strdup (ns);
         }
@@ -766,18 +766,18 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
           char *ustring;
 
           ustring = GNUNET_malloc (strlen (searchString) + sizeof (GNUNET_EncName) +
-                            strlen (ECRS_URI_PREFIX) +
-                            strlen (ECRS_SUBSPACE_INFIX) + 10);
-          strcpy (ustring, ECRS_URI_PREFIX);
-          strcat (ustring, ECRS_SUBSPACE_INFIX);
+                            strlen (GNUNET_ECRS_URI_PREFIX) +
+                            strlen (GNUNET_ECRS_SUBSPACE_INFIX) + 10);
+          strcpy (ustring, GNUNET_ECRS_URI_PREFIX);
+          strcat (ustring, GNUNET_ECRS_SUBSPACE_INFIX);
           strcat (ustring, ns);
           strcat (ustring, "/");
           strcat (ustring, searchString);
-          fsss.uri = ECRS_stringToUri (ectx, ustring);
+          fsss.uri = GNUNET_ECRS_string_to_uri (ectx, ustring);
           if (fsss.uri == NULL)
             {
-              GE_LOG (ectx,
-                      GE_ERROR | GE_BULK | GE_USER,
+              GNUNET_GELOG (ectx,
+                      GNUNET_GEERROR | GNUNET_GEBULK | GNUNET_GEUSER,
                       _("Failed to create namespace URI from `%s'.\n"),
                       ustring);
             }
@@ -789,47 +789,47 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
         free (ns);
     }
   if (fsss.uri == NULL)
-    fsss.uri = ECRS_parseCharKeywordURI (ectx, searchString);
+    fsss.uri = GNUNET_ECRS_keyword_string_to_uri (ectx, searchString);
   if (fsss.uri == NULL)
     {
-      GE_BREAK (ectx, 0);
+      GNUNET_GEBREAK (ectx, 0);
       return;
     }
   /* check if search is already running */
   notebook
-    = GTK_NOTEBOOK (glade_xml_get_widget (getMainXML (), "downloadNotebook"));
+    = GTK_NOTEBOOK (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "downloadNotebook"));
   pages = gtk_notebook_get_n_pages (notebook);
   list = search_head;
   while (list != NULL)
     {
-      if (ECRS_equalsUri (list->uri, fsss.uri))
+      if (GNUNET_ECRS_uri_test_equal (list->uri, fsss.uri))
         {
           for (i = 0; i < pages; i++)
             {
               if (gtk_notebook_get_nth_page (notebook, i) == list->searchpage)
                 {
                   gtk_notebook_set_current_page (notebook, i);
-                  ECRS_freeUri (fsss.uri);
+                  GNUNET_ECRS_uri_destroy (fsss.uri);
                   return;
                 }
             }
-          GE_BREAK (ectx, 0);
+          GNUNET_GEBREAK (ectx, 0);
         }
       list = list->next;
     }
-  fsss.anonymity = getSpinButtonValue (getMainXML (),
+  fsss.anonymity = getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
                                        "searchAnonymitySelectionSpinButton");
-  fsss.max = getSpinButtonValue (getMainXML (), "maxResultsSpinButton");
-  fsss.delay = getSpinButtonValue (getMainXML (),
+  fsss.max = getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (), "maxResultsSpinButton");
+  fsss.delay = getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
                                    "searchDelaySpinButton") * GNUNET_CRON_SECONDS;
-  run_with_save_calls (search_start_helper, &fsss);
-  ECRS_freeUri (fsss.uri);
+  GNUNET_GTK_run_with_save_calls (search_start_helper, &fsss);
+  GNUNET_ECRS_uri_destroy (fsss.uri);
 }
 
 struct FCBC
 {
-  int (*method) (struct FSUI_Context * ctx, struct FSUI_SearchList * list);
-  struct FSUI_SearchList *argument;
+  int (*method) (struct GNUNET_FSUI_Context * ctx, struct GNUNET_FSUI_SearchList * list);
+  struct GNUNET_FSUI_SearchList *argument;
 };
 
 static void *
@@ -862,7 +862,7 @@ on_closeSearchButton_clicked_fs (GtkWidget * searchPage,
         break;
       list = list->next;
     }
-  GE_ASSERT (ectx, list != NULL);
+  GNUNET_GEASSERT (ectx, list != NULL);
   if (list->fsui_list == NULL)
     {
       /* open directory - close directly */
@@ -871,11 +871,11 @@ on_closeSearchButton_clicked_fs (GtkWidget * searchPage,
   else
     {
       /* actual search - close via FSUI */
-      fcbc.method = &FSUI_abortSearch;
+      fcbc.method = &GNUNET_FSUI_search_abort;
       fcbc.argument = list->fsui_list;
-      run_with_save_calls (&fsui_callback, &fcbc);
-      fcbc.method = &FSUI_stopSearch;
-      run_with_save_calls (&fsui_callback, &fcbc);
+      GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
+      fcbc.method = &GNUNET_FSUI_search_stop;
+      GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
     }
 }
 
@@ -896,12 +896,12 @@ on_abortSearchButton_clicked_fs (GtkWidget * searchPage,
         break;
       list = list->next;
     }
-  GE_ASSERT (ectx, list != NULL);
+  GNUNET_GEASSERT (ectx, list != NULL);
   if (list->fsui_list != NULL)
     {
-      fcbc.method = &FSUI_abortSearch;
+      fcbc.method = &GNUNET_FSUI_search_abort;
       fcbc.argument = list->fsui_list;
-      run_with_save_calls (&fsui_callback, &fcbc);
+      GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
     }
 }
 
@@ -923,11 +923,11 @@ stopSearch (GtkTreeModel * model,
         }
       else
         {
-          fcbc.method = &FSUI_abortSearch;
+          fcbc.method = &GNUNET_FSUI_search_abort;
           fcbc.argument = s->fsui_list;
-          run_with_save_calls (&fsui_callback, &fcbc);
-          fcbc.method = &FSUI_stopSearch;
-          run_with_save_calls (&fsui_callback, &fcbc);
+          GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
+          fcbc.method = &GNUNET_FSUI_search_stop;
+          GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
         }
     }
 }
@@ -942,7 +942,7 @@ on_closeSearchSummaryButton_clicked_fs (GtkWidget * treeview,
   GtkTreeSelection *selection;
 
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
-  ggc_tree_selection_selected_foreach (selection, &stopSearch, NULL);
+  GNUNET_GTK_tree_selection_selected_foreach (selection, &stopSearch, NULL);
 }
 
 static void
@@ -956,9 +956,9 @@ abortSearch (GtkTreeModel * model,
   gtk_tree_model_get (model, iter, SEARCH_SUMMARY_INTERNAL, &s, -1);
   if ((s != NULL) && (s->fsui_list != NULL))
     {
-      fcbc.method = &FSUI_abortSearch;
+      fcbc.method = &GNUNET_FSUI_search_abort;
       fcbc.argument = s->fsui_list;
-      run_with_save_calls (&fsui_callback, &fcbc);
+      GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
     }
 }
 
@@ -972,7 +972,7 @@ on_abortSearchSummaryButton_clicked_fs (GtkWidget * treeview,
   GtkTreeSelection *selection;
 
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
-  ggc_tree_selection_selected_foreach (selection, &abortSearch, NULL);
+  GNUNET_GTK_tree_selection_selected_foreach (selection, &abortSearch, NULL);
 }
 
 /* end of search.c */