1 files changed, 244 insertions, 125 deletions

diff --git a/src/gns/gnunet-gns-gtk_zone.c b/src/gns/gnunet-gns-gtk_zone.c
index c3b6a095..4015248d 100644
--- a/src/gns/gnunet-gns-gtk_zone.c
+++ b/src/gns/gnunet-gns-gtk_zone.c
@@ -26,38 +26,130 @@
 #include "gnunet_gtk.h"
 #include "gnunet-gns-gtk.h"
 
-enum TREESTORE_COLUMNS
+
+/**
+ * FIXME: duplicated with "enum GNS_ModelColumns"!
+ */
+enum GNSTreestoreColumn
 {
-  TREE_COL_NAME = 0,
-  TREE_COL_IS_PUBLIC,
-  TREE_COL_RECORD_TYPE,
-  TREE_COL_RECORD_TYPE_AS_STR,
-  TREE_COL_EXP_TIME,
-  TREE_COL_EXP_TIME_IS_REL,
-  TREE_COL_EXP_TIME_AS_STR,
-  TREE_COL_VAL_AS_STR,
-  TREE_COL_VAL_COLOR,
-  TREE_COL_NAME_IS_VISIBLE,
-  TREE_COL_IS_RECORD_ROW,
-  TREE_COL_NOT_DUMMY_ROW,
-  TREE_COL_EXP_TIME_COLOR,
-  TREE_COL_NAME_COLOR
+  /**
+   *
+   */
+  GNS_TREESTORE_COL_NAME = 0,
+
+  /**
+   *
+   */
+  GNS_TREESTORE_COL_IS_PUBLIC,
+
+  /**
+   *
+   */
+  GNS_TREESTORE_COL_RECORD_TYPE,
+
+  /**
+   *
+   */
+  GNS_TREESTORE_COL_RECORD_TYPE_AS_STR,
+
+  /**
+   *
+   */
+  GNS_TREESTORE_COL_EXP_TIME,
+
+  /**
+   *
+   */
+  GNS_TREESTORE_COL_EXP_TIME_IS_REL,
+
+  /**
+   *
+   */
+  GNS_TREESTORE_COL_EXP_TIME_AS_STR,
+
+  /**
+   *
+   */
+  GNS_TREESTORE_COL_VAL_AS_STR,
+
+  /**
+   *
+   */
+  GNS_TREESTORE_COL_VAL_COLOR,
+
+  /**
+   *
+   */
+  GNS_TREESTORE_COL_NAME_IS_VISIBLE,
+
+  /**
+   *
+   */
+  GNS_TREESTORE_COL_IS_RECORD_ROW,
+
+  /**
+   *
+   */
+  GNS_TREESTORE_COL_NOT_DUMMY_ROW,
+
+  /**
+   *
+   */
+  GNS_TREESTORE_COL_EXP_TIME_COLOR,
+
+  /**
+   *
+   */
+  GNS_TREESTORE_COL_NAME_COLOR
 };
 
+
+/**
+ *
+ */
 enum LIST_COLUMNS
 {
-  TYPE_LIST_TYPE = 0,
-  TYPE_LIST_TYPENAME
+
+  /**
+   *
+   */
+  GNS_TYPE_TO_NAME_LISTSTORE_COLUMN_TYPE = 0,
+
+
+  /**
+   *
+   */
+  GNS_TYPE_TO_NAME_LISTSTORE_COLUMN_TYPENAME
 };
 
+
+/**
+ *
+ */
 struct UpdateContext
 {
+  /**
+   *
+   */
   struct GNUNET_GNS_Context *gns;
+
+  /**
+   *
+   */
   struct GNUNET_NAMESTORE_RecordData *rd;
-  unsigned int rd_count;
+
+  /**
+   *
+   */
   char * name;
+
+  /**
+   *
+   */
+  unsigned int rd_count;
 };
 
+
 static void
 check_name_validity_and_commit_remove_proc (void *cls,
                                             int32_t success,
@@ -92,6 +184,7 @@ check_name_validity_and_commit_remove_proc (void *cls,
   }
 }
 
