1 files changed, 18 insertions, 18 deletions

diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index d066ea57..a2e77e46 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -594,7 +594,7 @@ get_suggested_filename_anonymity2 (GtkTreeModel *tm,
   char *filename;
   char *tmp;
   int downloaded_anonymity = -1;
-  struct GNUNET_CONTAINER_MetaData *meta;
+  struct GNUNET_FS_MetaData *meta;
   size_t tmplen;
   int finished_chain;
 
@@ -1212,7 +1212,7 @@ check_for_embedded_uri (void *cls,
  * @param cls closure for @a cb
  */
 static void
-find_embedded_uris (const struct GNUNET_CONTAINER_MetaData *meta,
+find_embedded_uris (const struct GNUNET_FS_MetaData *meta,
                     EmbeddedUriCallback cb,
                     void *cls)
 {
@@ -1220,7 +1220,7 @@ find_embedded_uris (const struct GNUNET_CONTAINER_MetaData *meta,
 
   ctx.cb = cb;
   ctx.cls = cls;
-  GNUNET_CONTAINER_meta_data_iterate (meta, &check_for_embedded_uri, &ctx);
+  GNUNET_FS_meta_data_iterate (meta, &check_for_embedded_uri, &ctx);
 }
 
 
@@ -1753,7 +1753,7 @@ remove_results_in_subtree (GtkTreeModel *tm, GtkTreeIter *iter)
       }
       if (NULL != sr->meta)
       {
-        GNUNET_CONTAINER_meta_data_destroy (sr->meta);
+        GNUNET_FS_meta_data_destroy (sr->meta);
         sr->meta = NULL;
       }
       GNUNET_free (sr);
@@ -1828,7 +1828,7 @@ free_search_result (struct SearchResult *sr)
   }
   if (NULL != sr->meta)
   {
-    GNUNET_CONTAINER_meta_data_destroy (sr->meta);
+    GNUNET_FS_meta_data_destroy (sr->meta);
     sr->meta = NULL;
   }
   GNUNET_free (sr);
@@ -1939,7 +1939,7 @@ GNUNET_FS_GTK_search_treeview_cursor_changed (GtkTreeView *tv,
     gtk_image_clear (mctx->preview_image);
 
   if (NULL != sr->meta)
-    GNUNET_CONTAINER_meta_data_iterate (sr->meta,
+    GNUNET_FS_meta_data_iterate (sr->meta,
                                         &GNUNET_FS_GTK_add_meta_data_to_list_store,
                                         mctx->md_liststore);
 }
@@ -2168,9 +2168,9 @@ handle_search_error (struct SearchTab *tab, const char *emsg)
  * @return mime type to use, possibly NULL
  */
 static char *
-get_mimetype_from_metadata (const struct GNUNET_CONTAINER_MetaData *meta)
+get_mimetype_from_metadata (const struct GNUNET_FS_MetaData *meta)
 {
-  return GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
+  return GNUNET_FS_meta_data_get_first_by_types (meta,
                                                         EXTRACTOR_METATYPE_MIMETYPE,
 #if HAVE_EXTRACTOR_H
                                                         EXTRACTOR_METATYPE_FORMAT,
@@ -2192,7 +2192,7 @@ get_mimetype_from_metadata (const struct GNUNET_CONTAINER_MetaData *meta)
  */
 static void
 update_search_result (struct SearchResult *sr,
-                      const struct GNUNET_CONTAINER_MetaData *meta,
+                      const struct GNUNET_FS_MetaData *meta,
                       uint32_t applicability_rank,
                       int32_t availability_rank,
                       uint32_t availability_certainty,
@@ -2229,10 +2229,10 @@ update_search_result (struct SearchResult *sr,
   pixbuf = GNUNET_FS_GTK_get_thumbnail_from_meta_data (meta);
   if (NULL != sr->meta)
   {
-    GNUNET_CONTAINER_meta_data_destroy (sr->meta);
+    GNUNET_FS_meta_data_destroy (sr->meta);
     sr->meta = NULL;
   }
-  sr->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
+  sr->meta = GNUNET_FS_meta_data_duplicate (meta);
   if (availability_certainty > 0)
     percent_avail =
       50 + (gint) (availability_rank * 50.0 / availability_certainty);
@@ -2359,7 +2359,7 @@ GNUNET_GTK_add_search_result (struct SearchTab *tab,
                               uint32_t anonymity,
                               GtkTreeRowReference *parent_rr,
                               const struct GNUNET_FS_Uri *uri,
-                              const struct GNUNET_CONTAINER_MetaData *meta,
+                              const struct GNUNET_FS_MetaData *meta,
                               struct GNUNET_FS_SearchResult *result,
                               uint32_t applicability_rank)
 {
@@ -2451,7 +2451,7 @@ GNUNET_GTK_add_search_result (struct SearchTab *tab,
       ts = downloads_treestore;
   }
   sr->uri = (uri == NULL) ? NULL : GNUNET_FS_uri_dup (uri);
-  sr->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
+  sr->meta = GNUNET_FS_meta_data_duplicate (meta);
   gtk_tree_store_insert_with_values (ts,
                                      &iter,
                                      pitr,
@@ -2626,7 +2626,7 @@ process_search_result (struct SearchTab *tab,
                        uint32_t anonymity,
                        struct SearchResult *parent,
                        const struct GNUNET_FS_Uri *uri,
-                       const struct GNUNET_CONTAINER_MetaData *meta,
+                       const struct GNUNET_FS_MetaData *meta,
                        struct GNUNET_FS_SearchResult *result,
                        uint32_t applicability_rank)
 {
@@ -2794,7 +2794,7 @@ setup_inner_search (struct GNUNET_FS_SearchContext *sc,
  */
 struct SearchResult *
 GNUNET_GTK_add_to_uri_tab (uint32_t anonymity,
-                           const struct GNUNET_CONTAINER_MetaData *meta,
+                           const struct GNUNET_FS_MetaData *meta,
                            const struct GNUNET_FS_Uri *uri)
 {
   struct GNUNET_GTK_MainWindowContext *mctx = GNUNET_FS_GTK_get_main_context ();
@@ -2977,7 +2977,7 @@ static void
 add_directory_entry (void *cls,
                      const char *filename,
                      const struct GNUNET_FS_Uri *uri,
-                     const struct GNUNET_CONTAINER_MetaData *meta,
+                     const struct GNUNET_FS_MetaData *meta,
                      size_t length,
                      const void *data)
 {
@@ -3285,7 +3285,7 @@ setup_download (struct DownloadEntry *de,
                 struct GNUNET_FS_DownloadContext *dc,
                 const struct GNUNET_FS_Uri *uri,
                 const char *filename,
-                const struct GNUNET_CONTAINER_MetaData *meta,
+                const struct GNUNET_FS_MetaData *meta,
                 uint64_t size,
                 uint64_t completed)
 {
@@ -3399,7 +3399,7 @@ setup_download (struct DownloadEntry *de,
   }
   else
   {
-    struct GNUNET_CONTAINER_MetaData *meta;
+    struct GNUNET_FS_MetaData *meta;
 
     /* get metadata from existing tab, might have a mime type */
     path = gtk_tree_row_reference_get_path (de->sr->rr);