1 files changed, 21 insertions, 4 deletions

diff --git a/src/gns/gnunet-gns-gtk_zone.c b/src/gns/gnunet-gns-gtk_zone.c
index 44a779bd..bfd54760 100644
--- a/src/gns/gnunet-gns-gtk_zone.c
+++ b/src/gns/gnunet-gns-gtk_zone.c
@@ -135,7 +135,6 @@ check_name_validity_and_commit (struct GNUNET_GNS_Context *gns, gchar *path)
 
   if (FALSE == gtk_tree_model_iter_children (gns->tm, &it, &parent))
   {
-    GNUNET_break (0);
     return;
   }
   for (c = 0; c < children; c++)
@@ -155,8 +154,11 @@ check_name_validity_and_commit (struct GNUNET_GNS_Context *gns, gchar *path)
     /* valid name */
     if (NULL == n_name)
       valid = GNUNET_NO;
-    else if (GNUNET_SYSERR == GNUNET_NAMESTORE_check_name (n_value))
+    else
+    {
+      if (GNUNET_SYSERR == GNUNET_NAMESTORE_check_name (n_name))
       valid = GNUNET_NO;
+    }
 
     /* valid record type */
     if (0 == n_type)
@@ -590,8 +592,10 @@ GNUNET_GNS_GTK_name_cellrenderertext_edited_cb (GtkCellRendererText *renderer,
 {
   struct GNUNET_GNS_Context *gns = user_data;
   GtkTreeIter it;
+  GtkTreeIter child;
   GtkTreeModel *tm = GTK_TREE_MODEL(gns->ts);
   int not_dummy;
+  int children;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "New text for `%s' is `%s'\n", path, new_text);
   if ((0 == strcmp (new_text, NEW_NAME_STR)) || (0 == strcmp (new_text, "")))
@@ -609,6 +613,7 @@ GNUNET_GNS_GTK_name_cellrenderertext_edited_cb (GtkCellRendererText *renderer,
                         TREE_COL_RECORD_TYPE_AS_STR, _(NEW_RECORD_STR),
                         TREE_COL_NOT_DUMMY_ROW, GNUNET_YES,
                         -1);
+    check_name_validity_and_commit (gns, gtk_tree_model_get_string_from_iter(gns->tm, &it));
 
     /* add a new dummy line */
     gtk_tree_store_insert_with_values (gns->ts, &it,NULL, 0,
@@ -623,6 +628,20 @@ GNUNET_GNS_GTK_name_cellrenderertext_edited_cb (GtkCellRendererText *renderer,
   {
     /* update name */
     gtk_tree_store_set (gns->ts, &it, TREE_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,
+                           -1);
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "New text for `%s' is `%s'\n", path, new_text);
+      }
+      while (TRUE == gtk_tree_model_iter_next (gns->tm, &child));
+    }
+
+    check_name_validity_and_commit (gns, gtk_tree_model_get_string_from_iter(gns->tm, &it));
   }
 
   if (GNUNET_SYSERR == GNUNET_NAMESTORE_check_name (new_text))
@@ -637,8 +656,6 @@ GNUNET_GNS_GTK_name_cellrenderertext_edited_cb (GtkCellRendererText *renderer,
                         TREE_COL_NAME_COLOR, NULL,
                         -1);
   }
-
-  check_name_validity_and_commit (gns, path);
 }
 
 /**