1 files changed, 29 insertions, 7 deletions

diff --git a/src/fs/gnunet-fs-gtk_advertise-pseudonym.c b/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
index 942ae563..42ab0ca8 100644
--- a/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
+++ b/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
@@ -30,6 +30,23 @@
 #include "gnunet-fs-gtk_publish-edit-dialog.h"
 
 
+/**
+ * Columns in the select pseudonym model.
+ */
+enum FS_SelectPseudonymModelColumns
+  {
+    /**
+     * A gchararray
+     */
+    FS_SELECT_PSEUDONYM_NAMESPACE_NAME = 0,
+
+    /**
+     * A gpointer
+     */
+    FS_SELECT_PSEUDONYM_NAMESPACE_HANDLE = 1,
+  };
+
+
 /* *************************** handlers run on closing of the dialog ********************** */
 
 
@@ -156,13 +173,15 @@ GNUNET_GTK_select_pseudonym_dialog_response_cb (GtkDialog * dialog,
     g_object_unref (G_OBJECT (builder));
     return;
   }
-  gtk_tree_model_get (tm, &iter, 1, &ns, -1);
+  gtk_tree_model_get (tm, &iter,
+                      FS_SELECT_PSEUDONYM_NAMESPACE_MC_HANDLE, &ns, -1);
   /* free all namespaces from list store except "ns" */
   if (gtk_tree_model_get_iter_first (tm, &iter))
   {
     do
     {
-      gtk_tree_model_get (tm, &iter, 1, &nso, -1);
+      gtk_tree_model_get (tm, &iter,
+                          FS_SELECT_PSEUDONYM_NAMESPACE_MC_HANDLE, &nso, -1);
       if (ns != nso)
         GNUNET_FS_namespace_delete (nso, GNUNET_NO);
     }
@@ -218,7 +237,8 @@ GNUNET_GTK_select_pseudonym_dialog_delete_event_cb (GtkWidget *widget,
     {
       struct GNUNET_FS_Namespace *nso;
 
-      gtk_tree_model_get (tm, &iter, 1, &nso, -1);
+      gtk_tree_model_get (tm, &iter,
+                          FS_SELECT_PSEUDONYM_NAMESPACE_HANDLE, &nso, -1);
       GNUNET_FS_namespace_delete (nso, GNUNET_NO);
     }
     while (gtk_tree_model_iter_next (tm, &iter));
@@ -250,10 +270,12 @@ add_to_list (void *cls,
   GtkListStore *ls = cls;
   GtkTreeIter iter;
 
-  gtk_list_store_insert_with_values (ls, &iter, -1, 
-                                     0,  name, 
-                                     1, GNUNET_FS_namespace_create (GNUNET_FS_GTK_get_fs_handle (), 
-                                                                    name),
+  gtk_list_store_insert_with_values (ls, &iter, -1,
+                                     FS_SELECT_PSEUDONYM_NAMESPACE_MC_NAME,
+                                     name,
+                                     FS_SELECT_PSEUDONYM_NAMESPACE_MC_HANDLE,
+                                     GNUNET_FS_namespace_create (GNUNET_FS_GTK_get_fs_handle (),
+                                                                 name),
                                      -1);
 }