1 files changed, 14 insertions, 15 deletions

diff --git a/src/fs/gnunet-fs-gtk_advertise-pseudonym.c b/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
index 811551b8..388aa22b 100644
--- a/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
+++ b/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet
-     (C) 2005, 2006, 2010, 2012 Christian Grothoff (and other contributing authors)
+     (C) 2005-2013 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -59,7 +59,7 @@ struct NamespaceAdvertisementContext
   /**
    * Handle to the namespace to advertise.
    */
-  struct GNUNET_FS_Namespace *ns;
+  struct GNUNET_CRYPTO_EccPrivateKey ns;
 
   /**
    * Root of the namespace is stored here temporarily.
@@ -98,14 +98,14 @@ advertise_namespace (void *cls,
 {
   struct NamespaceAdvertisementContext *nds = cls;
   struct GNUNET_FS_Uri *sks_uri;
-  char *emsg;
+  struct GNUNET_CRYPTO_EccPublicKey pub;
 
-  emsg = NULL;
-  sks_uri = GNUNET_FS_uri_sks_create (nds->ns, nds->root, &emsg);
-  GNUNET_assert (NULL == emsg);
+  GNUNET_CRYPTO_ecc_key_get_public (&nds->ns, &pub);
+  sks_uri = GNUNET_FS_uri_sks_create (&pub, nds->root);
   GNUNET_FS_publish_ksk (GNUNET_FS_GTK_get_fs_handle (),
-      *uri, meta, sks_uri,
-      bo, GNUNET_FS_PUBLISH_OPTION_NONE, NULL, NULL);
+                         *uri, meta, sks_uri,
+                         bo, GNUNET_FS_PUBLISH_OPTION_NONE, 
+                         NULL, NULL);
   GNUNET_FS_uri_destroy (sks_uri);
   return GNUNET_SYSERR;
 }
@@ -132,29 +132,28 @@ adv_pseudonym_edit_publish_dialog_cb (gpointer cls,
     GNUNET_FS_file_information_inspect (nds->fip, &advertise_namespace, nds);
     nds->root = NULL;
   }
-  GNUNET_FS_namespace_delete (nds->ns, GNUNET_NO);
   GNUNET_FS_file_information_destroy (nds->fip, NULL, NULL);
   GNUNET_free (nds);
 }
 
 
-
 /**
  * Call the publication editor dialog in namespace advertising mode,
  * and publish the namespace when it's OK'ed.
  *
- * @param ns namespace to advertise (takes ownership of it)
+ * @param ns namespace to advertise
  * @param transient_for parent window for the dialog
  */
 void
-GNUNET_FS_GTK_advertise_namespace (struct GNUNET_FS_Namespace *ns, GtkWindow *transient_for)
+GNUNET_FS_GTK_advertise_namespace (const struct GNUNET_CRYPTO_EccPrivateKey *ns, 
+                                   GtkWindow *transient_for)
 {
   struct NamespaceAdvertisementContext *nds;
   struct GNUNET_FS_BlockOptions bo;
   struct GNUNET_CONTAINER_MetaData *meta;
 
-  nds = GNUNET_malloc (sizeof (struct NamespaceAdvertisementContext));
-  nds->ns = ns;
+  nds = GNUNET_new (struct NamespaceAdvertisementContext);
+  nds->ns = *ns;
   memset (&bo, 0, sizeof (struct GNUNET_FS_BlockOptions));
   bo.expiration_time = GNUNET_FS_year_to_time (GNUNET_FS_get_current_year () + 2);
   bo.anonymity_level = 1;