1 files changed, 72 insertions, 72 deletions

diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index ee1d0232..a61e9d2d 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -50,7 +50,7 @@ typedef struct NL
   GtkTreeModel *model;
   char *name;
   GNUNET_HashCode id;
-  struct ECRS_MetaData *meta;
+  struct GNUNET_ECRS_MetaData *meta;
 } NamespaceList;
 
 /**
@@ -116,9 +116,9 @@ makeNamespaceFrame (NamespaceList * entry)
 
   DEBUG_BEGIN ();
   namespaceXML
-    = glade_xml_new (getGladeFileName (),
-                     "namespaceContentFrame", PACKAGE_NAME);
-  connectGladeWithPlugins (namespaceXML);
+    = glade_xml_new (GNUNET_GTK_get_glade_filename (),
+                     "namespaceContentFrame", PACKAGNUNET_GENAME);
+  GNUNET_GTK_connect_glade_with_plugins (namespaceXML);
   child = extractMainWidgetFromWindow (namespaceXML, "namespaceContentFrame");
   resultList = glade_xml_get_widget (namespaceXML,
                                      "namespaceContentFrameTreeView");
@@ -299,7 +299,7 @@ makeNamespaceFrame (NamespaceList * entry)
  */
 static int
 addNamespaceContentToModel (void *cls,
-                            const ECRS_FileInfo * fi,
+                            const GNUNET_ECRS_FileInfo * fi,
                             const GNUNET_HashCode * lastId,
                             const GNUNET_HashCode * nextId,
                             GNUNET_Int32Time publicationFrequency,
@@ -319,7 +319,7 @@ addNamespaceContentToModel (void *cls,
   char *size_h;
 
   DEBUG_BEGIN ();
-  filename = ECRS_getFirstFromMetaData (fi->meta,
+  filename = GNUNET_ECRS_meta_data_get_first_by_types (fi->meta,
                                         EXTRACTOR_FILENAME,
                                         EXTRACTOR_TITLE,
                                         EXTRACTOR_ARTIST,
@@ -337,7 +337,7 @@ addNamespaceContentToModel (void *cls,
       while (NULL != (dotdot = strstr (filename, "..")))
         dotdot[0] = dotdot[1] = '_';
     }
-  desc = ECRS_getFirstFromMetaData (fi->meta,
+  desc = GNUNET_ECRS_meta_data_get_first_by_types (fi->meta,
                                     EXTRACTOR_DESCRIPTION,
                                     EXTRACTOR_GENRE,
                                     EXTRACTOR_ALBUM,
@@ -347,22 +347,22 @@ addNamespaceContentToModel (void *cls,
                                     EXTRACTOR_SIZE, EXTRACTOR_KEYWORDS, -1);
   if (desc == NULL)
     desc = GNUNET_strdup ("");
-  mime = ECRS_getFromMetaData (fi->meta, EXTRACTOR_MIMETYPE);
+  mime = GNUNET_ECRS_meta_data_get_by_type (fi->meta, EXTRACTOR_MIMETYPE);
   if (mime == NULL)
     mime = GNUNET_strdup (_("unknown"));
-  if (ECRS_isFileUri (fi->uri))
-    size = ECRS_fileSize (fi->uri);
+  if (GNUNET_ECRS_uri_test_chk (fi->uri))
+    size = GNUNET_ECRS_uri_get_file_siz (fi->uri);
   else
     size = 0;
-  uriString = ECRS_uriToString (fi->uri);
+  uriString = GNUNET_ECRS_uri_to_string (fi->uri);
   GNUNET_hash_to_enc (lastId, &last);
   if (nextId != NULL)
     GNUNET_hash_to_enc (nextId, &next);
   else
     memset (&next, 0, sizeof (GNUNET_EncName));
-  if (publicationFrequency == ECRS_SBLOCK_UPDATE_SPORADIC)
+  if (publicationFrequency == GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC)
     date = GNUNET_strdup (_("unspecified"));
-  else if (publicationFrequency == ECRS_SBLOCK_UPDATE_NONE)
+  else if (publicationFrequency == GNUNET_ECRS_SBLOCK_UPDATE_NONE)
     date = GNUNET_strdup (_("never"));
   else
     date = GNUNET_int32_time_to_string (&nextPublicationTime);
@@ -383,8 +383,8 @@ addNamespaceContentToModel (void *cls,
                       IN_NAMESPACE_NEXT_STRING, &next,
                       IN_NAMESPACE_PUB_FREQ_STRING, freq,
                       IN_NAMESPACE_PUB_DATE_STRING, date,
-                      IN_NAMESPACE_URI, ECRS_dupUri (fi->uri),
-                      IN_NAMESPACE_META, ECRS_dupMetaData (fi->meta), -1);
+                      IN_NAMESPACE_URI, GNUNET_ECRS_uri_duplicate (fi->uri),
+                      IN_NAMESPACE_META, GNUNET_ECRS_meta_data_duplicate (fi->meta), -1);
   GNUNET_free (size_h);
   GNUNET_free (filename);
   GNUNET_free (uriString);
@@ -402,36 +402,36 @@ int
 addTabForNamespace (void *unused,
                     const char *namespaceName,
                     const GNUNET_HashCode * namespaceId,
-                    const struct ECRS_MetaData *md, int rating)
+                    const struct GNUNET_ECRS_MetaData *md, int rating)
 {
   NamespaceList *list;
   GtkWidget *label;
   GtkWidget *notebook;
   GtkWidget *del_menu;
 
-  if (GNUNET_OK != ECRS_testNamespaceExists (NULL, cfg, namespaceName, namespaceId))
+  if (GNUNET_OK != GNUNET_ECRS_namespace_test_exists (NULL, cfg, namespaceName, namespaceId))
     return GNUNET_OK;
   DEBUG_BEGIN ();
   label = gtk_label_new (namespaceName);
   list = GNUNET_malloc (sizeof (NamespaceList));
   list->name = GNUNET_strdup (namespaceName);
   list->id = *namespaceId;
-  list->meta = ECRS_dupMetaData (md);
+  list->meta = GNUNET_ECRS_meta_data_duplicate (md);
   makeNamespaceFrame (list);
   list->next = head;
   head = list;
   /* update sensitivity of add button */
   on_namespaceContentSelectionChanged (NULL, NULL);
-  notebook = glade_xml_get_widget (getMainXML (), "localNamespacesNotebook");
+  notebook = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "localNamespacesNotebook");
   gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
                             list->namespacepage, label);
   gtk_widget_show (notebook);
-  NS_listNamespaceContent
+  GNUNET_NS_namespace_list_contents
     (ectx, cfg, namespaceName, &addNamespaceContentToModel, list->model);
   DEBUG_END ();
   /* enable "delete" menu entry */
 
-  del_menu = glade_xml_get_widget (getMainXML (), "namespaceDelete");
+  del_menu = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "namespaceDelete");
   gtk_widget_set_sensitive (del_menu, TRUE);
   return GNUNET_OK;
 }
@@ -441,8 +441,8 @@ static void
 frame_destroy (GtkWidget * tree)
 {
   GtkTreeIter iter;
-  struct ECRS_URI *u;
-  struct ECRS_MetaData *m;
+  struct GNUNET_ECRS_URI *u;
+  struct GNUNET_ECRS_MetaData *m;
   NamespaceList *prev;
   NamespaceList *pos;
   NamespaceList *next;
@@ -460,7 +460,7 @@ frame_destroy (GtkWidget * tree)
     }
   if (pos == NULL)
     {
-      GE_BREAK (NULL, 0);
+      GNUNET_GEBREAK (NULL, 0);
       return;
     }
   if (prev == NULL)
@@ -468,7 +468,7 @@ frame_destroy (GtkWidget * tree)
   else
     prev->next = pos->next;
   GNUNET_free (pos->name);
-  ECRS_freeMetaData (pos->meta);
+  GNUNET_ECRS_meta_data_destroy (pos->meta);
   if (gtk_tree_model_get_iter_first (pos->model, &iter))
     {
       do
@@ -482,14 +482,14 @@ frame_destroy (GtkWidget * tree)
                               IN_NAMESPACE_URI, NULL,
                               IN_NAMESPACE_META, NULL, -1);
           if (u != NULL)
-            ECRS_freeUri (u);
+            GNUNET_ECRS_uri_destroy (u);
           if (m != NULL)
-            ECRS_freeMetaData (m);
+            GNUNET_ECRS_meta_data_destroy (m);
         }
       while (gtk_tree_model_iter_next (pos->model, &iter));
     }
   GNUNET_free (pos);
