1 files changed, 28 insertions, 27 deletions

diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 055f126d..5afa8621 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))
     {
-      GNUNET_GEBREAK (ectx, 0);
+      GNUNET_GE_BREAK (ectx, 0);
       return;
     }
   gtk_tree_path_free (path);
@@ -112,7 +112,7 @@ addEntryToSearchTree (SearchList * searchContext,
   unsigned long long size;
   char *size_h;
   GdkPixbuf *pixbuf;
-  enum URITRACK_STATE state;
+  enum GNUNET_URITRACK_STATE state;
 
   state = GNUNET_URITRACK_get_state (ectx, cfg, info->uri);
   mime = getMimeTypeFromMetaData (info->meta);
@@ -120,8 +120,8 @@ addEntryToSearchTree (SearchList * searchContext,
   name = getFileNameFromMetaData (info->meta);
   size = GNUNET_ECRS_uri_test_chk (info->uri)
     || GNUNET_ECRS_uri_test_loc (info->
-                                 uri) ? GNUNET_ECRS_uri_get_file_siz (info->
-                                                                      uri) :
+                                 uri) ? GNUNET_ECRS_uri_get_file_size (info->
+                                                                       uri) :
     0;
   pixbuf = getThumbnailFromMetaData (info->meta);
   size_h = GNUNET_get_byte_size_as_fancy_string (size);
@@ -163,7 +163,7 @@ fs_search_result_received (SearchList * searchContext,
 {
   GtkTreeStore *model;
   GtkTreeIter iter;
-  enum URITRACK_STATE state;
+  enum GNUNET_URITRACK_STATE state;
 
   state = GNUNET_URITRACK_get_state (ectx, cfg, info->uri);
   if ((state & (GNUNET_URITRACK_INSERTED |
@@ -196,13 +196,13 @@ on_search_copy_uri_activate (void *cls, GtkWidget * searchEntry)
                                               list->last_y,
                                               &path, NULL, NULL, NULL))
     {
-      GNUNET_GEBREAK (NULL, 0);
+      GNUNET_GE_BREAK (NULL, 0);
       return FALSE;
     }
   if (FALSE == gtk_tree_model_get_iter (GTK_TREE_MODEL (list->tree),
                                         &iter, path))
     {
-      GNUNET_GEBREAK (NULL, 0);
+      GNUNET_GE_BREAK (NULL, 0);
       gtk_tree_path_free (path);
       return FALSE;
     }
@@ -228,7 +228,7 @@ selectFile ()
 
   uploadXML
     = glade_xml_new (GNUNET_GTK_get_glade_filename (),
-                     "directorySaveDialog", PACKAGNUNET_GENAME);
+                     "directorySaveDialog", PACKAGNUNET_GE_NAME);
   GNUNET_GTK_connect_glade_with_plugins (uploadXML);
   dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML,
                                                    "directorySaveDialog"));
@@ -302,7 +302,7 @@ on_save_search_activate (void *cls, GtkWidget * searchEntry)
                                                  fis_size, fis, meta))
     {
       GNUNET_GTK_add_log_entry (_("Internal error."));
-      GNUNET_GEBREAK (NULL, 0);
+      GNUNET_GE_BREAK (NULL, 0);
       GNUNET_ECRS_meta_data_destroy (meta);
       GNUNET_array_grow (fis, fis_size, 0);
       GNUNET_free (name);
@@ -387,11 +387,11 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
   description = GNUNET_ECRS_uri_to_string (uri);
   if (description == NULL)
     {
-      GNUNET_GEBREAK (ectx, 0);
+      GNUNET_GE_BREAK (ectx, 0);
       return NULL;
     }
-  GNUNET_GEASSERT (ectx,
-                   strlen (description) >= strlen (GNUNET_ECRS_URI_PREFIX));
+  GNUNET_GE_ASSERT (ectx,
+                    strlen (description) >= strlen (GNUNET_ECRS_URI_PREFIX));
   dhead = &description[strlen (GNUNET_ECRS_URI_PREFIX)];
   if (0 ==
       strncmp (dhead, GNUNET_ECRS_SEARCH_INFIX,
@@ -411,7 +411,7 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
   list->searchXML
     =
     glade_xml_new (GNUNET_GTK_get_glade_filename (), "searchResultsFrame",
-                   PACKAGNUNET_GENAME);
+                   PACKAGNUNET_GE_NAME);
   GNUNET_GTK_connect_glade_with_plugins (list->searchXML);
   list->searchpage
     = extractMainWidgetFromWindow (list->searchXML, "searchResultsFrame");
@@ -545,7 +545,7 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
   /* load label */
   list->labelXML
     = glade_xml_new (GNUNET_GTK_get_glade_filename (),
-                     "searchTabLabelWindow", PACKAGNUNET_GENAME);
+                     "searchTabLabelWindow", PACKAGNUNET_GE_NAME);
   GNUNET_GTK_connect_glade_with_plugins (list->labelXML);
   list->tab_label
     = extractMainWidgetFromWindow (list->labelXML, "searchTabLabelWindow");
@@ -657,7 +657,7 @@ fs_search_stopped (SearchList * list)
   for (i = gtk_notebook_get_n_pages (notebook) - 1; i >= 0; i--)
     if (list->searchpage == gtk_notebook_get_nth_page (notebook, i))
       index = i;
-  GNUNET_GEBREAK (ectx, index != -1);
+  GNUNET_GE_BREAK (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))
@@ -736,9 +736,9 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
                                     "fssearchKeywordComboBoxEntry");
   if ((searchString == NULL) || (strlen (searchString) == 0))
     {
-      GNUNET_GELOG (ectx,
-                    GNUNET_GEERROR | GNUNET_GEUSER | GNUNET_GEIMMEDIATE,
-                    _("Need a keyword to search!\n"));
+      GNUNET_GE_LOG (ectx,
+                     GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
+                     _("Need a keyword to search!\n"));
       return;
     }
   /* add the keyword to the list of keywords that have
@@ -781,7 +781,7 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
         }
       else
         {
-          GNUNET_GEASSERT (ectx, strlen (ns) == sizeof (GNUNET_EncName) - 1);
+          GNUNET_GE_ASSERT (ectx, strlen (ns) == sizeof (GNUNET_EncName) - 1);
           if ((descStr == NULL) && (ns != NULL))
             descStr = GNUNET_strdup (ns);
         }
@@ -801,10 +801,11 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
           fsss.uri = GNUNET_ECRS_string_to_uri (ectx, ustring);
           if (fsss.uri == NULL)
             {
-              GNUNET_GELOG (ectx,
-                            GNUNET_GEERROR | GNUNET_GEBULK | GNUNET_GEUSER,
-                            _("Failed to create namespace URI from `%s'.\n"),
-                            ustring);
+              GNUNET_GE_LOG (ectx,
+                             GNUNET_GE_ERROR | GNUNET_GE_BULK |
+                             GNUNET_GE_USER,
+                             _("Failed to create namespace URI from `%s'.\n"),
+                             ustring);
             }
           GNUNET_free (ustring);
         }
@@ -817,7 +818,7 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
     fsss.uri = GNUNET_ECRS_keyword_string_to_uri (ectx, searchString);
   if (fsss.uri == NULL)
     {
-      GNUNET_GEBREAK (ectx, 0);
+      GNUNET_GE_BREAK (ectx, 0);
       return;
     }
   /* check if search is already running */
@@ -840,7 +841,7 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
                   return;
                 }
             }
-          GNUNET_GEBREAK (ectx, 0);
+          GNUNET_GE_BREAK (ectx, 0);
         }
       list = list->next;
     }
@@ -893,7 +894,7 @@ on_closeSearchButton_clicked_fs (GtkWidget * searchPage,
         break;
       list = list->next;
     }
-  GNUNET_GEASSERT (ectx, list != NULL);
+  GNUNET_GE_ASSERT (ectx, list != NULL);
   if (list->fsui_list == NULL)
     {
       /* open directory - close directly */
@@ -927,7 +928,7 @@ on_abortSearchButton_clicked_fs (GtkWidget * searchPage,
         break;
       list = list->next;
     }
-  GNUNET_GEASSERT (ectx, list != NULL);
+  GNUNET_GE_ASSERT (ectx, list != NULL);
   if (list->fsui_list != NULL)
     {
       fcbc.method = &GNUNET_FSUI_search_abort;