1 files changed, 45 insertions, 47 deletions

diff --git a/src/namestore/gnunet-namestore-gtk_edit.c b/src/namestore/gnunet-namestore-gtk_edit.c
index de8a1bd6..fc6dbca9 100644
--- a/src/namestore/gnunet-namestore-gtk_edit.c
+++ b/src/namestore/gnunet-namestore-gtk_edit.c
@@ -27,24 +27,6 @@
 
 
 /**
- * Columns in the 'zone_liststore'.
- */
-enum ZoneListColumn
-{
-  /**
-   * A gchararray with the name of the zone for users.
-   */
-  ZONELIST_COL_NAME = 0,
-
-  /**
-   * A gchararray with the name of the configuration file option with
-   * the zone key.
-   */
-  ZONELIST_COL_OPTION = 1
-};
-
-
-/**
  * Disable 'save' button, dialog state is not acceptable.
  *
  * @param edc dialog to modify
@@ -164,6 +146,44 @@ GNS_edit_dialog_expiration_absolute_radiobutton_toggled_cb (GtkToggleButton *but
 
 
 /**
+ * Setup the zone combobox.
+ *
+ * @param edc dialog to setup the combo box for
+ */
+static void
+setup_zone (struct EditDialogContext *edc)
+{
+  GtkTreeIter iter;
+  GtkComboBox *cb;
+  gchar *name;
+
+  cb = GTK_COMBO_BOX (gtk_builder_get_object (edc->builder,
+                                              "edit_dialog_zone_combobox"));
+
+  gtk_combo_box_set_model (cb,
+                           GTK_TREE_MODEL (edc->zone_liststore));
+  GNUNET_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (edc->zone_liststore),
+                                                &iter));
+  do {
+    gtk_tree_model_get (GTK_TREE_MODEL (edc->zone_liststore),
+                        &iter,
+                        ZONE_LS_NAME, &name,
+                        -1);
+    if (0 == strcmp (name,
+                     edc->new_zone_option))
+    {
+      g_free (name);
+      break;
+    }
+    g_free (name);
+  } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (edc->zone_liststore),
+                                     &iter));
+  gtk_combo_box_set_active_iter (cb,
+                                 &iter);
+}
+
+
+/**
  * Initialize widgets of the edit dialog that are the same regardless of
  * the type of the record.
  *
@@ -173,10 +193,8 @@ static void
 edit_dialog_setup_common_elements (struct EditDialogContext *edc)
 {
   GtkComboBox *cb;
-  GtkTreeModel *tm;
   GtkListStore *ls;
   GtkTreeIter iter;
-  gchar *opt;
   struct GNUNET_TIME_Absolute at;
   struct GNUNET_TIME_Relative rt;
   time_t tp;
@@ -270,32 +288,7 @@ edit_dialog_setup_common_elements (struct EditDialogContext *edc)
   gtk_spin_button_set_value (GTK_SPIN_BUTTON (gtk_builder_get_object (edc->builder,
                                                                       "edit_dialog_expiration_absolute_seconds_spinbutton")),
                              (double) ymd->tm_sec);
-
-  /* set source zone! */
-  cb = GTK_COMBO_BOX (gtk_builder_get_object (edc->builder,
-                                              "edit_dialog_zone_combobox"));
-  tm = gtk_combo_box_get_model (cb);
-  opt = NULL;
-  if (gtk_tree_model_get_iter_first (tm, &iter))
-  {
-    do
-    {
-      gtk_tree_model_get (tm, &iter,
-                          ZONELIST_COL_OPTION, &opt,
-                          -1);
-      if ( (NULL != opt) &&
-           (0 == strcasecmp (opt,
-                             edc->new_zone_option)) )
-        break;
-      g_free (opt);
-      opt = NULL;
-    } while (gtk_tree_model_iter_next (tm, &iter));
-  }
-  if (NULL != opt)
-  {
-    gtk_combo_box_set_active_iter (cb, &iter);
-    g_free (opt);
-  }
+  setup_zone (edc);
 }
 
 
@@ -315,6 +308,7 @@ edit_dialog_putes_common_elements (struct EditDialogContext *edc)
   GtkTreeModel *tm;
   GtkTreeIter iter;
   gchar *opt;
+  struct GNUNET_IDENTITY_Ego *ego;
 
   /* is public flag */
   edc->n_public = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
@@ -402,15 +396,19 @@ edit_dialog_putes_common_elements (struct EditDialogContext *edc)
   else
   {
     gtk_tree_model_get (tm, &iter,
-                        ZONELIST_COL_OPTION, &opt,
+                        ZONE_LS_NAME, &opt,
+                        ZONE_LS_EGO, &ego,
                         -1);
     if (NULL == opt)
+    {
       GNUNET_break (0);
+    }
     else
     {
       g_free (edc->new_zone_option);
       edc->new_zone_option = g_strdup (opt);
       g_free (opt);
+      edc->ego = ego;
     }
   }
 }