1 files changed, 11 insertions, 11 deletions

diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index d924b26b..3f070ae2 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -223,7 +223,7 @@ addEntryToSearchTree (SearchList * searchContext,
                       mime, SEARCH_DESC, desc, SEARCH_PIXBUF, pixbuf,
                       SEARCH_URI, GNUNET_ECRS_uri_duplicate (info->uri),
                       SEARCH_META,
-                      GNUNET_ECRS_meta_data_duplicate (info->meta),
+                      GNUNET_meta_data_duplicate (info->meta),
                       SEARCH_CELL_BG_COLOR, getColorCode (state),
                       SEARCH_CELL_FG_COLOR, "black", SEARCH_INTERNAL,
                       searchContext, SEARCH_INTERNAL_PARENT, downloadParent,
@@ -356,7 +356,7 @@ on_search_display_metadata_activate (void *cls, GtkWidget * searchEntry)
   GtkTreePath *path;
   GtkTreeIter iter;
   struct GNUNET_ECRS_URI *uri;
-  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_MetaData *meta;
   char *str;
   GladeXML *xml;
   GtkWidget *dialog;
@@ -479,7 +479,7 @@ on_save_search_activate (void *cls, GtkWidget * searchEntry)
   unsigned long long dir_len;
   unsigned int fis_size;
   GNUNET_ECRS_FileInfo *fis;
-  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_MetaData *meta;
   GtkTreeModel *model;
   GtkTreeIter iter;
   unsigned int pos;
@@ -509,23 +509,23 @@ on_save_search_activate (void *cls, GtkWidget * searchEntry)
       pos++;
     }
   while (gtk_tree_model_iter_next (model, &iter));
-  meta = GNUNET_ECRS_meta_data_create ();
-  GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_KEYWORDS, list->searchString);
-  GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_DESCRIPTION,
+  meta = GNUNET_meta_data_create ();
+  GNUNET_meta_data_insert (meta, EXTRACTOR_KEYWORDS, list->searchString);
+  GNUNET_meta_data_insert (meta, EXTRACTOR_DESCRIPTION,
                                 _("Saved search results"));
-  GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_SOFTWARE, "gnunet-gtk");
+  GNUNET_meta_data_insert (meta, EXTRACTOR_SOFTWARE, "gnunet-gtk");
   if (GNUNET_OK != GNUNET_ECRS_directory_create (NULL,
                                                  &directory, &dir_len,
                                                  fis_size, fis, meta))
     {
       GNUNET_GTK_add_log_entry (_("Internal error."));
       GNUNET_GE_BREAK (NULL, 0);
-      GNUNET_ECRS_meta_data_destroy (meta);
+      GNUNET_meta_data_destroy (meta);
       GNUNET_array_grow (fis, fis_size, 0);
       GNUNET_free (name);
       return FALSE;
     }
-  GNUNET_ECRS_meta_data_destroy (meta);
+  GNUNET_meta_data_destroy (meta);
   GNUNET_array_grow (fis, fis_size, 0);
   if (GNUNET_OK !=
       GNUNET_disk_file_write (NULL, name, directory, dir_len, "644"))
@@ -892,7 +892,7 @@ freeIterSubtree (GtkTreeModel * tree, GtkTreeIter * iter)
 {
   GtkTreeIter child;
   struct GNUNET_ECRS_URI *uri;
-  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_MetaData *meta;
 
   do
     {
@@ -903,7 +903,7 @@ freeIterSubtree (GtkTreeModel * tree, GtkTreeIter * iter)
       if (uri != NULL)
         GNUNET_ECRS_uri_destroy (uri);
       if (meta != NULL)
-        GNUNET_ECRS_meta_data_destroy (meta);
+        GNUNET_meta_data_destroy (meta);
       gtk_tree_store_set (GTK_TREE_STORE (tree),
                           iter, SEARCH_URI, NULL, SEARCH_META, NULL, -1);
       if (gtk_tree_model_iter_children (tree, &child, iter))