1 files changed, 3 insertions, 27 deletions

diff --git a/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c b/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
index 6c5e0f92..cb5dc461 100644
--- a/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
+++ b/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
@@ -329,6 +329,7 @@ add_namespace_to_ts (void *cls, const GNUNET_HashCode * pseudonym,
   char *ns_name;
   GNUNET_HashCode *nsid;
   char *description;
+  int desc_is_a_dup;
   char *uris;
   char *emsg;
   struct GNUNET_FS_Uri *uri;
@@ -350,32 +351,7 @@ add_namespace_to_ts (void *cls, const GNUNET_HashCode * pseudonym,
     root = GNUNET_FS_uri_sks_get_content_id (uri);
     GNUNET_FS_uri_destroy (uri);
   }
-  description =
-      GNUNET_CONTAINER_meta_data_get_first_by_types (md,
-                                                     EXTRACTOR_METATYPE_TITLE,
-                                                     EXTRACTOR_METATYPE_BOOK_TITLE,
-                                                     EXTRACTOR_METATYPE_DESCRIPTION,
-                                                     EXTRACTOR_METATYPE_SUMMARY,
-                                                     EXTRACTOR_METATYPE_ALBUM,
-                                                     EXTRACTOR_METATYPE_COMMENT,
-                                                     EXTRACTOR_METATYPE_SUBJECT,
-                                                     EXTRACTOR_METATYPE_KEYWORDS,
-                                                     -1);
-  if (description == NULL)
-    description = GNUNET_strdup (_("no description supplied"));
-  else
-  {
-    char *utf8_desc = NULL;
-
-    utf8_desc =
-        GNUNET_FS_GTK_dubious_meta_to_utf8 (EXTRACTOR_METAFORMAT_UTF8,
-                                            description, strlen (description));
-    GNUNET_free (description);
-    if (utf8_desc != NULL)
-      description = utf8_desc;
-    else
-      description = NULL;
-  }
+  description = GNUNET_FS_GTK_get_description_from_metadata (md, &desc_is_a_dup);
   gtk_tree_store_insert_with_values (ts, &iter, NULL, G_MAXINT, 
                                      0, ns_name, 
                                      1, nsid, 
@@ -384,7 +360,7 @@ add_namespace_to_ts (void *cls, const GNUNET_HashCode * pseudonym,
                                      -1);
   GNUNET_free (ns_name);
   GNUNET_free_non_null (root);
-  GNUNET_free_non_null (description);
+  GNUNET_free (description);
   return GNUNET_OK;
 }