+
 static void
 check_name_validity_and_commit (struct GNUNET_GNS_Context *gns, gchar *path, char * oldname)
 {
@@ -130,7 +223,7 @@ check_name_validity_and_commit (struct GNUNET_GNS_Context *gns, gchar *path, cha
   }
 
   gtk_tree_model_get(gns->tm, &parent,
-                     TREE_COL_NAME, &name,
+                     GNS_TREESTORE_COL_NAME, &name,
                      -1);
 
   if (0 == strcmp (name, ROOT_STR))
@@ -153,15 +246,15 @@ check_name_validity_and_commit (struct GNUNET_GNS_Context *gns, gchar *path, cha
   for (c = 0; c < children; c++)
   {
     gtk_tree_model_get(gns->tm, &it,
-                       TREE_COL_NAME, &n_name,
-                       TREE_COL_RECORD_TYPE, &n_type,
-                       TREE_COL_IS_PUBLIC, &n_public,
-                       TREE_COL_EXP_TIME_COLOR, &n_exp_color,
-                       TREE_COL_EXP_TIME, &n_exp_time,
-                       TREE_COL_EXP_TIME_IS_REL, &n_is_relative,
-                       TREE_COL_EXP_TIME_AS_STR, &n_exp_str,
-                       TREE_COL_VAL_AS_STR, &n_value,
-                       TREE_COL_VAL_COLOR, &n_value_color,
+                       GNS_TREESTORE_COL_NAME, &n_name,
+                       GNS_TREESTORE_COL_RECORD_TYPE, &n_type,
+                       GNS_TREESTORE_COL_IS_PUBLIC, &n_public,
+                       GNS_TREESTORE_COL_EXP_TIME_COLOR, &n_exp_color,
+                       GNS_TREESTORE_COL_EXP_TIME, &n_exp_time,
+                       GNS_TREESTORE_COL_EXP_TIME_IS_REL, &n_is_relative,
+                       GNS_TREESTORE_COL_EXP_TIME_AS_STR, &n_exp_str,
+                       GNS_TREESTORE_COL_VAL_AS_STR, &n_value,
+                       GNS_TREESTORE_COL_VAL_COLOR, &n_value_color,
                        -1);
     /* valid name */
     if (NULL == n_name)
@@ -263,16 +356,29 @@ check_name_validity_and_commit (struct GNUNET_GNS_Context *gns, gchar *path, cha
   }
 }
 
+
+/**
+ *
+ */
 struct Remove_Context
 {
+
+  /**
+   *
+   */
   struct GNUNET_GNS_Context *gns;
+
+  /**
+   *
+   */
   char *path;
 };
 
-void
+
+static void
 check_name_validity_and_remove_proc (void *cls,
-                                            int32_t success,
-                                            const char *emsg)
+                                     int32_t success,
+                                     const char *emsg)
 {
   struct Remove_Context *rcc = cls;
   GtkDialog *dialog;
@@ -300,7 +406,8 @@ check_name_validity_and_remove_proc (void *cls,
   GNUNET_free (rcc);
 }
 
-void
+
+static void
 check_name_validity_and_remove (struct GNUNET_GNS_Context *gns, gchar *path)
 {
   GtkTreeIter it;
@@ -322,7 +429,7 @@ check_name_validity_and_remove (struct GNUNET_GNS_Context *gns, gchar *path)
 
   gtk_tree_model_get_iter_from_string(gns->tm, &it, path);
   gtk_tree_model_get(gns->tm, &it,
-                     TREE_COL_NAME, &name,
+                     GNS_TREESTORE_COL_NAME, &name,
                      -1);
 
   if (TRUE == gtk_tree_model_iter_parent (gns->tm, &parent, &it))
@@ -332,15 +439,15 @@ check_name_validity_and_remove (struct GNUNET_GNS_Context *gns, gchar *path)
         "Removing single record for name `%s'\n", name);
 
     gtk_tree_model_get(gns->tm, &it,
-                       TREE_COL_NAME, &n_name,
-                       TREE_COL_RECORD_TYPE, &n_type,
-                       TREE_COL_IS_PUBLIC, &n_public,
-                       TREE_COL_EXP_TIME_COLOR, &n_exp_color,
-                       TREE_COL_EXP_TIME, &n_exp_time,
-                       TREE_COL_EXP_TIME_IS_REL, &n_is_relative,
-                       TREE_COL_EXP_TIME_AS_STR, &n_exp_str,
-                       TREE_COL_VAL_AS_STR, &n_value,
-                       TREE_COL_VAL_COLOR, &n_value_color,
+                       GNS_TREESTORE_COL_NAME, &n_name,
+                       GNS_TREESTORE_COL_RECORD_TYPE, &n_type,
+                       GNS_TREESTORE_COL_IS_PUBLIC, &n_public,
+                       GNS_TREESTORE_COL_EXP_TIME_COLOR, &n_exp_color,
+                       GNS_TREESTORE_COL_EXP_TIME, &n_exp_time,
+                       GNS_TREESTORE_COL_EXP_TIME_IS_REL, &n_is_relative,
+                       GNS_TREESTORE_COL_EXP_TIME_AS_STR, &n_exp_str,
+                       GNS_TREESTORE_COL_VAL_AS_STR, &n_value,
+                       GNS_TREESTORE_COL_VAL_COLOR, &n_value_color,
                        -1);
 
     /* valid name */
@@ -399,6 +506,7 @@ check_name_validity_and_remove (struct GNUNET_GNS_Context *gns, gchar *path)
   g_free (name);
 }
 
+
 /**
  * The user has selected a new record type.  Update the
  * model, possibly invalidating (marking 'red') the existing
@@ -427,20 +535,20 @@ GNUNET_GNS_GTK_type_cellrenderercombo_changed_cb (GtkCellRendererCombo *combo,
   size_t data_size;
 
   gtk_tree_model_get(GTK_TREE_MODEL(gns->ls), new_iter, 0, &type, -1);
-  gtk_tree_model_get(GTK_TREE_MODEL(gns->ls), new_iter, TYPE_LIST_TYPENAME, &type_str, -1);
+  gtk_tree_model_get(GTK_TREE_MODEL(gns->ls), new_iter, GNS_TYPE_TO_NAME_LISTSTORE_COLUMN_TYPENAME, &type_str, -1);
 
 
   /* check if this is a new record */
   gtk_tree_model_get_iter_from_string(gns->tm, &it, path);
-  gtk_tree_model_get(gns->tm, &it, TREE_COL_IS_RECORD_ROW, &record_row, -1);
-  gtk_tree_model_get(gns->tm, &it, TREE_COL_NAME, &name_str, -1);
+  gtk_tree_model_get(gns->tm, &it, GNS_TREESTORE_COL_IS_RECORD_ROW, &record_row, -1);
+  gtk_tree_model_get(gns->tm, &it, GNS_TREESTORE_COL_NAME, &name_str, -1);
 
   if (GNUNET_YES == record_row)
   {
     /* Updating an existing record */
     gtk_tree_store_set(gns->ts, &it,
-                       TREE_COL_RECORD_TYPE, type,
-                       TREE_COL_RECORD_TYPE_AS_STR, type_str,
+                       GNS_TREESTORE_COL_RECORD_TYPE, type,
+                       GNS_TREESTORE_COL_RECORD_TYPE_AS_STR, type_str,
                        -1);
   }
   else if ((NULL != name_str) && (0 != strcmp (NEW_NAME_STR, name_str)))
@@ -448,15 +556,15 @@ GNUNET_GNS_GTK_type_cellrenderercombo_changed_cb (GtkCellRendererCombo *combo,
     /* Adding a new record */
 
     gtk_tree_store_insert_with_values(gns->ts, &child , &it, 0,
-        TREE_COL_NAME, name_str,
-        TREE_COL_NAME_IS_VISIBLE, FALSE,
-        TREE_COL_RECORD_TYPE, type,
-        TREE_COL_RECORD_TYPE_AS_STR, type_str,
-        TREE_COL_EXP_TIME_AS_STR, EXPIRE_NEVER_STRING,
-        TREE_COL_EXP_TIME, GNUNET_TIME_UNIT_FOREVER_ABS,
-        TREE_COL_EXP_TIME_IS_REL, FALSE,
-        TREE_COL_IS_RECORD_ROW, GNUNET_YES,
-        TREE_COL_NOT_DUMMY_ROW, GNUNET_YES,
+        GNS_TREESTORE_COL_NAME, name_str,
+        GNS_TREESTORE_COL_NAME_IS_VISIBLE, FALSE,
+        GNS_TREESTORE_COL_RECORD_TYPE, type,
+        GNS_TREESTORE_COL_RECORD_TYPE_AS_STR, type_str,
+        GNS_TREESTORE_COL_EXP_TIME_AS_STR, EXPIRE_NEVER_STRING,
+        GNS_TREESTORE_COL_EXP_TIME, GNUNET_TIME_UNIT_FOREVER_ABS,
+        GNS_TREESTORE_COL_EXP_TIME_IS_REL, FALSE,
+        GNS_TREESTORE_COL_IS_RECORD_ROW, GNUNET_YES,
+        GNS_TREESTORE_COL_NOT_DUMMY_ROW, GNUNET_YES,
         -1);
     gtk_tree_view_expand_row (gns->tv, gtk_tree_model_get_path(gns->tm, &it), 0);
 
@@ -464,25 +572,25 @@ GNUNET_GNS_GTK_type_cellrenderercombo_changed_cb (GtkCellRendererCombo *combo,
   GNUNET_free (type_str);
 
   /* check if value is still valid */
-  gtk_tree_model_get(gns->tm, &it, TREE_COL_VAL_AS_STR, &value_str, -1);
+  gtk_tree_model_get(gns->tm, &it, GNS_TREESTORE_COL_VAL_AS_STR, &value_str, -1);
   if (NULL != value_str)
   {
     if (GNUNET_OK != GNUNET_NAMESTORE_string_to_value (type,
                                       value_str,
                                       &data,
                                       &data_size))
-      gtk_tree_store_set (gns->ts, &it, TREE_COL_VAL_COLOR, "red", -1);
+      gtk_tree_store_set (gns->ts, &it, GNS_TREESTORE_COL_VAL_COLOR, "red", -1);
     else
-      gtk_tree_store_set (gns->ts, &it, TREE_COL_VAL_COLOR, NULL, -1);
+      gtk_tree_store_set (gns->ts, &it, GNS_TREESTORE_COL_VAL_COLOR, NULL, -1);
     GNUNET_free (value_str);
   }
   else if (NULL == value_str)
   {
     /* Empty value field */
     if (GNUNET_YES == record_row)
-      gtk_tree_store_set (gns->ts, &it, TREE_COL_VAL_COLOR, "red", -1);
+      gtk_tree_store_set (gns->ts, &it, GNS_TREESTORE_COL_VAL_COLOR, "red", -1);
     else
-      gtk_tree_store_set (gns->ts, &child, TREE_COL_VAL_COLOR, "red", -1);
+      gtk_tree_store_set (gns->ts, &child, GNS_TREESTORE_COL_VAL_COLOR, "red", -1);
   }
 
   check_name_validity_and_commit (gns, path, NULL);
@@ -508,14 +616,15 @@ GNUNET_GNS_GTK_ispublic_cellrenderertoggle_toggled_cb (GtkCellRendererToggle *ce
   gboolean value;
 
   gtk_tree_model_get_iter_from_string(gns->tm, &it, path);
-  gtk_tree_model_get(gns->tm, &it, TREE_COL_IS_PUBLIC, &value, -1);
-  gtk_tree_store_set(gns->ts, &it, TREE_COL_IS_PUBLIC, !value, -1);
+  gtk_tree_model_get(gns->tm, &it, GNS_TREESTORE_COL_IS_PUBLIC, &value, -1);
+  gtk_tree_store_set(gns->ts, &it, GNS_TREESTORE_COL_IS_PUBLIC, !value, -1);
 
   check_name_validity_and_commit (gns, path, NULL);
 }
 
-static
-char * convert_time_to_string (struct GNUNET_TIME_Absolute t)
+
+static char * 
+convert_time_to_string (struct GNUNET_TIME_Absolute t)
 {
   time_t tt;
   struct tm *time;
@@ -533,8 +642,9 @@ char * convert_time_to_string (struct GNUNET_TIME_Absolute t)
   return ret;
 }
 
-static
-int check_time (const char * text)
+
+static int 
+check_time (const char * text)
 {
   unsigned int t_mon;
   unsigned int t_day;
@@ -558,8 +668,9 @@ int check_time (const char * text)
   return GNUNET_OK;
 }
 
-static
-const struct GNUNET_TIME_Absolute convert_string_to_abs_time (const char * text)
+
+static const struct GNUNET_TIME_Absolute
+convert_string_to_abs_time (const char * text)
 {
   static struct GNUNET_TIME_Absolute abs_t;
   struct tm time;
@@ -628,8 +739,8 @@ GNUNET_GNS_GTK_expiration_cellrenderertext_edited_cb (GtkCellRendererText *rende
   {
     gtk_tree_model_get_iter_from_string(gns->tm, &it, path);
     gtk_tree_model_get(gns->tm, &it,
-                       TREE_COL_EXP_TIME_AS_STR, &old_text,
-                       TREE_COL_EXP_TIME_IS_REL, &is_rel,
+                       GNS_TREESTORE_COL_EXP_TIME_AS_STR, &old_text,
+                       GNS_TREESTORE_COL_EXP_TIME_IS_REL, &is_rel,
                        -1);
     if (0 == strcmp(new_text, old_text))
       return;
@@ -644,9 +755,9 @@ GNUNET_GNS_GTK_expiration_cellrenderertext_edited_cb (GtkCellRendererText *rende
       if (GNUNET_SYSERR == check_time(new_text))
       {
         gtk_tree_store_set (gns->ts, &it,
-                            TREE_COL_EXP_TIME_AS_STR, new_text,
-                            TREE_COL_EXP_TIME_COLOR, "red",
-                            TREE_COL_EXP_TIME, 0,
+                            GNS_TREESTORE_COL_EXP_TIME_AS_STR, new_text,
+                            GNS_TREESTORE_COL_EXP_TIME_COLOR, "red",
+                            GNS_TREESTORE_COL_EXP_TIME, 0,
                             -1);
         abstime = GNUNET_TIME_UNIT_ZERO_ABS;
         return;
@@ -662,9 +773,9 @@ GNUNET_GNS_GTK_expiration_cellrenderertext_edited_cb (GtkCellRendererText *rende
       }
     }
     gtk_tree_store_set (gns->ts, &it,
-                        TREE_COL_EXP_TIME_AS_STR, new_text,
-                        TREE_COL_EXP_TIME, abstime.abs_value,
-                        TREE_COL_EXP_TIME_COLOR, NULL,
+                        GNS_TREESTORE_COL_EXP_TIME_AS_STR, new_text,
+                        GNS_TREESTORE_COL_EXP_TIME, abstime.abs_value,
+                        GNS_TREESTORE_COL_EXP_TIME_COLOR, NULL,
                         -1);
     check_name_validity_and_commit (gns, path, NULL);
   }
@@ -699,8 +810,8 @@ GNUNET_GNS_GTK_value_cellrenderertext_edited_cb (GtkCellRendererText *renderer,
   {
     gtk_tree_model_get_iter_from_string(tm, &it, path);
     gtk_tree_model_get(tm, &it,
-        TREE_COL_RECORD_TYPE, &type,
-        TREE_COL_VAL_AS_STR, &old_value,
+        GNS_TREESTORE_COL_RECORD_TYPE, &type,
+        GNS_TREESTORE_COL_VAL_AS_STR, &old_value,
         -1);
 
     if (old_value != NULL)
@@ -718,14 +829,14 @@ GNUNET_GNS_GTK_value_cellrenderertext_edited_cb (GtkCellRendererText *renderer,
                                       &data,
                                       &data_size))
     {
-      gtk_tree_store_set (gns->ts, &it, TREE_COL_VAL_COLOR, NULL, -1);
-      gtk_tree_store_set (gns->ts, &it, TREE_COL_VAL_AS_STR, new_text, -1);
+      gtk_tree_store_set (gns->ts, &it, GNS_TREESTORE_COL_VAL_COLOR, NULL, -1);
+      gtk_tree_store_set (gns->ts, &it, GNS_TREESTORE_COL_VAL_AS_STR, new_text, -1);
       check_name_validity_and_commit (gns, path, NULL);
     }
     else
     {
-      gtk_tree_store_set (gns->ts, &it, TREE_COL_VAL_COLOR, "red", -1);
-      gtk_tree_store_set (gns->ts, &it, TREE_COL_VAL_AS_STR, new_text, -1);
+      gtk_tree_store_set (gns->ts, &it, GNS_TREESTORE_COL_VAL_COLOR, "red", -1);
+      gtk_tree_store_set (gns->ts, &it, GNS_TREESTORE_COL_VAL_AS_STR, new_text, -1);
     }
   }
 }
@@ -758,40 +869,40 @@ GNUNET_GNS_GTK_name_cellrenderertext_edited_cb (GtkCellRendererText *renderer,
     return;
 
   gtk_tree_model_get_iter_from_string(tm, &it, path);
-  gtk_tree_model_get(tm, &it, TREE_COL_NOT_DUMMY_ROW, &not_dummy, -1);
-  gtk_tree_model_get(tm, &it, TREE_COL_NAME, &name, -1);
+  gtk_tree_model_get(tm, &it, GNS_TREESTORE_COL_NOT_DUMMY_ROW, &not_dummy, -1);
+  gtk_tree_model_get(tm, &it, GNS_TREESTORE_COL_NAME, &name, -1);
 
   if (not_dummy == GNUNET_NO)
   {
     /* update name */
     gtk_tree_store_set (gns->ts, &it,
-                        TREE_COL_NAME, new_text,
-                        TREE_COL_RECORD_TYPE, 0,
-                        TREE_COL_RECORD_TYPE_AS_STR, _(NEW_RECORD_STR),
-                        TREE_COL_NOT_DUMMY_ROW, GNUNET_YES,
+                        GNS_TREESTORE_COL_NAME, new_text,
+                        GNS_TREESTORE_COL_RECORD_TYPE, 0,
+                        GNS_TREESTORE_COL_RECORD_TYPE_AS_STR, _(NEW_RECORD_STR),
+                        GNS_TREESTORE_COL_NOT_DUMMY_ROW, GNUNET_YES,
                         -1);
     check_name_validity_and_commit (gns, gtk_tree_model_get_string_from_iter(gns->tm, &it), name);
 
     /* add a new dummy line */
     gtk_tree_store_insert_with_values (gns->ts, &it,NULL, 0,
-        TREE_COL_NAME, _(NEW_NAME_STR),
-        TREE_COL_NAME_IS_VISIBLE, TRUE,
-        TREE_COL_RECORD_TYPE, 1,
-        TREE_COL_NOT_DUMMY_ROW, GNUNET_NO,
-        TREE_COL_IS_RECORD_ROW, GNUNET_NO,
+        GNS_TREESTORE_COL_NAME, _(NEW_NAME_STR),
+        GNS_TREESTORE_COL_NAME_IS_VISIBLE, TRUE,
+        GNS_TREESTORE_COL_RECORD_TYPE, 1,
+        GNS_TREESTORE_COL_NOT_DUMMY_ROW, GNUNET_NO,
+        GNS_TREESTORE_COL_IS_RECORD_ROW, GNUNET_NO,
         -1);
   }
   else
   {
     /* update name */
-    gtk_tree_store_set (gns->ts, &it, TREE_COL_NAME, new_text, -1);
+    gtk_tree_store_set (gns->ts, &it, GNS_TREESTORE_COL_NAME, new_text, -1);
 
     if (TRUE == gtk_tree_model_iter_children (gns->tm, &child, &it))
     {
       do
       {
         gtk_tree_store_set (gns->ts, &child,
-                           TREE_COL_NAME, &new_text,
+                           GNS_TREESTORE_COL_NAME, &new_text,
                            -1);
         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "New text for `%s' is `%s'\n", path, new_text);
       }
@@ -804,17 +915,18 @@ GNUNET_GNS_GTK_name_cellrenderertext_edited_cb (GtkCellRendererText *renderer,
   if (GNUNET_SYSERR == GNUNET_NAMESTORE_check_name (new_text))
   {
     gtk_tree_store_set (gns->ts, &it,
-                        TREE_COL_NAME_COLOR, "red",
+                        GNS_TREESTORE_COL_NAME_COLOR, "red",
                         -1);
   }
   else
   {
     gtk_tree_store_set (gns->ts, &it,
-                        TREE_COL_NAME_COLOR, NULL,
+                        GNS_TREESTORE_COL_NAME_COLOR, NULL,
                         -1);
   }
 }
 
+
 /**
  * The zone treeview pop up menu is supposed to be created.
  * (Note: this is not the only method that might need to be
@@ -839,7 +951,7 @@ GNUNET_GNS_GTK_main_treeview_popup_menu_cb (GtkWidget *widget,
   ts = gtk_tree_view_get_selection(gns->tv);
   if (! gtk_tree_selection_get_selected (ts, &tm, &it))
     return TRUE;
-  gtk_tree_model_get(gns->tm, &it, TREE_COL_NOT_DUMMY_ROW, &not_dummy, -1);
+  gtk_tree_model_get(gns->tm, &it, GNS_TREESTORE_COL_NOT_DUMMY_ROW, &not_dummy, -1);
   if (GNUNET_NO == not_dummy)
     return TRUE;
 
@@ -849,6 +961,7 @@ GNUNET_GNS_GTK_main_treeview_popup_menu_cb (GtkWidget *widget,
   return TRUE;
 }
 
+
 static void
 set_relative_expiration_time (struct GNUNET_GNS_Context *gns, struct GNUNET_TIME_Relative reltime)
 {
@@ -865,7 +978,7 @@ set_relative_expiration_time (struct GNUNET_GNS_Context *gns, struct GNUNET_TIME
   if (! gtk_tree_selection_get_selected (ts, &tm, &it))
     return;
 
-  gtk_tree_model_get(tm, &it, TREE_COL_NOT_DUMMY_ROW, &not_dummy, -1);
+  gtk_tree_model_get(tm, &it, GNS_TREESTORE_COL_NOT_DUMMY_ROW, &not_dummy, -1);
   if (GNUNET_NO == not_dummy)
     return;
 
@@ -904,6 +1017,7 @@ GNUNET_GNS_GTK_main_treeview_popup_menu_exp1w_cb (GtkWidget *widget,
   return TRUE;
 }
 
+
 gboolean
 GNUNET_GNS_GTK_main_treeview_popup_menu_exp1y_cb (GtkWidget *widget,
                                             gpointer user_data)
@@ -912,6 +1026,7 @@ GNUNET_GNS_GTK_main_treeview_popup_menu_exp1y_cb (GtkWidget *widget,
   return TRUE;
 }
 
+
 gboolean
 GNUNET_GNS_GTK_main_treeview_popup_menu_expinf_cb (GtkWidget *widget,
                                             gpointer user_data)
@@ -921,7 +1036,6 @@ GNUNET_GNS_GTK_main_treeview_popup_menu_expinf_cb (GtkWidget *widget,
 }
 
 
-
 gboolean
 GNUNET_GNS_GTK_main_treeview_button_press_popup_menu_cb (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
 {
@@ -933,6 +1047,7 @@ GNUNET_GNS_GTK_main_treeview_button_press_popup_menu_cb (GtkWidget *widget, GdkE
   return FALSE;
 }
 
+
 gboolean
 GNUNET_GNS_GTK_main_treeview_key_press_popup_menu_cb (GtkWidget *widget, GdkEventKey  *event, gpointer user_data)
 {
@@ -942,6 +1057,7 @@ GNUNET_GNS_GTK_main_treeview_key_press_popup_menu_cb (GtkWidget *widget, GdkEven
   return FALSE;
 }
 
+
 struct ZoneIteration_Context
 {
   struct GNUNET_GNS_Context *gns;
@@ -950,6 +1066,7 @@ struct ZoneIteration_Context
   char *label;
 };
 
+
 void
 GNUNET_GNS_GTK_delete_popup_menu_delete_cb (GtkMenuItem *menuitem,
                                                  gpointer user_data)
@@ -964,7 +1081,7 @@ GNUNET_GNS_GTK_delete_popup_menu_delete_cb (GtkMenuItem *menuitem,
   ts = gtk_tree_view_get_selection(gns->tv);
   if (gtk_tree_selection_get_selected (ts, &tm, &it))
   {
-    gtk_tree_model_get(tm, &it, TREE_COL_NOT_DUMMY_ROW, &not_dummy, -1);
+    gtk_tree_model_get(tm, &it, GNS_TREESTORE_COL_NOT_DUMMY_ROW, &not_dummy, -1);
     if (GNUNET_NO == not_dummy)
       return; /* do not delete the dummy line */
 
@@ -974,6 +1091,7 @@ GNUNET_GNS_GTK_delete_popup_menu_delete_cb (GtkMenuItem *menuitem,
   }
 }
 
+
 static void
 zone_iteration_proc (void *cls,
                           const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
@@ -1021,18 +1139,18 @@ zone_iteration_proc (void *cls,
   GNUNET_assert(GTK_IS_TREE_STORE(zc_ctx->gns->ts));
   gtk_tree_store_append(zc_ctx->gns->ts, &iter_name, NULL);
   gtk_tree_store_set(zc_ctx->gns->ts, &iter_name,
-                     TREE_COL_NAME, name,
-                     TREE_COL_NAME_IS_VISIBLE, TRUE,
-                     TREE_COL_RECORD_TYPE, 0,
-                     TREE_COL_RECORD_TYPE_AS_STR, _(NEW_RECORD_STR),
-                     TREE_COL_IS_RECORD_ROW, GNUNET_NO,
-                     TREE_COL_NOT_DUMMY_ROW, GNUNET_YES,
+                     GNS_TREESTORE_COL_NAME, name,
+                     GNS_TREESTORE_COL_NAME_IS_VISIBLE, TRUE,
+                     GNS_TREESTORE_COL_RECORD_TYPE, 0,
+                     GNS_TREESTORE_COL_RECORD_TYPE_AS_STR, _(NEW_RECORD_STR),
+                     GNS_TREESTORE_COL_IS_RECORD_ROW, GNUNET_NO,
+                     GNS_TREESTORE_COL_NOT_DUMMY_ROW, GNUNET_YES,
                      -1);
 
   if (GNUNET_SYSERR == GNUNET_NAMESTORE_check_name (name))
   {
     gtk_tree_store_set (zc_ctx->gns->ts, &iter_name,
-                        TREE_COL_NAME_COLOR, "red",
+                        GNS_TREESTORE_COL_NAME_COLOR, "red",
                         -1);
   }
   /* Append elements for records */
@@ -1091,17 +1209,17 @@ zone_iteration_proc (void *cls,
     else
     {
       gtk_tree_store_insert_with_values(zc_ctx->gns->ts, &iter_record , &iter_name, 0,
-                                         TREE_COL_NAME, name,
-                                         TREE_COL_NAME_IS_VISIBLE, FALSE,
-                                         TREE_COL_RECORD_TYPE, rd[c].record_type,
-                                         TREE_COL_RECORD_TYPE_AS_STR, type_str,
-                                         TREE_COL_IS_PUBLIC, public,
-                                         TREE_COL_EXP_TIME, exp_t,
-                                         TREE_COL_EXP_TIME_AS_STR, exp,
-                                         TREE_COL_EXP_TIME_IS_REL, time_is_relative,
-                                         TREE_COL_VAL_AS_STR, val,
-                                         TREE_COL_IS_RECORD_ROW, GNUNET_YES,
-                                         TREE_COL_NOT_DUMMY_ROW, GNUNET_YES,
+                                         GNS_TREESTORE_COL_NAME, name,
+                                         GNS_TREESTORE_COL_NAME_IS_VISIBLE, FALSE,
+                                         GNS_TREESTORE_COL_RECORD_TYPE, rd[c].record_type,
+                                         GNS_TREESTORE_COL_RECORD_TYPE_AS_STR, type_str,
+                                         GNS_TREESTORE_COL_IS_PUBLIC, public,
+                                         GNS_TREESTORE_COL_EXP_TIME, exp_t,
+                                         GNS_TREESTORE_COL_EXP_TIME_AS_STR, exp,
+                                         GNS_TREESTORE_COL_EXP_TIME_IS_REL, time_is_relative,
+                                         GNS_TREESTORE_COL_VAL_AS_STR, val,
+                                         GNS_TREESTORE_COL_IS_RECORD_ROW, GNUNET_YES,
+                                         GNS_TREESTORE_COL_NOT_DUMMY_ROW, GNUNET_YES,
                                          -1);
     }
     GNUNET_free (type_str);
@@ -1112,6 +1230,7 @@ zone_iteration_proc (void *cls,
   GNUNET_NAMESTORE_zone_iterator_next(zc_ctx->it);
 }
 
+
 /**
  * The zone treeview was realized.   Setup the model.
  *
@@ -1128,11 +1247,11 @@ GNUNET_GNS_GTK_main_treeview_realize_cb (GtkWidget *widget,
 
   /* Append a top level row and leave it empty */
   gtk_tree_store_insert_with_values(gns->ts, &toplevel, NULL, 0,
-                                     TREE_COL_NAME, _(NEW_NAME_STR),
-                                     TREE_COL_NAME_IS_VISIBLE, TRUE,
-                                     TREE_COL_RECORD_TYPE, 1,
-                                     TREE_COL_IS_RECORD_ROW, GNUNET_NO,
-                                     TREE_COL_NOT_DUMMY_ROW, GNUNET_NO,
+                                     GNS_TREESTORE_COL_NAME, _(NEW_NAME_STR),
+                                     GNS_TREESTORE_COL_NAME_IS_VISIBLE, TRUE,
+                                     GNS_TREESTORE_COL_RECORD_TYPE, 1,
+                                     GNS_TREESTORE_COL_IS_RECORD_ROW, GNUNET_NO,
+                                     GNS_TREESTORE_COL_NOT_DUMMY_ROW, GNUNET_NO,
                                      -1);
 
   zc_ctx = GNUNET_malloc (sizeof (struct ZoneIteration_Context));