1 files changed, 22 insertions, 9 deletions

diff --git a/src/fs/gnunet-fs-gtk_common.c b/src/fs/gnunet-fs-gtk_common.c
index d671a40d..1a8aa15c 100644
--- a/src/fs/gnunet-fs-gtk_common.c
+++ b/src/fs/gnunet-fs-gtk_common.c
@@ -106,9 +106,16 @@ GNUNET_FS_GTK_add_meta_data_to_list_store (void *cls, const char *plugin_name,
   data_to_insert = GNUNET_FS_GTK_dubious_meta_to_utf8 (format, data, data_len);
   if (NULL == data_to_insert)
     return 0;
-  gtk_list_store_insert_with_values (ls, NULL, G_MAXINT, 0, type, 1, format,
-                                     2, EXTRACTOR_metatype_to_string (type),
-                                     3, data_to_insert, -1);
+  gtk_list_store_insert_with_values (ls, NULL, G_MAXINT,
+                                     GNUNET_GTK_FS_MAIN_WINDOW_META_DATA_MC_META_TYPE,
+                                     type,
+                                     GNUNET_GTK_FS_MAIN_WINDOW_META_DATA_MC_META_FORMAT,
+                                     format,
+                                     GNUNET_GTK_FS_MAIN_WINDOW_META_DATA_MC_META_TYPE_STRING,
+                                     EXTRACTOR_metatype_to_string (type),
+                                     GNUNET_GTK_FS_MAIN_WINDOW_META_DATA_MC_META_VALUE,
+                                     data_to_insert,
+                                     -1);
   GNUNET_free (data_to_insert); 
   return 0;
 }
@@ -353,16 +360,18 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri,
       return;
     }
     gtk_tree_model_get (namespace_treestore, &iter,
-                        1, &nsid,
-                        -1);
+                        GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_KEY,
+                        &nsid,
+                        -1);
     while ( ( (NULL == nsid) ||
               (0 != memcmp (nsid,
                             &want,
                             sizeof (GNUNET_HashCode))) ) &&
             (gtk_tree_model_iter_next (namespace_treestore, &iter)) )
       gtk_tree_model_get (namespace_treestore, &iter,
-                          1, &nsid,
-                          -1);
+                          GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_KEY,
+                          &nsid,
+                          -1);
     if ( (NULL == nsid) ||
          (0 != memcmp (nsid,
                        &want,
@@ -376,7 +385,9 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri,
                                     (namespace_tree), &iter);
     treepath = gtk_tree_model_get_path (namespace_treestore, 
                                         &iter);
-    if (GNUNET_GTK_get_tree_string (namespace_tree, treepath, 0, &value))
+    if (GNUNET_GTK_get_tree_string (namespace_tree, treepath,
+                                    GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_NAME,
+                                    &value))
       gtk_label_set_text (sel_namespace_label, value);
     gtk_tree_path_free (treepath);          
 
@@ -401,7 +412,9 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri,
       gtk_tree_selection_select_iter (gtk_tree_view_get_selection
                                       (namespace_tree), &iter);
       treepath = gtk_tree_model_get_path (namespace_treestore, &iter);
-      if (GNUNET_GTK_get_tree_string (namespace_tree, treepath, 0, &value))
+      if (GNUNET_GTK_get_tree_string (namespace_tree, treepath,
+                                      GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_NAME,
+                                      &value))
         gtk_label_set_text (sel_namespace_label, value);
       gtk_tree_path_free (treepath);      
     }