-  del_menu = glade_xml_get_widget (getMainXML (), "namespaceDelete");
+  del_menu = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "namespaceDelete");
   gtk_widget_set_sensitive (del_menu, head != NULL);
 }
 
@@ -507,7 +507,7 @@ namespaceDelete_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   gint ret;
 
   DEBUG_BEGIN ();
-  notebook = glade_xml_get_widget (getMainXML (), "localNamespacesNotebook");
+  notebook = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "localNamespacesNotebook");
   num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
   if (num == -1)
     {
@@ -516,7 +516,7 @@ namespaceDelete_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
       dialog = gtk_message_dialog_new
         (NULL,
          GTK_DIALOG_MODAL,
-         GTK_MESSAGE_ERROR,
+         GTK_MESSAGNUNET_GEERROR,
          GTK_BUTTONS_CLOSE,
          _("No local namespaces available that could be deleted!"));
       gtk_dialog_run (GTK_DIALOG (dialog));
@@ -533,7 +533,7 @@ namespaceDelete_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
     }
   if (list == NULL)
     {
-      GE_BREAK (ectx, 0);
+      GNUNET_GEBREAK (ectx, 0);
       return;
     }
   /* open window to ask for confirmation,
@@ -542,7 +542,7 @@ namespaceDelete_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   dialog = gtk_message_dialog_new
     (NULL,
      GTK_DIALOG_MODAL,
-     GTK_MESSAGE_ERROR,
+     GTK_MESSAGNUNET_GEERROR,
      GTK_BUTTONS_YES_NO,
      _("Should the namespace `%s' really be deleted?"), list->name);
   ret = gtk_dialog_run (GTK_DIALOG (dialog));
@@ -550,7 +550,7 @@ namespaceDelete_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   if (GTK_RESPONSE_YES != ret)
     return;
   gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), num);
-  NS_deleteNamespace (ectx, cfg, list->name);
+  GNUNET_NS_namespace_delete (ectx, cfg, list->name);
   frame_destroy (list->treeview);
   DEBUG_END ();
 }
@@ -574,11 +574,11 @@ addToNamespaceCB (GtkTreeModel * model,
                   GtkTreePath * path, GtkTreeIter * iter, gpointer data)
 {
   IUC *cls = data;
-  struct ECRS_URI *resultURI;
-  struct ECRS_URI *dst;
-  struct ECRS_MetaData *meta;
+  struct GNUNET_ECRS_URI *resultURI;
+  struct GNUNET_ECRS_URI *dst;
+  struct GNUNET_ECRS_MetaData *meta;
   NamespaceList *list;
-  ECRS_FileInfo fi;
+  GNUNET_ECRS_FileInfo fi;
 
   DEBUG_BEGIN ();
   dst = NULL;
@@ -586,10 +586,10 @@ addToNamespaceCB (GtkTreeModel * model,
                       iter, NAMESPACE_URI, &dst, NAMESPACE_META, &meta, -1);
   if (dst == NULL)
     {
-      GE_BREAK (ectx, 0);
+      GNUNET_GEBREAK (ectx, 0);
       return;
     }
-  resultURI = NS_addToNamespace (ectx, cfg, cls->anonymityLevel, 1000,  /* FIXME: priority */
+  resultURI = GNUNET_NS_add_to_namespace (ectx, cfg, cls->anonymityLevel, 1000,  /* FIXME: priority */
                                  GNUNET_get_time () + 2 * GNUNET_CRON_YEARS,   /* FIXME: expiration */
                                  cls->namespaceName,
                                  cls->updateInterval,
@@ -602,7 +602,7 @@ addToNamespaceCB (GtkTreeModel * model,
         list = list->next;
       if (list == NULL)
         {
-          GE_BREAK (ectx, 0);
+          GNUNET_GEBREAK (ectx, 0);
         }
       else
         {
@@ -616,11 +616,11 @@ addToNamespaceCB (GtkTreeModel * model,
                                       cls->updateInterval,
                                       cls->updateInterval + GNUNET_get_time_int32 (NULL));
         }
-      ECRS_freeUri (resultURI);
+      GNUNET_ECRS_uri_destroy (resultURI);
     }
   else
     {
-      infoMessage (GNUNET_YES,
+      GNUNET_GTK_show_info_message (GNUNET_YES,
                    _("Failed to insert content into namespace "
                      "(consult logs).\n"));
     }
@@ -658,24 +658,24 @@ on_namespaceInsertButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   IUC cls;
   gint num;
 
-  notebook = glade_xml_get_widget (getMainXML (), "localNamespacesNotebook");
+  notebook = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "localNamespacesNotebook");
   num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
-  GE_ASSERT (ectx, num != -1);
+  GNUNET_GEASSERT (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)
     {
-      GE_BREAK (ectx, 0);
+      GNUNET_GEBREAK (ectx, 0);
       return;
     }
   cls.namespaceName = list->name;
 
   metaXML
-    = glade_xml_new (getGladeFileName (),
-                     "namespaceInsertDialog", PACKAGE_NAME);
-  connectGladeWithPlugins (metaXML);
+    = glade_xml_new (GNUNET_GTK_get_glade_filename (),
+                     "namespaceInsertDialog", PACKAGNUNET_GENAME);
+  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);
 
