1 files changed, 21 insertions, 12 deletions

diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 26e3844a..92329cb9 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -27,6 +27,7 @@
 #include "platform.h"
 #include "gnunetgtk_common.h"
 #include "search.h"
+#include "status.h"
 #include "helper.h"
 #include "fs.h"
 #include "meta.h"
@@ -1164,27 +1165,35 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
                                      &iter))
     {
       char *descStr;
-      char *ns;
+      char *nsName;
 
-      ns = NULL;
+      nsName = NULL;
       descStr = NULL;
       gtk_tree_model_get (gtk_combo_box_get_model
                           (GTK_COMBO_BOX (searchNamespaceGtkCB)), &iter,
-                          NS_SEARCH_DESCRIPTION, &descStr, NS_SEARCH_ENCNAME,
-                          &ns, -1);
+                          NS_SEARCH_DESCRIPTION, &descStr, NS_SEARCH_NAME,
+                          &nsName, -1);
 
-      if ((descStr != NULL) && (0 == strcmp (descStr, _("globally"))))
+      if ((descStr != NULL) && (0 == strcmp (descStr, "")))
         {
-          ns = NULL;
+          nsName = NULL;
         }
       else
         {
-          if ((descStr == NULL) && (ns != NULL))
-            descStr = GNUNET_strdup (ns);
+          if ((descStr == NULL) && (nsName != NULL))
+            descStr = GNUNET_strdup (nsName);
         }
-      if (ns != NULL)
+      if (nsName != NULL)
         {
           char *ustring;
+          GNUNET_EncName enc;
+          GNUNET_HashCode nsid;
+
+          GNUNET_GE_ASSERT(NULL,
+                           GNUNET_OK ==
+                           GNUNET_pseudonym_name_to_id(ectx, cfg,
+                                                       nsName, &nsid));
+          GNUNET_hash_to_enc(&nsid, &enc);
 
           ustring =
             GNUNET_malloc (strlen (searchString) + sizeof (GNUNET_EncName) +
@@ -1192,7 +1201,7 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
                            strlen (GNUNET_ECRS_SUBSPACE_INFIX) + 10);
           strcpy (ustring, GNUNET_ECRS_URI_PREFIX);
           strcat (ustring, GNUNET_ECRS_SUBSPACE_INFIX);
-          strcat (ustring, ns);
+          strcat (ustring, (const char*)&enc);
           strcat (ustring, "/");
           strcat (ustring, searchString);
           fsss.uri = GNUNET_ECRS_string_to_uri (ectx, ustring);
@@ -1208,8 +1217,8 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
         }
       if (descStr != NULL)
         free (descStr);
-      if (ns != NULL)
-        free (ns);
+      if (nsName != NULL)
+        free (nsName);
     }
   if (fsss.uri == NULL)
     fsss.uri = GNUNET_ECRS_keyword_string_to_uri (ectx, searchString);