-fix funky PSEU editing issue

1 files changed, 23 insertions, 25 deletions

diff --git a/src/setup/gnunet-setup-gns.c b/src/setup/gnunet-setup-gns.c
index 11820cf4..768054e1 100644
--- a/src/setup/gnunet-setup-gns.c
+++ b/src/setup/gnunet-setup-gns.c
@@ -836,7 +836,6 @@ decrypt_block_for_merge (void *cls,
 }
 
 
-
 /**
  * The edit dialog completed; update the namestore and the 
  * view based on the new values in 'edc'.
@@ -1213,28 +1212,21 @@ GNUNET_setup_gns_popup_edit_button_activate_cb (GtkWidget *widget,
  *
  * @param renderer updated renderer
  * @param path the path identifying the edited cell
- * @param new_iter selected cell in the combo's model (with the record type)
+ * @param new_text updated text
  * @param user_data unused
  */
 void
-GNUNET_setup_gns_type_cellrenderercombo_changed_cb (GtkCellRendererCombo *combo,
-                                                    gchar *path_string,
-                                                    GtkTreeIter *new_iter,
-                                                    gpointer user_data)
+GNUNET_setup_gns_type_cellrenderercombo_edited_cb (GtkCellRendererText *text,
+                                                   gchar *path_string,
+                                                   gchar *new_text,
+                                                   gpointer user_data)
 {
-  GtkListStore *ls;
-  gchar *new_text;
   GtkTreeIter it;
   guint type;
   char *name_str;
   struct GNUNET_HashCode name_hash;
   struct RecordInfo *ri;
 
-  ls = GTK_LIST_STORE (GNUNET_SETUP_get_object ("GNUNET_setup_gns_type_liststore"));
-  gtk_tree_model_get (GTK_TREE_MODEL (ls), new_iter, 
-                      1, &new_text,
-                      -1);
-
   if (0 == strcmp (new_text, _(NEW_RECORD_STR)))
   {
     GNUNET_break (0);
@@ -1585,17 +1577,31 @@ GNUNET_setup_gns_pseu_entry_changed_cb (GtkEditable *editable,
   struct OperationContext *oc;
 
   pseu = gtk_entry_get_text (GTK_ENTRY (editable));
+  if ( (NULL != current_pseudonym) &&
+       (0 == strcmp (pseu,
+                     current_pseudonym)) )
+    return;
   if (GNUNET_OK !=
       GNUNET_DNSPARSER_check_label (pseu))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _("Name `%s' invalid for GADS/DNS (too long for a DNS label?)\n"),
+                _("Name `%s' invalid for GNS (too long for a DNS label?)\n"),
                 pseu);
     gdk_beep ();
     gtk_entry_set_text (GTK_ENTRY (editable),
-                        pseu);
+                        current_pseudonym);
     return;
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+              "New Pseudonym is `%s' %u\n",
+              pseu);
+  GNUNET_free_non_null (current_pseudonym);
+  if ( (NULL != pseu) &&
+       (0 != strlen (pseu)) )
+    current_pseudonym = GNUNET_strdup (pseu);
+  else
+    current_pseudonym = NULL;
+
   GNUNET_CRYPTO_hash ("+", 1, &hc);
   ri = GNUNET_CONTAINER_multihashmap_get (n2r, &hc);
   if (NULL == ri)
@@ -1642,15 +1648,6 @@ GNUNET_setup_gns_pseu_entry_changed_cb (GtkEditable *editable,
                                              total,
                                              rd_new,
                                              &operation_done_cont, oc);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
-                "New Pseudonym is `%s' %u\n",
-                (char *) pseu, rd_new[off].data_size);
-    GNUNET_free_non_null (current_pseudonym);
-    if ( (NULL != pseu) &&
-         (0 != strlen (pseu)) )
-      current_pseudonym = GNUNET_strdup (pseu);
-    else
-      current_pseudonym = NULL;
   }
 #if HAVE_QRENCODE_H
   setup_qrcode ();
@@ -1874,7 +1871,8 @@ zone_iteration_proc (void *cls,
       GNUNET_asprintf (&type_str, "%s", EXPIRE_INVALID_STRING);
 
     if ( (0 == strcmp (name, GNUNET_GNS_MASTERZONE_STR)) && 
-         (GNUNET_NAMESTORE_TYPE_PSEU == rd[c].record_type) )
+         (GNUNET_NAMESTORE_TYPE_PSEU == rd[c].record_type) &&
+         (NULL == current_pseudonym) )
     {
       pseu_entry = GTK_ENTRY((GNUNET_SETUP_get_object ("GNUNET_setup_gns_pseu_entry")));
       gtk_entry_set_text (pseu_entry, val);