@@ -698,7 +698,7 @@ on_namespaceInsertButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
           dialog = gtk_message_dialog_new
             (NULL,
              GTK_DIALOG_MODAL,
-             GTK_MESSAGE_ERROR,
+             GTK_MESSAGNUNET_GEERROR,
              GTK_BUTTONS_CLOSE, _("Failed to parse given time interval!"));
           gtk_dialog_run (GTK_DIALOG (dialog));
           gtk_widget_destroy (dialog);
@@ -725,7 +725,7 @@ on_namespaceInsertButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
           GNUNET_hash (identifierName, strlen (identifierName), &nextId);
           cls.nextId = &nextId;
         }
-      ggc_tree_selection_selected_foreach
+      GNUNET_GTK_tree_selection_selected_foreach
         (content_selection, &addToNamespaceCB, &cls);
     }
   gtk_widget_destroy (dialog);
@@ -764,16 +764,16 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
 
   DEBUG_BEGIN ();
   /* find out which namespace this is about */
-  notebook = glade_xml_get_widget (getMainXML (), "localNamespacesNotebook");
+  notebook = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "localNamespacesNotebook");
   num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
-  GE_ASSERT (ectx, num != -1);
+  GNUNET_GEASSERT (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)
     {
-      GE_BREAK (ectx, 0);
+      GNUNET_GEBREAK (ectx, 0);
       return;
     }
   cls.namespaceName = list->name;
