1 files changed, 33 insertions, 33 deletions

diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index dd424ee3..e41cf46c 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -114,10 +114,10 @@ makeNamespaceFrame (NamespaceList * entry)
   GtkTreeViewColumn *column;
   int col;
 
-  DEBUG_BEGIN ();
+  GNUNET_GTK_DEBUG_BEGIN ();
   namespaceXML
     = glade_xml_new (GNUNET_GTK_get_glade_filename (),
-                     "namespaceContentFrame", PACKAGNUNET_GENAME);
+                     "namespaceContentFrame", PACKAGNUNET_GE_NAME);
   GNUNET_GTK_connect_glade_with_plugins (namespaceXML);
   child = extractMainWidgetFromWindow (namespaceXML, "namespaceContentFrame");
   resultList = glade_xml_get_widget (namespaceXML,
@@ -278,7 +278,7 @@ makeNamespaceFrame (NamespaceList * entry)
 
 
   UNREF (namespaceXML);
-  DEBUG_END ();
+  GNUNET_GTK_DEBUG_END ();
 
   entry->namespacepage = child;
 }
@@ -318,7 +318,7 @@ addNamespaceContentToModel (void *cls,
   unsigned long long size;
   char *size_h;
 
-  DEBUG_BEGIN ();
+  GNUNET_GTK_DEBUG_BEGIN ();
   filename = GNUNET_ECRS_meta_data_get_first_by_types (fi->meta,
                                                        EXTRACTOR_FILENAME,
                                                        EXTRACTOR_TITLE,
@@ -352,7 +352,7 @@ addNamespaceContentToModel (void *cls,
   if (mime == NULL)
     mime = GNUNET_strdup (_("unknown"));
   if (GNUNET_ECRS_uri_test_chk (fi->uri))
-    size = GNUNET_ECRS_uri_get_file_siz (fi->uri);
+    size = GNUNET_ECRS_uri_get_file_size (fi->uri);
   else
     size = 0;
   uriString = GNUNET_ECRS_uri_to_string (fi->uri);
@@ -393,7 +393,7 @@ addNamespaceContentToModel (void *cls,
   GNUNET_free (freq);
   GNUNET_free (date);
   GNUNET_free (mime);
-  DEBUG_END ();
+  GNUNET_GTK_DEBUG_END ();
   return GNUNET_OK;
 }
 
@@ -415,7 +415,7 @@ addTabForNamespace (void *unused,
       GNUNET_ECRS_namespace_test_exists (NULL, cfg, namespaceName,
                                          namespaceId))
     return GNUNET_OK;
-  DEBUG_BEGIN ();
+  GNUNET_GTK_DEBUG_BEGIN ();
   label = gtk_label_new (namespaceName);
   list = GNUNET_malloc (sizeof (NamespaceList));
   list->name = GNUNET_strdup (namespaceName);
@@ -434,7 +434,7 @@ addTabForNamespace (void *unused,
   gtk_widget_show (notebook);
   GNUNET_NS_namespace_list_contents
     (ectx, cfg, namespaceName, &addNamespaceContentToModel, list->model);
-  DEBUG_END ();
+  GNUNET_GTK_DEBUG_END ();
   /* enable "delete" menu entry */
 
   del_menu =
@@ -468,7 +468,7 @@ frame_destroy (GtkWidget * tree)
     }
   if (pos == NULL)
     {
-      GNUNET_GEBREAK (NULL, 0);
+      GNUNET_GE_BREAK (NULL, 0);
       return;
     }
   if (prev == NULL)
@@ -516,7 +516,7 @@ namespaceDelete_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   GtkWidget *dialog;
   gint ret;
 
-  DEBUG_BEGIN ();
+  GNUNET_GTK_DEBUG_BEGIN ();
   notebook =
     glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                           "localNamespacesNotebook");
@@ -528,7 +528,7 @@ namespaceDelete_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
       dialog = gtk_message_dialog_new
         (NULL,
          GTK_DIALOG_MODAL,
-         GTK_MESSAGNUNET_GEERROR,
+         GTK_MESSAGE_ERROR,
          GTK_BUTTONS_CLOSE,
          _("No local namespaces available that could be deleted!"));
       gtk_dialog_run (GTK_DIALOG (dialog));
@@ -545,7 +545,7 @@ namespaceDelete_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
     }
   if (list == NULL)
     {
-      GNUNET_GEBREAK (ectx, 0);
+      GNUNET_GE_BREAK (ectx, 0);
       return;
     }
   /* open window to ask for confirmation,
@@ -554,7 +554,7 @@ namespaceDelete_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   dialog = gtk_message_dialog_new
     (NULL,
      GTK_DIALOG_MODAL,
-     GTK_MESSAGNUNET_GEERROR,
+     GTK_MESSAGE_ERROR,
      GTK_BUTTONS_YES_NO,
      _("Should the namespace `%s' really be deleted?"), list->name);
   ret = gtk_dialog_run (GTK_DIALOG (dialog));
@@ -564,7 +564,7 @@ namespaceDelete_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), num);
   GNUNET_NS_namespace_delete (ectx, cfg, list->name);
   frame_destroy (list->treeview);
-  DEBUG_END ();
+  GNUNET_GTK_DEBUG_END ();
 }
 
 typedef struct
@@ -592,13 +592,13 @@ addToNamespaceCB (GtkTreeModel * model,
   NamespaceList *list;
   GNUNET_ECRS_FileInfo fi;
 
-  DEBUG_BEGIN ();
+  GNUNET_GTK_DEBUG_BEGIN ();
   dst = NULL;
   gtk_tree_model_get (model,
                       iter, NAMESPACE_URI, &dst, NAMESPACE_META, &meta, -1);
   if (dst == NULL)
     {
-      GNUNET_GEBREAK (ectx, 0);
+      GNUNET_GE_BREAK (ectx, 0);
       return;
     }
   resultURI = GNUNET_NS_add_to_namespace (ectx, cfg, cls->anonymityLevel, 1000, /* FIXME: priority */
@@ -615,7 +615,7 @@ addToNamespaceCB (GtkTreeModel * model,
         list = list->next;
       if (list == NULL)
         {
-          GNUNET_GEBREAK (ectx, 0);
+          GNUNET_GE_BREAK (ectx, 0);
         }
       else
         {
@@ -639,7 +639,7 @@ addToNamespaceCB (GtkTreeModel * model,
                                     ("Failed to insert content into namespace "
                                      "(consult logs).\n"));
     }
-  DEBUG_END ();
+  GNUNET_GTK_DEBUG_END ();
 }
 
 void
@@ -677,21 +677,21 @@ on_namespaceInsertButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
     glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                           "localNamespacesNotebook");
   num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
