1 files changed, 15 insertions, 9 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 cb5dc461..818caa6c 100644
--- a/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
+++ b/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
@@ -322,11 +322,12 @@ GNUNET_FS_GTK_search_namespace_dropdown_button_toggled_cb (GtkToggleButton *
  */
 static int
 add_namespace_to_ts (void *cls, const GNUNET_HashCode * pseudonym,
+                     const char *name, const char *unique_name,
                      const struct GNUNET_CONTAINER_MetaData *md, int rating)
 {
   GtkTreeStore *ts = cls;
   char *root;
-  char *ns_name;
+  char *ns_name, *unique_ns_name;
   GNUNET_HashCode *nsid;
   char *description;
   int desc_is_a_dup;
@@ -335,9 +336,14 @@ add_namespace_to_ts (void *cls, const GNUNET_HashCode * pseudonym,
   struct GNUNET_FS_Uri *uri;
   GtkTreeIter iter;
 
-  ns_name =
-      GNUNET_PSEUDONYM_id_to_name (GNUNET_FS_GTK_get_configuration (),
-                                   pseudonym);
+  if (rating < 0)
+    return GNUNET_OK;
+
+  GNUNET_PSEUDONYM_get_info (GNUNET_FS_GTK_get_configuration (),
+                             pseudonym, NULL, NULL, &ns_name, NULL);
+  unique_ns_name = GNUNET_PSEUDONYM_name_uniquify (
+      GNUNET_FS_GTK_get_configuration (), pseudonym, ns_name, NULL);
+  GNUNET_free (ns_name);
   nsid = GNUNET_malloc (sizeof (GNUNET_HashCode));
   *nsid = *pseudonym;
   root = NULL;
@@ -352,13 +358,13 @@ add_namespace_to_ts (void *cls, const GNUNET_HashCode * pseudonym,
     GNUNET_FS_uri_destroy (uri);
   }
   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, 
+  gtk_tree_store_insert_with_values (ts, &iter, NULL, G_MAXINT,
+                                     0, unique_ns_name,
+                                     1, nsid,
                                      2, root,
-                                     3, description, 
+                                     3, description,
                                      -1);
-  GNUNET_free (ns_name);
+  GNUNET_free (unique_ns_name);
   GNUNET_free_non_null (root);
   GNUNET_free (description);
   return GNUNET_OK;