@@ -782,7 +782,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))
     {
-      GE_BREAK (ectx, 0);
+      GNUNET_GEBREAK (ectx, 0);
       return;
     }
   gtk_tree_model_get (list->model,
@@ -792,20 +792,20 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
                       IN_NAMESPACE_PUB_FREQ_STRING, &freq, -1);
   if ((last == NULL) || (next == NULL) || (freq == NULL))
     {
-      GE_BREAK (NULL, 0);
+      GNUNET_GEBREAK (NULL, 0);
       return;
     }
   if (GNUNET_OK != parseTimeInterval (freq, &cls.updateInterval))
     {
-      GE_BREAK (ectx, 0);
-      cls.updateInterval = ECRS_SBLOCK_UPDATE_SPORADIC;
+      GNUNET_GEBREAK (ectx, 0);
+      cls.updateInterval = GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC;
     }
 
   /* create update dialog */
   metaXML
-    = glade_xml_new (getGladeFileName (),
-                     "namespaceUpdateDialog", PACKAGE_NAME);
-  connectGladeWithPlugins (metaXML);
+    = glade_xml_new (GNUNET_GTK_get_glade_filename (),
+                     "namespaceUpdateDialog", PACKAGNUNET_GENAME);
+  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);
   identifierLabel = glade_xml_get_widget (metaXML, "identifierLabel");
