1 files changed, 2 insertions, 27 deletions

diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index 20a05400..757958be 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -389,7 +389,7 @@ create_dir_at_iter (struct MainPublishingDialogContext *ctx,
   meta = GNUNET_CONTAINER_meta_data_create ();
   GNUNET_FS_meta_data_make_directory (meta);
   GNUNET_CONTAINER_meta_data_insert (meta, "<gnunet-gtk>",
-                                     EXTRACTOR_METATYPE_FILENAME,
+                                     EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
                                      EXTRACTOR_METAFORMAT_UTF8, "text/plain",
                                      name, strlen (name) + 1);
   gtk_tree_store_insert_before (GTK_TREE_STORE (ctx->file_info_treemodel), pos, iter, NULL);
@@ -1839,32 +1839,7 @@ add_updateable_to_ts (void *cls, const char *last_id,
   GNUNET_CONTAINER_multihashmap_put (uc->seen, &hc, "dummy",
                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
   /* FIXME-BUG-MAYBE: what if this put fails?  Not convinced it cannot... */
-  desc =
-      GNUNET_CONTAINER_meta_data_get_first_by_types (last_meta,
-                                                     EXTRACTOR_METATYPE_DESCRIPTION,
-                                                     EXTRACTOR_METATYPE_TITLE,
-                                                     EXTRACTOR_METATYPE_BOOK_TITLE,
-                                                     EXTRACTOR_METATYPE_FILENAME,
-                                                     EXTRACTOR_METATYPE_SUMMARY,
-                                                     EXTRACTOR_METATYPE_ALBUM,
-                                                     EXTRACTOR_METATYPE_COMMENT,
-                                                     EXTRACTOR_METATYPE_SUBJECT,
-                                                     -1);
-  if (desc == NULL)
-    desc = GNUNET_strdup (_("no description supplied"));
-  else
-  {
-    char *utf8_desc = NULL;
-
-    utf8_desc =
-        GNUNET_FS_GTK_dubious_meta_to_utf8 (EXTRACTOR_METAFORMAT_UTF8, desc,
-                                            strlen (desc) + 1);
-    GNUNET_free (desc);
-    if (utf8_desc != NULL)
-      desc = utf8_desc;
-    else
-      desc = NULL;
-  }
+  desc = GNUNET_FS_GTK_get_description_from_metadata (last_meta);
   gtk_tree_store_insert_with_values (uc->ts, &iter, uc->parent, G_MAXINT, 0,
                                      uc->namespace_name, 1, uc->ns, 2, last_id,
                                      3, GNUNET_FS_uri_dup (last_uri), 4,