1 files changed, 25 insertions, 4 deletions

diff --git a/src/setup/gnunet-setup-gns.c b/src/setup/gnunet-setup-gns.c
index ebd87389..e25f6609 100644
--- a/src/setup/gnunet-setup-gns.c
+++ b/src/setup/gnunet-setup-gns.c
@@ -1074,6 +1074,7 @@ remove_records_by_path (const gchar *path)
                                       (void**)&rd.data, &rd.data_size);
     
     rc = GNUNET_malloc (sizeof (struct RemoveContext));
+    GNUNET_CONTAINER_DLL_insert (rc_head, rc_tail, rc);
     rc->path = strdup (path);
     rc->qe = GNUNET_NAMESTORE_record_remove (namestore, pkey, name, &rd, 
                                              &update_treemodel_after_remove, rc);
@@ -1085,6 +1086,7 @@ remove_records_by_path (const gchar *path)
   {
     /* Removing the whole name record */
     rc = GNUNET_malloc(sizeof (struct RemoveContext));
+    GNUNET_CONTAINER_DLL_insert (rc_head, rc_tail, rc);
     rc->path = strdup (path);
     rc->qe = GNUNET_NAMESTORE_record_remove (namestore, pkey, name, NULL,
                                              &update_treemodel_after_remove, rc);
@@ -1256,6 +1258,8 @@ GNUNET_setup_gns_type_cellrenderercombo_edited_cb (GtkCellRendererCombo *combo,
   guint type;
   char *name_str;
 
+  if (0 == strcmp (new_text, _(NEW_RECORD_STR)))
+    return; /* no record type was selected */
   type = GNUNET_NAMESTORE_typename_to_number (new_text);
   if (UINT32_MAX == type)
   {
@@ -1395,8 +1399,9 @@ GNUNET_setup_gns_name_cellrenderertext_edited_cb (GtkCellRendererText *renderer,
               path, new_text);
   if ((0 == strcmp (new_text, NEW_NAME_STR)) || (0 == strcmp (new_text, "")))
     return;
-  if (GNUNET_OK !=
-      GNUNET_DNSPARSER_check_label (new_text))
+  if ( (GNUNET_OK !=
+        GNUNET_DNSPARSER_check_label (new_text)) &&
+       (0 != strcmp (new_text, ROOT_STR)) )
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 _("Name `%s' invalid for GADS/DNS (too long for a DNS label?)\n"),
@@ -1473,6 +1478,7 @@ create_popup_menu ()
   GtkTreeIter it;
   GtkMenu *popup;
   GtkTreeSelection *sel;
+  gboolean name_vis;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Considering creating popup menu...\n");
@@ -1483,7 +1489,16 @@ create_popup_menu ()
                 "No row selected\n");
     return FALSE;
   }
-  popup  = GTK_MENU (GNUNET_SETUP_get_object ("GNUNET_setup_gns_delete_popup_menu"));
+  gtk_tree_model_get (tm, &it,
+                      GNS_TREESTORE_COL_NAME_IS_VISIBLE, &name_vis,
+                      -1);
+  if (name_vis)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Selected row is not a record row\n");
+    return FALSE;
+  }
+  popup  = GTK_MENU (GNUNET_SETUP_get_object ("GNUNET_setup_gns_edit_popup_menu"));
   gtk_widget_show_all (GTK_WIDGET (popup));
   gtk_menu_popup (popup, NULL, NULL, NULL, NULL, 0, 0);
   return TRUE;
@@ -1928,9 +1943,13 @@ zone_iteration_proc (void *cls,
     gtk_widget_show (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_gns_zone_selection_hbuttonbox")));
     return;
   }
-  if (GNUNET_SYSERR == GNUNET_DNSPARSER_check_label (name))
+  if ( (GNUNET_SYSERR == GNUNET_DNSPARSER_check_label (name)) &&
+       (0 != strcmp (name, ROOT_STR)) )
   {
     GNUNET_break (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Got invalid record name `%s' from namestore\n"),
+                name);
     GNUNET_NAMESTORE_zone_iterator_next (zc_ctx->it);
     return;
   }
@@ -1946,6 +1965,7 @@ zone_iteration_proc (void *cls,
                       GNS_TREESTORE_COL_RECORD_TYPE_AS_STR, _(NEW_RECORD_STR),
                       GNS_TREESTORE_COL_IS_RECORD_ROW, TRUE,
                       GNS_TREESTORE_COL_NOT_DUMMY_ROW, FALSE,
+                      GNS_TREESTORE_COL_TYPE_IS_EDITABLE, TRUE,
                       -1);
 
   /* Append elements for records */
@@ -2069,6 +2089,7 @@ zone_key_loaded_callback (void *cls,
                                      GNS_TREESTORE_COL_RECORD_TYPE, GNUNET_DNSPARSER_TYPE_A,
                                      GNS_TREESTORE_COL_IS_RECORD_ROW, FALSE,
                                      GNS_TREESTORE_COL_NOT_DUMMY_ROW, FALSE,
+                                     GNS_TREESTORE_COL_TYPE_IS_EDITABLE, TRUE,
                                      -1);
   /* Load zone from namestore! */
   zc_ctx->zone = zone;