-fixing #2223

2 files changed, 36 insertions, 16 deletions

diff --git a/src/setup/gnunet-setup-hostlist-editing.c b/src/setup/gnunet-setup-hostlist-editing.c
index 02056b0d..981645c2 100644
--- a/src/setup/gnunet-setup-hostlist-editing.c
+++ b/src/setup/gnunet-setup-hostlist-editing.c
@@ -44,6 +44,7 @@ GNUNET_setup_hostlist_url_cellrenderertext_edited_cb (GtkCellRendererText *
   GtkListStore *ls;
   GtkTreeIter old;
   GtkTreeIter iter;
+  gchar *oldtext;
 
   ls = GTK_LIST_STORE (GNUNET_SETUP_get_object
                        ("GNUNET_setup_hostlist_url_liststore"));
@@ -58,9 +59,18 @@ GNUNET_setup_hostlist_url_cellrenderertext_edited_cb (GtkCellRendererText *
     GNUNET_break (0);
     return;
   }
-
-  gtk_list_store_insert_before (ls, &iter, &old);
-  gtk_list_store_set (ls, &iter, 0, new_text, 1, FALSE, -1);
+  gtk_tree_model_get (GTK_TREE_MODEL (ls), &old, 0, &oldtext, -1);
+  fprintf (stderr, "Edited to `%s'\n", new_text);
+  if (strlen (oldtext) == 0)
+  {
+    gtk_list_store_insert_before (ls, &iter, &old);
+    gtk_list_store_set (ls, &iter, 0, new_text, 1, FALSE, -1);
+  }
+  else
+  {
+    gtk_list_store_set (ls, &old, 0, new_text, 1, FALSE, -1);
+  }
+  g_free (oldtext);
 }
 
 /* end of gnunet-setup-hostlist-editing.c */
diff --git a/src/setup/gnunet-setup-options.c b/src/setup/gnunet-setup-options.c
index 46ce9dbb..c9b16350 100644
--- a/src/setup/gnunet-setup-options.c
+++ b/src/setup/gnunet-setup-options.c
@@ -640,12 +640,8 @@ load_string_list_store (const void *cls, const char *section,
   if (ls == NULL)
     return GNUNET_SYSERR;
   t = GNUNET_strdup (value);
-  w = strtok (t, " ");
-  while (w != NULL)
-  {
+  for (w = strtok (t, " "); w != NULL; w = strtok (NULL, " "))
     gtk_list_store_insert_with_values (ls, &iter, G_MAXINT, 0, w, 1, FALSE, -1);
-    w = strtok (NULL, " ");
-  }
   GNUNET_free (t);
   gtk_list_store_insert_with_values (ls, &iter, G_MAXINT, 0, "", 1, TRUE, -1);
   return GNUNET_OK;
@@ -683,15 +679,18 @@ save_string_list_store (const void *cls, const char *section,
     do
     {
       gtk_tree_model_get (tm, &iter, 0, &val, -1);
-      if (value == NULL)
+      if (0 < strlen (val))
       {
-        value = GNUNET_strdup (val);
-      }
-      else
-      {
-        GNUNET_asprintf (&n, "%s %s", value, val);
-        GNUNET_free (value);
-        value = n;
+        if (value == NULL)
+        {
+          value = GNUNET_strdup (val);
+        }
+        else
+        {
+          GNUNET_asprintf (&n, "%s %s", value, val);
+          GNUNET_free (value);
+          value = n;
+        }
       }
       g_free (val);
     }
@@ -1701,6 +1700,17 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
    NULL},
 
   {
+   "GNUNET_setup_hostlist_url_liststore",
+   "row-deleted",
+   "hostlist",
+   "SERVERS",
+   NULL, NULL,
+   NULL,
+   &save_string_list_store, NULL,
+   NULL, NULL,
+   NULL},
+
+  {
    "GNUNET_setup_hostlist_url_treeview",
    NULL, NULL, NULL,            /* FIXME */
    gettext_noop ("Known hostlist URLs"),