-  GNUNET_GEASSERT (ectx, num != -1);
+  GNUNET_GE_ASSERT (ectx, num != -1);
   page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), num);
   list = head;
   while ((list != NULL) && (list->namespacepage != page))
     list = list->next;
   if (list == NULL)
     {
-      GNUNET_GEBREAK (ectx, 0);
+      GNUNET_GE_BREAK (ectx, 0);
       return;
     }
   cls.namespaceName = list->name;
 
   metaXML
     = glade_xml_new (GNUNET_GTK_get_glade_filename (),
-                     "namespaceInsertDialog", PACKAGNUNET_GENAME);
+                     "namespaceInsertDialog", PACKAGNUNET_GE_NAME);
   GNUNET_GTK_connect_glade_with_plugins (metaXML);
   dialog = glade_xml_get_widget (metaXML, "namespaceInsertDialog");
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -715,7 +715,7 @@ on_namespaceInsertButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
           dialog = gtk_message_dialog_new
             (NULL,
              GTK_DIALOG_MODAL,
-             GTK_MESSAGNUNET_GEERROR,
+             GTK_MESSAGE_ERROR,
              GTK_BUTTONS_CLOSE, _("Failed to parse given time interval!"));
           gtk_dialog_run (GTK_DIALOG (dialog));
           gtk_widget_destroy (dialog);
@@ -779,20 +779,20 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   gint num;
   const char *nn_str;
 
-  DEBUG_BEGIN ();
+  GNUNET_GTK_DEBUG_BEGIN ();
   /* find out which namespace this is about */
   notebook =
     glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                           "localNamespacesNotebook");
   num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
-  GNUNET_GEASSERT (ectx, num != -1);
+  GNUNET_GE_ASSERT (ectx, num != -1);
   page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), num);
   list = head;
   while ((list != NULL) && (list->namespacepage != page))
     list = list->next;
   if (list == NULL)
     {
-      GNUNET_GEBREAK (ectx, 0);
+      GNUNET_GE_BREAK (ectx, 0);
       return;
     }
   cls.namespaceName = list->name;
@@ -801,7 +801,7 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (list->treeview));
   if (TRUE != gtk_tree_selection_get_selected (selection, NULL, &iter))
     {
-      GNUNET_GEBREAK (ectx, 0);
+      GNUNET_GE_BREAK (ectx, 0);
       return;
     }
   gtk_tree_model_get (list->model,
@@ -811,19 +811,19 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
                       IN_NAMESPACE_PUB_FREQ_STRING, &freq, -1);
   if ((last == NULL) || (next == NULL) || (freq == NULL))
     {
-      GNUNET_GEBREAK (NULL, 0);
+      GNUNET_GE_BREAK (NULL, 0);
       return;
     }
   if (GNUNET_OK != parseTimeInterval (freq, &cls.updateInterval))
     {
-      GNUNET_GEBREAK (ectx, 0);
+      GNUNET_GE_BREAK (ectx, 0);
       cls.updateInterval = GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC;
     }
 
   /* create update dialog */
   metaXML
     = glade_xml_new (GNUNET_GTK_get_glade_filename (),
-                     "namespaceUpdateDialog", PACKAGNUNET_GENAME);
+                     "namespaceUpdateDialog", PACKAGNUNET_GE_NAME);
   GNUNET_GTK_connect_glade_with_plugins (metaXML);
   dialog = glade_xml_get_widget (metaXML, "namespaceUpdateDialog");
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -877,7 +877,7 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
       mdialog = gtk_message_dialog_new
         (NULL,
          GTK_DIALOG_MODAL,
-         GTK_MESSAGNUNET_GEERROR,
+         GTK_MESSAGE_ERROR,
          GTK_BUTTONS_CLOSE, _("Failed to parse given time interval!"));
       gtk_dialog_run (GTK_DIALOG (mdialog));
       gtk_widget_destroy (mdialog);
@@ -896,7 +896,7 @@ CLEANUP:
   free (last);
   free (next);
   free (freq);
-  DEBUG_END ();
+  GNUNET_GTK_DEBUG_END ();
 }
 
 
@@ -911,7 +911,7 @@ fs_namespace_start ()
   GtkTreeViewColumn *column;
   int col;
 
-  DEBUG_BEGIN ();
+  GNUNET_GTK_DEBUG_BEGIN ();
   trackCheckButton
     =
     glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
@@ -990,7 +990,7 @@ fs_namespace_start ()
   GNUNET_NS_namespace_list_all (ectx, cfg, &addTabForNamespace, NULL);
   GNUNET_NS_register_discovery_callback (ectx, cfg, &namespace_discovered_cb,
                                          NULL);
-  DEBUG_END ();
+  GNUNET_GTK_DEBUG_END ();
 }