1 files changed, 39 insertions, 15 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 b9b7daaa..b1f7ab59 100644
--- a/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
+++ b/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
@@ -150,12 +150,16 @@ commit_changes (struct GNUNET_GTK_MainWindowContext *main_ctx,
   main_ctx->selected_ns_row = get_selected_row_from_treeview (tv);
 
   treepath = gtk_tree_row_reference_get_path (main_ctx->selected_ns_row);
-  if (GNUNET_GTK_get_tree_string (tv, treepath, 0, &value))
+  if (GNUNET_GTK_get_tree_string (tv, treepath,
+                                  GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_NAME,
+                                  &value))
   {
     gtk_label_set_text (main_ctx->search_ns_label, (NULL != value) ? value : "");
     g_free (value);
   }
-  if (GNUNET_GTK_get_tree_string (tv, treepath, 2, &value))
+  if (GNUNET_GTK_get_tree_string (tv, treepath,
+                                  GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_ROOT,
+                                  &value))
   {
     gtk_entry_set_text (main_ctx->search_entry, (NULL != value) ? value : "");
     g_free (value);
@@ -326,11 +330,15 @@ add_namespace_to_ts (void *cls, const GNUNET_HashCode * pseudonym,
   }
   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, unique_ns_name,
-                                     1, nsid,
-                                     2, root,
-                                     3, description,
-                                     -1);
+                                     GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_NAME,
+                                     unique_ns_name,
+                                     GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_KEY,
+                                     nsid,
+                                     GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_ROOT,
+                                     root,
+                                     GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_TOOLTIP,
+                                     description,
+                                     -1);
   GNUNET_free (unique_ns_name);
   GNUNET_free_non_null (root);
   GNUNET_free (description);
@@ -356,7 +364,10 @@ GNUNET_GTK_main_window_refresh_ns_list (struct GNUNET_GTK_MainWindowContext *mai
     {
       if (gtk_tree_model_get_iter (model, &iter, treepath))
       {
-        gtk_tree_model_get (model, &iter, 1, &key, -1);
+        gtk_tree_model_get (model, &iter,
+                            GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_KEY,
+                            &key,
+                            -1);
       }
     }
     gtk_tree_path_free (treepath);
@@ -376,8 +387,9 @@ GNUNET_GTK_main_window_refresh_ns_list (struct GNUNET_GTK_MainWindowContext *mai
     while (TRUE)
     {
       gtk_tree_model_get (GTK_TREE_MODEL (main_ctx->search_ns_treestore), &iter,
-          1, &key,
-          -1);
+                          GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_KEY,
+                          &key,
+                          -1);
       GNUNET_free_non_null (key);
       if (TRUE != gtk_tree_model_iter_next (GTK_TREE_MODEL (
         main_ctx->search_ns_treestore), &iter))
@@ -387,7 +399,13 @@ GNUNET_GTK_main_window_refresh_ns_list (struct GNUNET_GTK_MainWindowContext *mai
   gtk_tree_store_clear (main_ctx->search_ns_treestore);
  
   gtk_tree_store_insert_with_values (main_ctx->search_ns_treestore, &iter, NULL, G_MAXINT,
-                                     0, "Any", 1, NULL, 2, "", 3,
+                                     GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_NAME,
+                                     "Any",
+                                     GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_KEY,
+                                     NULL,
+                                     GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_ROOT,
+                                     "",
+                                     GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_TOOLTIP,
                                      "Do not search in any particular namespace",
                                      -1);
 
@@ -404,9 +422,11 @@ GNUNET_GTK_main_window_refresh_ns_list (struct GNUNET_GTK_MainWindowContext *mai
     while (TRUE)
     {
       gtk_tree_model_get (GTK_TREE_MODEL (main_ctx->search_ns_treestore), &iter,
-          0, &value,
-          1, &key,
-          -1);
+                          GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_NAME,
+                          &value,
+                          GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_KEY,
+                          &key,
+                          -1);
       if (selected_ns_id == NULL)
         found = TRUE;
       else if (key != NULL && memcmp (key, selected_ns_id, sizeof (GNUNET_HashCode)) == 0)
@@ -423,7 +443,11 @@ GNUNET_GTK_main_window_refresh_ns_list (struct GNUNET_GTK_MainWindowContext *mai
                                                       main_ctx->search_ns_treestore), &iter))
   {
     gtk_tree_model_get (GTK_TREE_MODEL (main_ctx->search_ns_treestore), &iter,
-        0, &value, 1, &key, -1);
+                        GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_NAME,
+                        &value,
+                        GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_KEY,
+                        &key,
+                        -1);
     found = TRUE;
   }
   if (found)