3 files changed, 18 insertions, 8 deletions

diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index b9506106..93a173be 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -343,6 +343,7 @@ fs_summary_start ()
   GtkTreeViewColumn *column;
   int col;
   GladeXML *contextMenuXML;
+  GtkTreeIter iter;
 
   /* keyword list setup */
   searchCB
@@ -365,6 +366,13 @@ fs_summary_start ()
                               G_TYPE_STRING,    /* GNUNET_EncName of namespace */
                               G_TYPE_POINTER,   /* ECRS MetaData */
                               G_TYPE_INT);      /* Meta-data about namespace */
+  gtk_list_store_append (model, &iter);
+  gtk_list_store_set (model,
+                      &iter,
+                      NS_SEARCH_DESCRIPTION, _("globally"),
+                      NS_SEARCH_NAME, _("globally"),
+                      NS_SEARCH_METADATA, NULL,
+                      NS_SEARCH_RATING, 0, -1);
   gtk_combo_box_set_model (GTK_COMBO_BOX (searchCB), GTK_TREE_MODEL (model));
   gtk_combo_box_entry_set_text_column (searchCB, NS_SEARCH_DESCRIPTION);
 
diff --git a/src/plugins/fs/namespace_search.c b/src/plugins/fs/namespace_search.c
index 0385a68b..5ac91a80 100644
--- a/src/plugins/fs/namespace_search.c
+++ b/src/plugins/fs/namespace_search.c
@@ -71,9 +71,11 @@ on_namespaceRatingSpinButton_changed_fs (GtkWidget * dummy,
                           NS_SEARCH_DESCRIPTION, &description,
                           NS_SEARCH_NAME, &nsName,
                           NS_SEARCH_RATING, &rating, -1);
-      if ((description != NULL) && (0 == strcmp (description, "")))
+      if ((description != NULL) && 
+          ( (0 == strcmp (description, "")) ||
+            (0 == strcmp (description, _("globally")))))
         {
-          /* just to be sure */
+          gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 0);
           gtk_widget_set_sensitive (spin, FALSE);
         }
       else
@@ -100,8 +102,6 @@ on_namespaceRatingSpinButton_changed_fs (GtkWidget * dummy,
     }
   else
     {
-      /* FIXME: if GNUNET_enc_to_hash succeeds, we may want to keep this
-         active */
       gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 0);
       gtk_widget_set_sensitive (spin, FALSE);
     }
@@ -150,7 +150,9 @@ on_searchNamespaceComboBoxEntry_changed_fs (GtkWidget * dummy,
                           NS_SEARCH_DESCRIPTION, &descStr,
                           NS_SEARCH_NAME, &nsName,
                           NS_SEARCH_RATING, &rating, -1);
-      if ((descStr != NULL) && (0 == strcmp (descStr, "")))
+      if ((descStr != NULL) && 
+          ( (0 == strcmp (descStr, "")) ||
+            (0 == strcmp (descStr, _("globally"))) ) )
         {
           gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 0);
           gtk_widget_set_sensitive (spin, FALSE);
@@ -184,8 +186,6 @@ on_searchNamespaceComboBoxEntry_changed_fs (GtkWidget * dummy,
     }
   else
     {
-      /* FIXME: may still be namespace selected --
-         where user manually entered NS name! */
       gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 0);
       gtk_widget_set_sensitive (spin, FALSE);
     }
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index deff31da..f789e43f 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -1119,7 +1119,9 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
                           NS_SEARCH_DESCRIPTION, &descStr, NS_SEARCH_NAME,
                           &nsName, -1);
 
-      if ((descStr != NULL) && (0 == strcmp (descStr, "")))
+      if ((descStr != NULL) &&
+          ( (0 == strcmp (descStr, "")) ||
+            (0 == strcmp (descStr, _("globally")))))
         {
           nsName = NULL;
         }