1 files changed, 12 insertions, 12 deletions

diff --git a/src/plugins/fs/namespace_create.c b/src/plugins/fs/namespace_create.c
index 4d92c8da..f4713694 100644
--- a/src/plugins/fs/namespace_create.c
+++ b/src/plugins/fs/namespace_create.c
@@ -167,17 +167,17 @@ create_namespace_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   GtkWidget *nameLine;
   GtkWidget *dialog;
   GtkWidget *spin;
-  struct ECRS_MetaData *meta;
-  struct ECRS_URI *keywordURI;
-  struct ECRS_URI *root;
+  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_ECRS_URI *keywordURI;
+  struct GNUNET_ECRS_URI *root;
   GNUNET_HashCode namespaceId;
   GNUNET_HashCode rootEntry;
 
   DEBUG_BEGIN ();
   metaXML
-    = glade_xml_new (getGladeFileName (),
-                     "namespaceMetaDataDialog", PACKAGE_NAME);
-  connectGladeWithPlugins (metaXML);
+    = glade_xml_new (GNUNET_GTK_get_glade_filename (),
+                     "namespaceMetaDataDialog", PACKAGNUNET_GENAME);
+  GNUNET_GTK_connect_glade_with_plugins (metaXML);
   dialog = glade_xml_get_widget (metaXML, "namespaceMetaDataDialog");
   createMetaDataListTreeView (metaXML,
                               "namespaceMetaDataDialogMetaDataList",
@@ -217,14 +217,14 @@ create_namespace_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
       GNUNET_hash (namespaceName, strlen (namespaceName), &rootEntry);
       nameLine = glade_xml_get_widget (metaXML, "namespaceNameEntry");
       namespaceName = gtk_entry_get_text (GTK_ENTRY (nameLine));
-      root = NS_createNamespace (ectx, cfg, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin)), 1000,    /* FIXME: priority */
+      root = GNUNET_NS_namespace_create (ectx, cfg, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin)), 1000,    /* FIXME: priority */
                                  GNUNET_get_time () + 2 * GNUNET_CRON_YEARS,   /* FIXME: expiration */
                                  namespaceName, meta, keywordURI, &rootEntry);
       if (root != NULL)
         {
-          ECRS_getNamespaceId (root, &namespaceId);
+          GNUNET_ECRS_uri_get_namespace_from_sks (root, &namespaceId);
           addTabForNamespace (NULL, namespaceName, &namespaceId, meta, 0);
-          ECRS_freeUri (root);
+          GNUNET_ECRS_uri_destroy (root);
         }
       else
         {
@@ -237,7 +237,7 @@ create_namespace_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 create namespace `%s'."
                "Consult logs, most likely error is"
@@ -246,8 +246,8 @@ create_namespace_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
           gtk_dialog_run (GTK_DIALOG (dialog));
           gtk_widget_destroy (dialog);
         }
-      ECRS_freeMetaData (meta);
-      ECRS_freeUri (keywordURI);
+      GNUNET_ECRS_meta_data_destroy (meta);
+      GNUNET_ECRS_uri_destroy (keywordURI);
     }
   gtk_widget_destroy (dialog);
   UNREF (metaXML);