1 files changed, 15 insertions, 15 deletions

diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index c0200c58..4f24bd5e 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -51,7 +51,7 @@ typedef struct NL
   GtkTreeModel *model;
   char *name;
   GNUNET_HashCode id;
-  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_MetaData *meta;
 } NamespaceList;
 
 /**
@@ -320,7 +320,7 @@ addNamespaceContentToModel (void *cls,
   char *size_h;
 
   GNUNET_GTK_DEBUG_BEGIN ();
-  filename = GNUNET_ECRS_meta_data_get_first_by_types (fi->meta,
+  filename = GNUNET_meta_data_get_first_by_types (fi->meta,
                                                        EXTRACTOR_FILENAME,
                                                        EXTRACTOR_TITLE,
                                                        EXTRACTOR_ARTIST,
@@ -338,7 +338,7 @@ addNamespaceContentToModel (void *cls,
       while (NULL != (dotdot = strstr (filename, "..")))
         dotdot[0] = dotdot[1] = '_';
     }
-  desc = GNUNET_ECRS_meta_data_get_first_by_types (fi->meta,
+  desc = GNUNET_meta_data_get_first_by_types (fi->meta,
                                                    EXTRACTOR_DESCRIPTION,
                                                    EXTRACTOR_GENRE,
                                                    EXTRACTOR_ALBUM,
@@ -349,7 +349,7 @@ addNamespaceContentToModel (void *cls,
                                                    EXTRACTOR_KEYWORDS, -1);
   if (desc == NULL)
     desc = GNUNET_strdup ("");
-  mime = GNUNET_ECRS_meta_data_get_by_type (fi->meta, EXTRACTOR_MIMETYPE);
+  mime = GNUNET_meta_data_get_by_type (fi->meta, EXTRACTOR_MIMETYPE);
   if (mime == NULL)
     mime = GNUNET_strdup (_("unknown"));
   if (GNUNET_ECRS_uri_test_chk (fi->uri))
@@ -387,7 +387,7 @@ addNamespaceContentToModel (void *cls,
                       IN_NAMESPACE_PUB_DATE_STRING, date,
                       IN_NAMESPACE_URI, GNUNET_ECRS_uri_duplicate (fi->uri),
                       IN_NAMESPACE_META,
-                      GNUNET_ECRS_meta_data_duplicate (fi->meta), -1);
+                      GNUNET_meta_data_duplicate (fi->meta), -1);
   GNUNET_free (size_h);
   GNUNET_free (filename);
   GNUNET_free (uriString);
@@ -405,7 +405,7 @@ addNamespaceContentToModel (void *cls,
 int
 addTabForNamespace (void *unused,
                     const GNUNET_HashCode * namespaceId,
-                    const struct GNUNET_ECRS_MetaData *md, int rating)
+                    const struct GNUNET_MetaData *md, int rating)
 {
   NamespaceList *list;
   GtkWidget *label;
@@ -416,12 +416,12 @@ addTabForNamespace (void *unused,
   if (GNUNET_OK != GNUNET_ECRS_namespace_test_exists (NULL, cfg, namespaceId))
     return GNUNET_OK;
   GNUNET_GTK_DEBUG_BEGIN ();
-  namespaceName = GNUNET_PSEUDO_id_to_name (ectx, cfg, namespaceId);
+  namespaceName = GNUNET_pseudonym_id_to_name (ectx, cfg, namespaceId);
   label = gtk_label_new (namespaceName);
   list = GNUNET_malloc (sizeof (NamespaceList));
   list->name = GNUNET_strdup (namespaceName);
   list->id = *namespaceId;
-  list->meta = GNUNET_ECRS_meta_data_duplicate (md);
+  list->meta = GNUNET_meta_data_duplicate (md);
   makeNamespaceFrame (list);
   list->next = head;
   head = list;
@@ -452,7 +452,7 @@ frame_destroy (GtkWidget * tree)
 {
   GtkTreeIter iter;
   struct GNUNET_ECRS_URI *u;
-  struct GNUNET_ECRS_MetaData *m;
+  struct GNUNET_MetaData *m;
   NamespaceList *prev;
   NamespaceList *pos;
   NamespaceList *next;
@@ -478,7 +478,7 @@ frame_destroy (GtkWidget * tree)
   else
     prev->next = pos->next;
   GNUNET_free (pos->name);
-  GNUNET_ECRS_meta_data_destroy (pos->meta);
+  GNUNET_meta_data_destroy (pos->meta);
   if (gtk_tree_model_get_iter_first (pos->model, &iter))
     {
       do
@@ -494,7 +494,7 @@ frame_destroy (GtkWidget * tree)
           if (u != NULL)
             GNUNET_ECRS_uri_destroy (u);
           if (m != NULL)
-            GNUNET_ECRS_meta_data_destroy (m);
+            GNUNET_meta_data_destroy (m);
         }
       while (gtk_tree_model_iter_next (pos->model, &iter));
     }
@@ -591,7 +591,7 @@ addToNamespaceCB (GtkTreeModel * model,
   IUC *cls = data;
   struct GNUNET_ECRS_URI *resultURI;
   struct GNUNET_ECRS_URI *dst;
-  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_MetaData *meta;
   NamespaceList *list;
   GNUNET_ECRS_FileInfo fi;
 
@@ -992,8 +992,8 @@ fs_namespace_start ()
                                       (GTK_TREE_VIEW (contentList), col - 1),
                                       TRUE);
   GNUNET_URITRACK_register_track_callback (ectx, cfg, &updateViewSave, NULL);
-  GNUNET_PSEUDO_list_all (ectx, cfg, &addTabForNamespace, NULL);
-  GNUNET_PSEUDO_register_discovery_callback (ectx, cfg,
+  GNUNET_pseudonym_list_all (ectx, cfg, &addTabForNamespace, NULL);
+  GNUNET_pseudonym_register_discovery_callback (ectx, cfg,
                                              &namespace_discovered_cb, NULL);
   GNUNET_GTK_DEBUG_END ();
 }
@@ -1002,7 +1002,7 @@ fs_namespace_start ()
 void
 fs_namespace_stop ()
 {
-  GNUNET_PSEUDO_unregister_discovery_callback (&namespace_discovered_cb,
+  GNUNET_pseudonym_unregister_discovery_callback (&namespace_discovered_cb,
                                                NULL);
   while (head != NULL)
     frame_destroy (head->treeview);