1 files changed, 15 insertions, 57 deletions

diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c
index ceff0812..c01e95b4 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -182,25 +182,6 @@ enum LIST_COLUMNS
 
 
 /**
- * Columns in the zone list store.
- */
-enum ZONE_COLUMNS
-{
-
-  /**
-   * A gchararray
-   */
-  ZONE_LS_NAME = 0,
-
-
-  /**
-   * A `struct GNUNET_IDENTITY_Ego`
-   */
-  ZONE_LS_EGO = 1
-};
-
-
-/**
  * Closure for 'operation_done_cont'.
  */
 struct OperationContext
@@ -253,7 +234,7 @@ struct MoveOperationContext
   /**
    * Private key of target zone.
    */
-  struct GNUNET_CRYPTO_EccPrivateKey *pk;
+  struct GNUNET_CRYPTO_EccPrivateKey pk;
 
   /**
    * Data to free.
@@ -832,7 +813,6 @@ merge_with_existing_records (void *cls,
   {
     show_error_message (_("Record combination not permitted"),
                         _("Given the existing records, adding a new record of this type is not allowed."));
-    GNUNET_free (moc->pk);
     GNUNET_free (moc->data);
     GNUNET_free (moc);
     free_edit_dialog_context (edc);
@@ -845,12 +825,11 @@ merge_with_existing_records (void *cls,
   oc = GNUNET_new (struct OperationContext);
   GNUNET_CONTAINER_DLL_insert (oc_head, oc_tail, oc);
   oc->qe = GNUNET_NAMESTORE_records_store (namestore,
-                                           moc->pk,
+                                           &moc->pk,
                                            edc->name,
                                            rd_count + 1,
                                            rd_new,
                                            &operation_done_cont, oc);
-  GNUNET_free (moc->pk);
   GNUNET_free (moc->data);
   GNUNET_free (moc);
   free_edit_dialog_context (edc);
@@ -871,8 +850,13 @@ decrypt_block_for_merge (void *cls,
   struct MoveOperationContext *moc = cls;
   struct GNUNET_CRYPTO_EccPublicSignKey pubkey;
 
-  GNUNET_CRYPTO_ecc_key_get_public_for_signature (moc->pk,
-                                    &pubkey);
+  if (NULL == block)
+  {
+    merge_with_existing_records (moc, 0, NULL);
+    return;
+  }
+  GNUNET_CRYPTO_ecc_key_get_public_for_signature (&moc->pk,
+                                                  &pubkey);
   if (GNUNET_OK !=
       GNUNET_NAMESTORE_block_decrypt (block,
                                       &pubkey,
@@ -882,7 +866,6 @@ decrypt_block_for_merge (void *cls,
   {
     show_error_message (_("Failed to decode existing record in target zone"),
                         _("Failed to add new record."));
-    GNUNET_free (moc->pk);
     GNUNET_free (moc->data);
     free_edit_dialog_context (moc->edc);
     GNUNET_free (moc);
@@ -1008,37 +991,14 @@ edit_dialog_continuation (struct EditDialogContext *edc,
     }
     else
     {
-      char *keyfile;
-      struct GNUNET_CRYPTO_EccPrivateKey *pk;
+      const struct GNUNET_CRYPTO_EccPrivateKey *pk;
       struct MoveOperationContext *moc;
       struct GNUNET_HashCode query;
 
       /* determine target zone */
-      if ( (GNUNET_OK !=
-            GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                                     "gns",
-                                                     edc->new_zone_option,
-                                                     &keyfile)) ||
-           (NULL == keyfile) )
-      {
-        char *emsg;
-
-        GNUNET_asprintf (&emsg,
-                         _("Option `%s' missing in section `%s'\n"),
-                         edc->new_zone_option, "gns");
-        show_error_message (_("Failed to access key for target zone"),
-                            emsg);
-        GNUNET_free (emsg);
-        break;
-      }
-      pk = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
-      GNUNET_free (keyfile);
-      if (NULL == pk)
-      {
-        show_error_message (_("Failed to load private key for target zone"),
-                            NULL);
-        break;
-      }
+      GNUNET_assert (NULL != edc->ego);
+      pk = GNUNET_IDENTITY_ego_get_private_key (edc->ego);
+      GNUNET_assert (NULL != pk);
       GNUNET_NAMESTORE_query_from_private_key (pk,
                                                edc->name,
                                                &query);
@@ -1046,9 +1006,8 @@ edit_dialog_continuation (struct EditDialogContext *edc,
       moc->data = data;
       moc->rd = rd;
       moc->edc = edc;
-      moc->pk = pk;
+      moc->pk = *pk;
       GNUNET_CONTAINER_DLL_insert (moc_head, moc_tail, moc);
-
       moc->qe = GNUNET_NAMESTORE_lookup_block (namestore,
                                                &query,
                                                &decrypt_block_for_merge,
@@ -1437,7 +1396,7 @@ create_popup_menu ()
                 "Selected row is not a record row\n");
     return FALSE;
   }
-  popup  = GTK_MENU (get_object ("gnunet_namestore_edit_popup_menu"));
+  popup  = GTK_MENU (get_object ("gnunet_namestore_gtk_edit_popup_menu"));
   gtk_widget_show_all (GTK_WIDGET (popup));
   gtk_menu_popup (popup, NULL, NULL, NULL, NULL, 0, 0);
   return TRUE;
@@ -2098,7 +2057,6 @@ cleanup_task (void *cls,
                 _("A pending namestore operation was not transmitted to the namestore.\n"));
     GNUNET_CONTAINER_DLL_remove (moc_head, moc_tail, moc);
     GNUNET_NAMESTORE_cancel (moc->qe);
-    GNUNET_free (moc->pk);
     free_edit_dialog_context (moc->edc);
     GNUNET_free (moc->data);
     GNUNET_free (moc);