1 files changed, 13 insertions, 7 deletions

diff --git a/src/gns/gnunet-gns-gtk_zone.c b/src/gns/gnunet-gns-gtk_zone.c
index 319061ef..90a7f76f 100644
--- a/src/gns/gnunet-gns-gtk_zone.c
+++ b/src/gns/gnunet-gns-gtk_zone.c
@@ -40,6 +40,7 @@ enum
   TREE_COL_VAL_AS_STR,
   TREE_COL_VAL_COLOR,
   TREE_COL_NAME_IS_EDITABLE,
+  TREE_COL_IS_NAME_ROW,
 };
 
 enum
@@ -85,13 +86,16 @@ GNUNET_GNS_GTK_type_cellrenderercombo_changed_cb (GtkCellRendererCombo *combo,
 
   /* check if value is still valid */
   gtk_tree_model_get(tm, &it, TREE_COL_VAL_AS_STR, &value_str, -1);
-  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);
-  else
-    gtk_tree_store_set (gns->ts, &it, TREE_COL_VAL_COLOR, NULL, -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);
+    else
+      gtk_tree_store_set (gns->ts, &it, TREE_COL_VAL_COLOR, NULL, -1);
+  }
 }
 
 
@@ -303,6 +307,7 @@ void zone_iteration_proc (void *cls,
   gtk_tree_store_set(zc_ctx->gns->ts, &iter_name,
                      TREE_COL_NAME, name,
                      TREE_COL_NAME_IS_EDITABLE, 1,
+                     TREE_COL_IS_NAME_ROW, 1
                      -1);
 
 
@@ -342,6 +347,7 @@ void zone_iteration_proc (void *cls,
                                        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_NAME_ROW, 0
                                        -1);
 
     GNUNET_free (exp);