@@ -815,8 +815,8 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   GNUNET_enc_to_hash (next, &cls.thisId);
 
   nextEntryLine = glade_xml_get_widget (metaXML, "nextIdentifierEntry");
-  if ((cls.updateInterval != ECRS_SBLOCK_UPDATE_SPORADIC) &&
-      (GNUNET_OK == NS_computeNextId (NULL,
+  if ((cls.updateInterval != GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC) &&
+      (GNUNET_OK == GNUNET_NS_compute_next_identifier (NULL,
                                cfg,
                                cls.namespaceName,
                                &lastId,
@@ -856,7 +856,7 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
       mdialog = gtk_message_dialog_new
         (NULL,
          GTK_DIALOG_MODAL,
-         GTK_MESSAGE_ERROR,
+         GTK_MESSAGNUNET_GEERROR,
          GTK_BUTTONS_CLOSE, _("Failed to parse given time interval!"));
       gtk_dialog_run (GTK_DIALOG (mdialog));
       gtk_widget_destroy (mdialog);
@@ -866,7 +866,7 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
     = getSpinButtonValue (metaXML, "namespaceUpdateAnonymitySpinButton");
 
   /* run actual update */
-  ggc_tree_selection_selected_foreach
+  GNUNET_GTK_tree_selection_selected_foreach
     (content_selection, &addToNamespaceCB, &cls);
 CLEANUP:
   gtk_widget_destroy (dialog);
@@ -892,13 +892,13 @@ fs_namespace_start ()
 
   DEBUG_BEGIN ();
   trackCheckButton
-    = glade_xml_get_widget (getMainXML (), "trackingCheckButton");
+    = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "trackingCheckButton");
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (trackCheckButton),
-                                URITRACK_trackStatus (ectx,
+                                GNUNET_URITRACK_get_tracking_status (ectx,
                                                       cfg) ==
                                 GNUNET_YES ? TRUE : FALSE);
 
-  contentList = glade_xml_get_widget (getMainXML (), "availableContentList");
+  contentList = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "availableContentList");
 
   model = gtk_list_store_new (NAMESPACE_NUM, G_TYPE_STRING,     /* name */
                               G_TYPE_UINT64,    /* size */
@@ -961,9 +961,9 @@ fs_namespace_start ()
   gtk_tree_view_column_set_resizable (gtk_tree_view_get_column
                                       (GTK_TREE_VIEW (contentList), col - 1),
                                       TRUE);
-  URITRACK_registerTrackCallback (ectx, cfg, &updateViewSave, NULL);
-  NS_listNamespaces (ectx, cfg, &addTabForNamespace, NULL);
-  NS_registerDiscoveryCallback (ectx, cfg, &namespace_discovered_cb, NULL);
+  GNUNET_URITRACK_register_track_callback (ectx, cfg, &updateViewSave, NULL);
+  GNUNET_NS_namespace_list_all (ectx, cfg, &addTabForNamespace, NULL);
+  GNUNET_NS_register_discovery_callback (ectx, cfg, &namespace_discovered_cb, NULL);
   DEBUG_END ();
 }
 
@@ -971,10 +971,10 @@ fs_namespace_start ()
 void
 fs_namespace_stop ()
 {
-  NS_unregisterDiscoveryCallback (&namespace_discovered_cb, NULL);
+  GNUNET_NS_unregister_discovery_callback (&namespace_discovered_cb, NULL);
   while (head != NULL)
     frame_destroy (head->treeview);
-  URITRACK_unregisterTrackCallback (&updateViewSave, NULL);
+  GNUNET_URITRACK_unregister_track_callback (&updateViewSave, NULL);
 }
 
 /* end of namespace.c */