2 files changed, 14 insertions, 14 deletions

diff --git a/src/conversation/gnunet-conversation-gtk_egos.c b/src/conversation/gnunet-conversation-gtk_egos.c
index 91ed2de7..430eda40 100644
--- a/src/conversation/gnunet-conversation-gtk_egos.c
+++ b/src/conversation/gnunet-conversation-gtk_egos.c
@@ -171,19 +171,18 @@ gnunet_conversation_gtk_ego_copy_button_clicked_cb (GtkButton *button,
 {
   struct GNUNET_IDENTITY_Ego *ego;
   const gchar *label;
-  const struct GNUNET_IDENTITY_PrivateKey *priv;
   struct GNUNET_IDENTITY_PublicKey pub;
   const char *zkey;
   char *uri;
   GtkClipboard *cb;
 
   label = gtk_entry_get_text (GTK_ENTRY (
-    GCG_get_main_window_object ("gnunet_conversation_gtk_ego_label_entry")));
+                                GCG_get_main_window_object (
+                                  "gnunet_conversation_gtk_ego_label_entry")));
   GNUNET_break ((NULL != label) && (0 != strlen (label)));
   ego = GCG_EGOS_get_selected_ego ();
   GNUNET_break (NULL != ego);
-  priv = GNUNET_IDENTITY_ego_get_private_key (ego);
-  GNUNET_IDENTITY_ego_get_public_key (priv, &pub);
+  GNUNET_IDENTITY_ego_get_public_key (ego, &pub);
   zkey = GNUNET_GNSRECORD_pkey_to_zkey (&pub);
   GNUNET_asprintf (&uri, "gnunet://gns/%s.%s/", label, zkey);
   cb = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
@@ -227,4 +226,5 @@ GCG_EGOS_shutdown ()
   }
 }
 
+
 /* end of gnunet-conversation-gtk_egos.c */
diff --git a/src/conversation/gnunet-conversation-gtk_import.c b/src/conversation/gnunet-conversation-gtk_import.c
index 002a1f71..cc16d386 100644
--- a/src/conversation/gnunet-conversation-gtk_import.c
+++ b/src/conversation/gnunet-conversation-gtk_import.c
@@ -99,9 +99,9 @@ static int private_record;
  * operation.
  *
  * @param cls NULL
- * @param success #GNUNET_SYSERR on failure (including timeout/queue drop/failure to validate)
- *                #GNUNET_NO if content was already there
- *                #GNUNET_YES (or other positive value) on success
+ * @param success #GNUNET_SYSERR on failure (including timeout/queue
+ * drop/failure to validate) #GNUNET_NO if content was already there #GNUNET_YES
+ * (or other positive value) on success
  * @param emsg NULL on success, otherwise an error message
  */
 static void
@@ -195,9 +195,9 @@ GSC_add_contact (const gchar *name, const gchar *address)
  * add operation.  Finish 'add phone' operation.
  *
  * @param cls closure
- * @param success #GNUNET_SYSERR on failure (including timeout/queue drop/failure to validate)
- *                #GNUNET_NO if content was already there or not found
- *                #GNUNET_YES (or other positive value) on success
+ * @param success #GNUNET_SYSERR on failure (including timeout/queue
+ * drop/failure to validate) #GNUNET_NO if content was already there or not
+ * found #GNUNET_YES (or other positive value) on success
  * @param emsg NULL on success, otherwise an error message
  */
 static void
@@ -344,7 +344,7 @@ finish_shutdown ()
   GNUNET_SCHEDULER_add_now (&async_disconnect, NULL);
   GNUNET_free (my_rd_data);
   memset (&my_rd, 0, sizeof (my_rd));
-  GNUNET_CRYPTO_ecdsa_key_clear (&zone_pkey);
+  memset (&zone_pkey, 0, sizeof (zone_pkey));
 }
 
 
@@ -354,9 +354,9 @@ finish_shutdown ()
  * with 'add phone' operation if one is pending.
  *
  * @param cls closure
- * @param success #GNUNET_SYSERR on failure (including timeout/queue drop/failure to validate)
- *                #GNUNET_NO if content was already there or not found
- *                #GNUNET_YES (or other positive value) on success
+ * @param success #GNUNET_SYSERR on failure (including timeout/queue
+ * drop/failure to validate) #GNUNET_NO if content was already there or not
+ * found #GNUNET_YES (or other positive value) on success
  * @param emsg NULL on success, otherwise an error message
  */
 static void