-fix build with new fs/namespace/ecc/identity APIs

16 files changed, 192 insertions, 124 deletions

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 82907723..2d7f0be2 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -28,11 +28,9 @@ pkgdata_DATA = \
   green.png \
   searching_sources.gif \
   gnunet_fs_gtk_about_window.glade \
-  gnunet_fs_gtk_create_namespace_dialog.glade \
   gnunet_fs_gtk_download_as_dialog.glade \
   gnunet_fs_gtk_main_window.glade \
   gnunet_fs_gtk_namespace_manager.glade \
-  gnunet_fs_gtk_namespace_organizer.glade \
   gnunet_fs_gtk_edit_publication.glade \
   gnunet_fs_gtk_open_directory_dialog.glade \
   gnunet_fs_gtk_open_url_dialog.glade \
@@ -45,6 +43,8 @@ pkgdata_DATA = \
   gnunet_fs_gtk_unindex.glade \
   gnunet_fs_gtk_progress_dialog.glade \
   gnunet_gtk_status_bar_menu.glade \
+  gnunet_identity_gtk_create_ego_dialog.glade \
+  gnunet_identity_gtk_organizer_ego_dialog.glade \
   gnunet_peerinfo_gtk_about_window.glade \
   gnunet_peerinfo_gtk_main_window.glade \
   gnunet_statistics_gtk_about_window.glade \
diff --git a/contrib/gnunet_fs_gtk_create_namespace_dialog.glade b/contrib/gnunet_identity_gtk_create_ego_dialog.glade
index 812411c6..812411c6 100644
--- a/contrib/gnunet_fs_gtk_create_namespace_dialog.glade
+++ b/contrib/gnunet_identity_gtk_create_ego_dialog.glade
diff --git a/contrib/gnunet_fs_gtk_namespace_organizer.glade b/contrib/gnunet_identity_gtk_organize_ego_dialog.glade
index 0e4b112c..0e4b112c 100644
--- a/contrib/gnunet_fs_gtk_namespace_organizer.glade
+++ b/contrib/gnunet_identity_gtk_organize_ego_dialog.glade
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index cd4673b6..39c8d98e 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -17,7 +17,6 @@ gnunet_fs_gtk_SOURCES = \
   gnunet-fs-gtk_advertise-pseudonym.h \
   gnunet-fs-gtk_anonymity-widgets.c gnunet-fs-gtk_anonymity-widgets.h \
   gnunet-fs-gtk_common.c gnunet-fs-gtk_common.h \
-  gnunet-fs-gtk_create-pseudonym.c \
   gnunet-fs-gtk_download-save-as.c gnunet-fs-gtk_download-save-as.h \
   gnunet-fs-gtk_event-handler.c gnunet-fs-gtk_event-handler.h \
   gnunet-fs-gtk_main-window-connection.c \
@@ -30,8 +29,6 @@ gnunet_fs_gtk_SOURCES = \
   gnunet-fs-gtk_unindex.c gnunet-fs-gtk_unindex.h \
   gnunet-fs-gtk_publish-dialog.c \
   gnunet-fs-gtk_publish-edit-dialog.c gnunet-fs-gtk_publish-edit-dialog.h \
-  gnunet-fs-gtk_namespace_organizer.c \
-  gnunet-fs-gtk_namespace_organizer.h \
   gnunet-fs-gtk_namespace_manager.c \
   gnunet-fs-gtk_namespace_manager.h
 
@@ -43,6 +40,7 @@ gnunet_fs_gtk_LDADD = \
   -lgnunetutil \
   -lgnunetarm \
   -lgnunetfs \
+  -lgnunetidentity \
   $(INTLLIBS) 
 gnunet_fs_gtk_LDFLAGS = \
   -export-dynamic 
diff --git a/src/fs/gnunet-fs-gtk.h b/src/fs/gnunet-fs-gtk.h
index c19e07b8..abf1844e 100644
--- a/src/fs/gnunet-fs-gtk.h
+++ b/src/fs/gnunet-fs-gtk.h
@@ -55,7 +55,7 @@ struct GNUNET_GTK_MainWindowContext
 
   GtkTreeRowReference *ns_selector_pushed_row;
   GtkTreeRowReference *selected_ns_row;
-  struct GNUNET_FS_pseudonym_DiscoveryHandle *ns_discovery_handle;
+  struct GNUNET_FS_Pseudonym_DiscoveryHandle *ns_discovery_handle;
   GtkWindow *ns_manager;
   gulong ns_manager_delete_handler_id;
 
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;
diff --git a/src/fs/gnunet-fs-gtk_advertise-pseudonym.h b/src/fs/gnunet-fs-gtk_advertise-pseudonym.h
index c5c53de7..4002401e 100644
--- a/src/fs/gnunet-fs-gtk_advertise-pseudonym.h
+++ b/src/fs/gnunet-fs-gtk_advertise-pseudonym.h
@@ -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
@@ -17,27 +17,27 @@
      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
      Boston, MA 02111-1307, USA.
 */
-
-#ifndef GNUNET_FS_GTK_ADVERTISE_PSEUDONYM_H
-#define GNUNET_FS_GTK_ADVERTISE_PSEUDONYM_H
-
 /**
  * @file src/fs/gnunet-fs-gtk_advertise-pseudonym.h
  * @author Christian Grothoff
  * @brief run the advertising dialog (using the edit-publish 
  *        dialog functions) and finally do the advertising
  */
+#ifndef GNUNET_FS_GTK_ADVERTISE_PSEUDONYM_H
+#define GNUNET_FS_GTK_ADVERTISE_PSEUDONYM_H
+
 #include "gnunet-fs-gtk_common.h"
 
 /**
  * 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);
 
 #endif
 
diff --git a/src/fs/gnunet-fs-gtk_common.c b/src/fs/gnunet-fs-gtk_common.c
index bf118cad..f4be95d3 100644
--- a/src/fs/gnunet-fs-gtk_common.c
+++ b/src/fs/gnunet-fs-gtk_common.c
@@ -322,14 +322,14 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri,
   GtkLabel *sel_namespace_label;
   GtkTreePath *treepath;
   GtkEntry *query_entry;
-  struct GNUNET_FS_PseudonymIdentifier *nsid;
-  struct GNUNET_FS_PseudonymIdentifier want;
+  struct GNUNET_CRYPTO_EccPublicKey *nsid;
+  struct GNUNET_CRYPTO_EccPublicKey want;
   
   if (GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri))
   {
     struct DownloadEntry *de;
 
-    de = GNUNET_malloc (sizeof (struct DownloadEntry));
+    de = GNUNET_new (struct DownloadEntry);
     de->anonymity = anonymity_level;
     de->uri = GNUNET_FS_uri_dup (uri);
     GNUNET_FS_GTK_open_download_as_dialog (de);
@@ -366,7 +366,7 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri,
     while ( ( (NULL == nsid) ||
               (0 != memcmp (nsid,
                             &want,
-                            sizeof (struct GNUNET_FS_PseudonymIdentifier))) ) &&
+                            sizeof (struct GNUNET_CRYPTO_EccPublicKey))) ) &&
             (gtk_tree_model_iter_next (namespace_treestore, &iter)) )
       gtk_tree_model_get (namespace_treestore, &iter,
                           GNUNET_GTK_FS_MAIN_WINDOW_SEARCH_NAMESPACE_MC_KEY,
@@ -375,7 +375,7 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri,
     if ( (NULL == nsid) ||
          (0 != memcmp (nsid,
                        &want,
-                       sizeof (struct GNUNET_FS_PseudonymIdentifier))) )
+                       sizeof (struct GNUNET_CRYPTO_EccPublicKey))) )
     {
       /* namespace unknown / not in list!? */
       GNUNET_break (0);
@@ -448,16 +448,20 @@ static int largest_namespace_rating = INT_MIN;
  */
 static int
 find_largest_namespace_rating_iterator (void *cls,
-    const struct GNUNET_FS_PseudonymIdentifier *pseudonym, const char *name,
-    const char *unique_name,
-    const struct GNUNET_CONTAINER_MetaData *md, int32_t rating)
+                                        const struct GNUNET_CRYPTO_EccPublicKey *pseudonym, 
+                                        const char *name,
+                                        const char *unique_name,
+                                        const struct GNUNET_CONTAINER_MetaData *md, 
+                                        int32_t rating)
 {
   int *largest = cls;
+
   if (*largest < rating)
     *largest = rating;
   return GNUNET_OK;
 }
 
+
 /**
  * Finds largest namespace rating.
  * Used to calculate a rating for newly discovered namespaces.
@@ -472,10 +476,12 @@ GNUNET_GTK_find_largest_namespace_rating ()
   if (largest_namespace_rating != INT_MIN)
     return largest_namespace_rating;
   (void) GNUNET_FS_pseudonym_list_all (GNUNET_FS_GTK_get_configuration (),
-      find_largest_namespace_rating_iterator, &largest_namespace_rating);
+                                       &find_largest_namespace_rating_iterator, 
+                                       &largest_namespace_rating);
   return largest_namespace_rating;
 }
 
+
 /**
  * Sets largest namespace rating.
  * Used to change cached largest namespace rating, when namespace list
@@ -491,6 +497,7 @@ GNUNET_GTK_set_largest_namespace_rating (int new_value)
   largest_namespace_rating = new_value;
 }
 
+
 /**
  * Converts a GtkTreeRowReference to a GtkTreeIter.
  *
diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index 24833481..bbe7772d 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
-     (C) 2010, 2011, 2012 Christian Grothoff (and other contributing authors)
+     (C) 2010-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
@@ -968,13 +968,21 @@ copy_search_uri_to_clipboard_ctx_menu (GtkMenuItem *item, gpointer user_data)
   GNUNET_free (uris);
 }
 
-/* Called for each embedded sks. Return GNUNET_OK to continue iteration */
-typedef int (*embedded_sks_callback) (void *cls, const struct GNUNET_FS_Uri *sks_uri,
-    const char *sks_uri_string, struct GNUNET_FS_PseudonymIdentifier *nsid);
+
+/**
+ * Called for each embedded sks. 
+ *
+ * @return GNUNET_OK to continue iteration
+ */
+typedef int (*EmbeddedSksCallback) (void *cls, 
+                                      const struct GNUNET_FS_Uri *sks_uri,
+                                      const char *sks_uri_string,
+                                      const struct GNUNET_CRYPTO_EccPublicKey *nsid);
+
 
 struct sks_scanner_callback_context
 {
-  embedded_sks_callback cb;
+  EmbeddedSksCallback cb;
   void *cls;
 };
 
@@ -1014,7 +1022,8 @@ check_for_embedded_sks (void *cls,
         char *id = GNUNET_FS_uri_sks_get_content_id (sks_uri);
         if (NULL != id)
         {
-          struct GNUNET_FS_PseudonymIdentifier nsid;
+          struct GNUNET_CRYPTO_EccPublicKey nsid;
+
           if ((0 == strcmp (id, "/")) &&
               (GNUNET_OK == GNUNET_FS_uri_sks_get_namespace (sks_uri, &nsid)))
             result = ctx->cb (ctx->cls, sks_uri, data, &nsid);
@@ -1034,7 +1043,7 @@ check_for_embedded_sks (void *cls,
  */
 static void
 find_embedded_sks (const struct GNUNET_CONTAINER_MetaData *meta, 
-                   embedded_sks_callback cb, void *cls)
+                   EmbeddedSksCallback cb, void *cls)
 {
   struct sks_scanner_callback_context ctx;
 
@@ -1045,21 +1054,25 @@ find_embedded_sks (const struct GNUNET_CONTAINER_MetaData *meta,
 }
 
 
-struct sks_population_context
+struct SksPopulationContext
 {
   GtkMenu *menu;
   int counter;
   uintptr_t anonymity_level;
 };
 
-/* Called for every SKS URI in metadata. Adds up to 3 menu items
+
+/**
+ * Called for every SKS URI in metadata. Adds up to 3 menu items
  * that will initiate downloads for these SKS URIs
  */
 static int
-populate_popup_with_sks_items (void *cls, const struct GNUNET_FS_Uri *sks_uri,
-    const char *sks_uri_string, struct GNUNET_FS_PseudonymIdentifier *nsid)
+populate_popup_with_sks_items (void *cls,
+                               const struct GNUNET_FS_Uri *sks_uri,
+                               const char *sks_uri_string, 
+                               const struct GNUNET_CRYPTO_EccPublicKey *nsid)
 {
-  struct sks_population_context *ctx = cls;
+  struct SksPopulationContext *ctx = cls;
   GtkWidget *child;
   char *label;
   GtkWidget *ns_association_icon;
@@ -1084,6 +1097,7 @@ populate_popup_with_sks_items (void *cls, const struct GNUNET_FS_Uri *sks_uri,
   return (ctx->counter < 4) ? GNUNET_OK : GNUNET_SYSERR;
 }
 
+
 /**
  * Context menu was requested for a search result list.
  * Compute which menu items are applicable and display
@@ -1110,9 +1124,9 @@ search_list_popup (GtkTreeModel *tm,
   struct SearchListPopupContext *spc;
   struct GNUNET_CONTAINER_MetaData *meta;
   int is_directory = GNUNET_NO;
-  struct sks_population_context sks_pop_ctx;
+  struct SksPopulationContext sks_pop_ctx;
 
-  spc = GNUNET_malloc (sizeof (struct SearchListPopupContext));
+  spc = GNUNET_new (struct SearchListPopupContext);
   spc->tab = tab;
   path = gtk_tree_model_get_path (tm, iter);
   spc->rr = gtk_tree_row_reference_new (tm, path);
@@ -2166,7 +2180,7 @@ static int
 see_if_there_are_any_sks_uris (void *cls,
                                const struct GNUNET_FS_Uri *sks_uri,
                                const char *sks_uri_string, 
-                               struct GNUNET_FS_PseudonymIdentifier *nsid)
+                               const struct GNUNET_CRYPTO_EccPublicKey *nsid)
 {
   gboolean *gb = cls;
 
diff --git a/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c b/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
index 6e67db94..7e2df958 100644
--- a/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
+++ b/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
@@ -4,7 +4,7 @@
 
      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
@@ -292,14 +292,17 @@ GNUNET_FS_GTK_search_namespace_dropdown_button_toggled_cb (GtkToggleButton *
  * @return GNUNET_OK to continue iteration, GNUNET_SYSERR to abort
  */
 static int
-add_namespace_to_ts (void *cls, const struct GNUNET_FS_PseudonymIdentifier *pseudonym,
-                     const char *name, const char *unique_name,
-                     const struct GNUNET_CONTAINER_MetaData *md, int rating)
+add_namespace_to_ts (void *cls, 
+                     const struct GNUNET_CRYPTO_EccPublicKey *pseudonym,
+                     const char *name, 
+                     const char *unique_name,
+                     const struct GNUNET_CONTAINER_MetaData *md, 
+                     int rating)
 {
   GtkTreeStore *ts = cls;
   char *root;
   char *ns_name, *unique_ns_name;
-  struct GNUNET_FS_PseudonymIdentifier *nsid;
+  struct GNUNET_CRYPTO_EccPublicKey *nsid;
   char *description;
   int desc_is_a_dup;
   char *uris;
@@ -311,11 +314,12 @@ add_namespace_to_ts (void *cls, const struct GNUNET_FS_PseudonymIdentifier *pseu
     return GNUNET_OK;
 
   GNUNET_FS_pseudonym_get_info (GNUNET_FS_GTK_get_configuration (),
-                             pseudonym, NULL, NULL, &ns_name, NULL);
+                                pseudonym, NULL, NULL, 
+                                &ns_name, NULL);
   unique_ns_name = GNUNET_FS_pseudonym_name_uniquify (
       GNUNET_FS_GTK_get_configuration (), pseudonym, ns_name, NULL);
   GNUNET_free (ns_name);
-  nsid = GNUNET_malloc (sizeof (struct GNUNET_FS_PseudonymIdentifier));
+  nsid = GNUNET_new (struct GNUNET_CRYPTO_EccPublicKey);
   *nsid = *pseudonym;
   root = NULL;
   uris = GNUNET_CONTAINER_meta_data_get_by_type (md, EXTRACTOR_METATYPE_URI);
@@ -345,12 +349,14 @@ add_namespace_to_ts (void *cls, const struct GNUNET_FS_PseudonymIdentifier *pseu
   return GNUNET_OK;
 }
 
+
 void
 GNUNET_GTK_main_window_refresh_ns_list (struct GNUNET_GTK_MainWindowContext *main_ctx)
 {
   GtkTreeIter iter;
   GtkTreePath *treepath;
-  struct GNUNET_FS_PseudonymIdentifier *key = NULL, *selected_ns_id;
+  struct GNUNET_CRYPTO_EccPublicKey *key = NULL;
+  struct GNUNET_CRYPTO_EccPublicKey *selected_ns_id;
 
   gboolean found = FALSE;
   gchar *value = NULL;
@@ -375,10 +381,10 @@ GNUNET_GTK_main_window_refresh_ns_list (struct GNUNET_GTK_MainWindowContext *mai
     main_ctx->selected_ns_row = NULL;
   }
   selected_ns_id = NULL;
-  if (key != NULL)
+  if (NULL != key)
   {
-    selected_ns_id = GNUNET_malloc (sizeof (struct GNUNET_FS_PseudonymIdentifier));
-    memcpy (selected_ns_id, key, sizeof (struct GNUNET_FS_PseudonymIdentifier));
+    selected_ns_id = GNUNET_new (struct GNUNET_CRYPTO_EccPublicKey);
+    *selected_ns_id = *key;
   }
 
   if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
@@ -427,7 +433,7 @@ GNUNET_GTK_main_window_refresh_ns_list (struct GNUNET_GTK_MainWindowContext *mai
                           -1);
       if (selected_ns_id == NULL)
         found = TRUE;
-      else if (key != NULL && memcmp (key, selected_ns_id, sizeof (struct GNUNET_FS_PseudonymIdentifier)) == 0)
+      else if (key != NULL && memcmp (key, selected_ns_id, sizeof (struct GNUNET_CRYPTO_EccPublicKey)) == 0)
         found = TRUE;
       if (found || (TRUE != gtk_tree_model_iter_next (GTK_TREE_MODEL (
         main_ctx->search_ns_treestore), &iter)))
diff --git a/src/fs/gnunet-fs-gtk_main-window-search.c b/src/fs/gnunet-fs-gtk_main-window-search.c
index e49e84b2..6b621a1a 100644
--- a/src/fs/gnunet-fs-gtk_main-window-search.c
+++ b/src/fs/gnunet-fs-gtk_main-window-search.c
@@ -39,7 +39,7 @@ start_search (struct GNUNET_GTK_MainWindowContext *main_ctx)
   guint anonymity_level;
   gchar *keywords;
   gchar *mime_keyword;
-  struct GNUNET_FS_PseudonymIdentifier *nsid;
+  struct GNUNET_CRYPTO_EccPublicKey *nsid;
   struct GNUNET_FS_Uri *uri;
 
   /* get anonymity level */
@@ -118,7 +118,7 @@ start_search (struct GNUNET_GTK_MainWindowContext *main_ctx)
   /* build KSK/SKS URI */
   if (NULL != nsid)
   {
-    uri = GNUNET_FS_uri_sks_create_from_nsid (nsid, keywords);
+    uri = GNUNET_FS_uri_sks_create (nsid, keywords);
     GNUNET_assert (uri != NULL);
   }
   else
diff --git a/src/fs/gnunet-fs-gtk_namespace_manager.c b/src/fs/gnunet-fs-gtk_namespace_manager.c
index 1e5ca9f1..ca4a14c5 100644
--- a/src/fs/gnunet-fs-gtk_namespace_manager.c
+++ b/src/fs/gnunet-fs-gtk_namespace_manager.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
@@ -73,6 +73,7 @@ struct GNUNET_GTK_NamespaceManagerContext
 #define GNUNET_GTK_NAMESPACE_DETAILS_DATA_MIME_COLUMN 4
 #define GNUNET_GTK_NAMESPACE_DETAILS_VALUE_COLUMN 5
 
+
 static void
 sort_order_list (struct GNUNET_GTK_NamespaceManagerContext *ctx,
     int sort_column)
@@ -175,6 +176,7 @@ sort_order_list (struct GNUNET_GTK_NamespaceManagerContext *ctx,
   g_free (row_ints);
 }
 
+
 void
 GNUNET_GTK_namespace_manager_namespace_order_column_clicked_cb (
     GtkTreeViewColumn *treeviewcolumn, gpointer user_data)
@@ -194,6 +196,7 @@ GNUNET_GTK_namespace_manager_namespace_order_column_clicked_cb (
   }
 }
 
+
 void
 GNUNET_GTK_namespace_manager_known_namespaces_delete_button_clicked_cb (
     GtkButton *button, gpointer user_data)
@@ -241,13 +244,14 @@ GNUNET_GTK_namespace_manager_known_namespaces_delete_button_clicked_cb (
   ctx->uneditable_md = NULL;
 }
 
+
 void
 GNUNET_GTK_namespace_manager_known_namespaces_swap_rank_button_clicked_cb (
     GtkButton *button, gpointer user_data)
 {
   struct GNUNET_GTK_NamespaceManagerContext *ctx = user_data;
   GtkTreeIter known_iter, order_iter;
-  struct GNUNET_FS_PseudonymIdentifier *nsid;
+  struct GNUNET_CRYPTO_EccPublicKey *nsid;
   int32_t old_rank, new_rank;
   GtkTreeRowReference *order_row, *known_row;
 
@@ -315,6 +319,7 @@ GNUNET_GTK_namespace_manager_known_namespaces_swap_rank_button_clicked_cb (
   }
 }
 
+
 void
 GNUNET_GTK_namespace_manager_namespace_order_apply_clicked_cb (
     GtkButton *button, gpointer user_data)
@@ -358,6 +363,7 @@ GNUNET_GTK_namespace_manager_namespace_order_apply_clicked_cb (
   }
 }
 
+
 void
 GNUNET_GTK_namespace_manager_namespace_details_add_button_clicked_cb (
     GtkButton *button, gpointer user_data)
@@ -367,6 +373,7 @@ GNUNET_GTK_namespace_manager_namespace_details_add_button_clicked_cb (
    */
 }
 
+
 void
 GNUNET_GTK_namespace_manager_namespace_details_delete_button_clicked_cb (
     GtkButton *button, gpointer user_data)
@@ -381,6 +388,7 @@ GNUNET_GTK_namespace_manager_namespace_details_delete_button_clicked_cb (
   gtk_widget_set_sensitive (ctx->details_apply_button, TRUE);
 }
 
+
 void
 GNUNET_GTK_namespace_manager_namespace_details_apply_button_clicked_cb (
     GtkButton *button, gpointer user_data)
@@ -448,6 +456,7 @@ GNUNET_GTK_namespace_manager_namespace_details_apply_button_clicked_cb (
   gtk_widget_set_sensitive (ctx->details_apply_button, FALSE);
 }
 
+
 void
 GNUNET_GTK_namespace_manager_name_text_editing_started_cb (
     GtkCellRenderer *renderer, GtkCellEditable *editable, gchar *path,
@@ -484,6 +493,7 @@ GNUNET_GTK_namespace_manager_name_text_editing_started_cb (
   }
 }
 
+
 void
 GNUNET_GTK_namespace_manager_name_text_edited_cb (
     GtkCellRendererText *renderer, gchar *path, gchar *new_text,
@@ -504,7 +514,7 @@ GNUNET_GTK_namespace_manager_name_text_edited_cb (
     if (gtk_tree_model_get_iter (GTK_TREE_MODEL (ctx->known_ns_store),
         &iter, tree_path))
     {
-      struct GNUNET_FS_PseudonymIdentifier *nsid;
+      struct GNUNET_CRYPTO_EccPublicKey *nsid;
       gtk_tree_model_get (GTK_TREE_MODEL (ctx->known_ns_store), &iter,
           GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, &nsid,
           GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN, &order_row,
@@ -535,6 +545,7 @@ GNUNET_GTK_namespace_manager_name_text_edited_cb (
   }
 }
 
+
 void
 GNUNET_GTK_namespace_manager_namespace_details_type_text_edited_cb (
     GtkCellRendererText *renderer, gchar *path, gchar *new_text,
@@ -557,6 +568,7 @@ GNUNET_GTK_namespace_manager_namespace_details_type_text_edited_cb (
   */
 }
 
+
 void
 GNUNET_GTK_namespace_manager_namespace_details_value_text_edited_cb (
     GtkCellRendererText *renderer, gchar *path, gchar *new_text,
@@ -588,6 +600,7 @@ GNUNET_GTK_namespace_manager_namespace_details_value_text_edited_cb (
   }
 }
 
+
 /**
  * Iterator over all known pseudonyms.
  * Populate "known ns" and "ns order" lists.
@@ -599,23 +612,25 @@ GNUNET_GTK_namespace_manager_namespace_details_value_text_edited_cb (
  * @return GNUNET_OK to continue iteration, GNUNET_SYSERR to abort
  */
 static int
-populate_known_ns_list (void *cls, const struct GNUNET_FS_PseudonymIdentifier *pseudonym,
-    const char *name, const char *unique_name,
-    const struct GNUNET_CONTAINER_MetaData *md, int rating)
+populate_known_ns_list (void *cls, 
+                        const struct GNUNET_CRYPTO_EccPublicKey *pseudonym,
+                        const char *name, const char *unique_name,
+                        const struct GNUNET_CONTAINER_MetaData *md, 
+                        int rating)
 {
   struct GNUNET_GTK_NamespaceManagerContext *ctx = cls;
-  struct GNUNET_FS_PseudonymIdentifier *nsid;
+  struct GNUNET_CRYPTO_EccPublicKey *nsid;
   char buf[1024];
   char *ret;
   GtkTreeIter known_iter, order_iter;
   struct GNUNET_CONTAINER_MetaData *md_copy;
   char *non_null_name, *non_null_unique_name;
 
-  nsid = GNUNET_malloc (sizeof (struct GNUNET_FS_PseudonymIdentifier));
+  nsid = GNUNET_new (struct GNUNET_CRYPTO_EccPublicKey);
   *nsid = *pseudonym;
 
   ret = GNUNET_STRINGS_data_to_string (nsid,
-                                       sizeof (struct GNUNET_FS_PseudonymIdentifier),
+                                       sizeof (struct GNUNET_CRYPTO_EccPublicKey),
                                        buf,
                                        sizeof (buf));
   GNUNET_assert (NULL != ret);
@@ -661,13 +676,14 @@ populate_known_ns_list (void *cls, const struct GNUNET_FS_PseudonymIdentifier *p
   return GNUNET_OK;
 }
 
+
 static void
 apply_known_ns_changes (struct GNUNET_GTK_NamespaceManagerContext *ctx)
 {
   GtkTreeIter iter;
   gint i;
   gint row_count;
-  struct GNUNET_FS_PseudonymIdentifier *nsid;
+  struct GNUNET_CRYPTO_EccPublicKey *nsid;
   char *name;
   int32_t rank;
   struct GNUNET_CONTAINER_MetaData *md;
@@ -693,6 +709,7 @@ apply_known_ns_changes (struct GNUNET_GTK_NamespaceManagerContext *ctx)
       ctx->known_ns_store), &iter))
       break;
   }
+#if FIXME_NAMESPACE_REMOVAL
   while (NULL != ctx->deleted_namespaces)
   {
     nsid = ctx->deleted_namespaces->data;
@@ -701,18 +718,19 @@ apply_known_ns_changes (struct GNUNET_GTK_NamespaceManagerContext *ctx)
       GNUNET_FS_pseudonym_remove (GNUNET_FS_GTK_get_configuration (), nsid);
       GNUNET_free (nsid);
     }
-
     ctx->deleted_namespaces = g_list_delete_link (ctx->deleted_namespaces, ctx->deleted_namespaces);
   }
+#endif
 }
 
+
 static void
 free_lists_contents (struct GNUNET_GTK_NamespaceManagerContext *ctx)
 {
   GtkTreeIter iter;
   gint i;
   gint row_count;
-  struct GNUNET_FS_PseudonymIdentifier *nsid;
+  struct GNUNET_CRYPTO_EccPublicKey *nsid;
   GtkTreeRowReference *order_row;
   struct GNUNET_CONTAINER_MetaData *md;
 
@@ -763,6 +781,7 @@ free_lists_contents (struct GNUNET_GTK_NamespaceManagerContext *ctx)
     GNUNET_CONTAINER_meta_data_destroy (ctx->uneditable_md);
 }
 
+
 void
 GNUNET_GTK_namespace_manager_dialog_response_cb (GtkDialog *dialog,
     gint response_id, gpointer user_data)
@@ -796,13 +815,13 @@ static gboolean
 mark_as_mine (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
     gpointer data)
 {
-  const struct GNUNET_FS_PseudonymIdentifier *mine_id = data;
-  const struct GNUNET_FS_PseudonymIdentifier *ns_id;
+  const struct GNUNET_CRYPTO_EccPublicKey *mine_id = data;
+  const struct GNUNET_CRYPTO_EccPublicKey *ns_id;
 
   gtk_tree_model_get (model, iter,
       GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN, &ns_id, -1);
 
-  if (memcmp (ns_id, mine_id, sizeof (struct GNUNET_FS_PseudonymIdentifier)) != 0)
+  if (memcmp (ns_id, mine_id, sizeof (struct GNUNET_CRYPTO_EccPublicKey)) != 0)
     return FALSE;
 
   gtk_list_store_set (GTK_LIST_STORE (model), iter,
@@ -810,6 +829,7 @@ mark_as_mine (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
   return TRUE;
 }
 
+
 /**
  * Callback with information about local (!) namespaces.
  * Contains the names of the local namespace and the global
@@ -821,7 +841,7 @@ mark_as_mine (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
  */
 static void
 mark_namespaces_as_mine (void *cls, const char *name,
-    const struct GNUNET_FS_PseudonymIdentifier *id)
+                         const struct GNUNET_CRYPTO_EccPublicKey *id)
 {
   struct GNUNET_GTK_NamespaceManagerContext *ctx = cls;
 
@@ -829,6 +849,7 @@ mark_namespaces_as_mine (void *cls, const char *name,
       (gpointer) id);
 }
 
+
 /**
  * Type of a function that libextractor calls for each
  * meta data item found.
@@ -881,6 +902,7 @@ populate_details_list (void *cls, const char *plugin_name,
   return 0;
 }
 
+
 static void
 ns_details_selection_changed (GtkTreeSelection *treeselection,
     gpointer user_data)
@@ -897,6 +919,7 @@ ns_details_selection_changed (GtkTreeSelection *treeselection,
   gtk_widget_set_sensitive (ctx->details_delete_button, TRUE);
 }
 
+
 static void
 known_ns_selection_changed (GtkTreeSelection *treeselection,
     gpointer user_data)
@@ -925,12 +948,13 @@ known_ns_selection_changed (GtkTreeSelection *treeselection,
   gtk_widget_set_sensitive (ctx->details_apply_button, FALSE);
 }
 
+
 GtkWindow *
 GNUNET_GTK_namespace_manager_open (struct GNUNET_GTK_MainWindowContext *main_ctx)
 {
   struct GNUNET_GTK_NamespaceManagerContext *ctx;
 
-  ctx = GNUNET_malloc (sizeof (struct GNUNET_GTK_NamespaceManagerContext));
+  ctx = GNUNET_new (struct GNUNET_GTK_NamespaceManagerContext);
   ctx->builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_namespace_manager.glade", ctx);
   if (ctx->builder == NULL)
   {
@@ -980,9 +1004,11 @@ GNUNET_GTK_namespace_manager_open (struct GNUNET_GTK_MainWindowContext *main_ctx
   (void) GNUNET_FS_pseudonym_list_all (GNUNET_FS_GTK_get_configuration (),
       populate_known_ns_list, ctx);
 
+#if FIXME_USE_IDENTITY_SERVICE
   /* mark our own namespaces as such */
   GNUNET_FS_namespace_list (GNUNET_FS_GTK_get_fs_handle (),
-      mark_namespaces_as_mine, ctx);
+                            &mark_namespaces_as_mine, ctx);
+#endif
 
   /* sort namespace order list by rank (initially) */
   sort_order_list (ctx, GNUNET_GTK_NAMESPACE_ORDER_RANK_COLUMN);
@@ -994,7 +1020,8 @@ GNUNET_GTK_namespace_manager_open (struct GNUNET_GTK_MainWindowContext *main_ctx
   return ctx->namespace_manager;
 }
 
-void
+
+static void
 ns_manager_deleted (GtkWindow *object, gpointer user_data)
 {
   struct GNUNET_GTK_MainWindowContext *ctx = user_data;
@@ -1005,6 +1032,7 @@ ns_manager_deleted (GtkWindow *object, gpointer user_data)
   return;
 }
 
+
 void
 GNUNET_GTK_open_ns_manager (struct GNUNET_GTK_MainWindowContext *ctx)
 {
@@ -1022,6 +1050,7 @@ GNUNET_GTK_open_ns_manager (struct GNUNET_GTK_MainWindowContext *ctx)
   ctx->ns_manager_delete_handler_id = g_signal_connect (G_OBJECT (ctx->ns_manager), "destroy", G_CALLBACK (ns_manager_deleted), ctx);
 }
 
+
 void
 GNUNET_GTK_main_menu_file_manage_pseudonyms_activate_cb (GtkMenuItem *menuitem,
     gpointer user_data)
@@ -1029,6 +1058,7 @@ GNUNET_GTK_main_menu_file_manage_pseudonyms_activate_cb (GtkMenuItem *menuitem,
   GNUNET_GTK_open_ns_manager (user_data);
 }
 
+
 void
 namespace_selector_manage_namespaces_button_clicked_cb (GtkButton *button, gpointer user_data)
 {
diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index 14a855ea..975db8c0 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.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
@@ -27,6 +27,8 @@
 #include "gnunet-fs-gtk_publish-edit-dialog.h"
 #include <gnunet/gnunet_util_lib.h>
 #include <gnunet/gnunet_fs_service.h>
+#include <gnunet/gnunet_identity_service.h>
+
 
 #define MARKER_DIR_FILE_SIZE "-"
 
@@ -246,7 +248,7 @@ struct MainPublishingDialogContext
   /**
    * Default namespace. May be NULL.
    */
-  struct GNUNET_FS_Namespace *ns;
+  struct GNUNET_IDENTITY_Ego *ns;
 
   /**
    * Stores the value that was in identifier_entry previously.
@@ -390,13 +392,13 @@ struct AddDirClientContext
 };
 
 
-static void clear_keywords_from_tm (struct MainPublishingDialogContext *ctx);
+static void 
+clear_keywords_from_tm (struct MainPublishingDialogContext *ctx);
 
 
 /* ************************ editing operations inside the master dialog ********************* */
 
 
-
 /**
  * Check if two GtkTreeIters refer to the same element.
  *
@@ -406,9 +408,9 @@ static void clear_keywords_from_tm (struct MainPublishingDialogContext *ctx);
  * @return GNUNET_YES if they are equal
  */
 static int
-gtk_tree_iter_equals (GtkTreeModel * tm,
-                      GtkTreeIter * i1, 
-                      GtkTreeIter * i2)
+gtk_tree_iter_equals (GtkTreeModel *tm,
+                      GtkTreeIter *i1, 
+                      GtkTreeIter *i2)
 {
   GtkTreePath *p1;
   GtkTreePath *p2;
@@ -2041,8 +2043,6 @@ close_master_publish_dialog (struct MainPublishingDialogContext *ctx)
   gtk_widget_destroy (GTK_WIDGET (ctx->master_pubdialog));
   g_object_unref (G_OBJECT (ctx->builder));
   GNUNET_free_non_null (ctx->ns_name);
-  if (ctx->ns)
-    GNUNET_FS_namespace_delete (ctx->ns, GNUNET_NO);
   g_free (ctx->previous_id);
   GNUNET_free (ctx);
   return GNUNET_YES;
@@ -2073,17 +2073,12 @@ insert_advertisement (void *cls, struct GNUNET_FS_FileInformation *fi,
     void **client_info)
 {
   struct MainPublishingDialogContext *ctx = cls;
-
+  struct GNUNET_CRYPTO_EccPublicKey pub;
   struct GNUNET_FS_Uri *sks_uri;
-  char *emsg;
   char *sks_uri_string;
 
-  emsg = NULL;
-  sks_uri = GNUNET_FS_uri_sks_create (ctx->ns, "/", &emsg);
-  GNUNET_free_non_null (emsg);
-  if (NULL == sks_uri)
-    return GNUNET_SYSERR;
-
+  GNUNET_IDENTITY_ego_get_public_key (ctx->ns, &pub);
+  sks_uri = GNUNET_FS_uri_sks_create (&pub, "/");
   sks_uri_string = GNUNET_FS_uri_to_string (sks_uri);
   GNUNET_FS_uri_destroy (sks_uri);
   if (NULL == sks_uri_string)
@@ -2110,7 +2105,7 @@ GNUNET_GTK_master_publish_dialog_execute_button_clicked_cb (GtkButton * button,
 {
   struct MainPublishingDialogContext *ctx = user_data;
   gchar *namespace_id;
-  struct GNUNET_FS_Namespace *ns;
+  struct GNUNET_IDENTITY_Ego *ns;
   const gchar *namespace_uid;
   struct GNUNET_FS_FileInformation *fi;
   GtkTreeIter iter;
@@ -2144,7 +2139,8 @@ GNUNET_GTK_master_publish_dialog_execute_button_clicked_cb (GtkButton * button,
     if (NULL != (id_entry_text = gtk_entry_get_text (GTK_ENTRY (ctx->identifier_entry))))
       namespace_id = g_strdup (id_entry_text);
     else if (!do_global)
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Global publication is disabled, but namespace_id is not available\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+                  "Global publication is disabled, but namespace_id is not available\n");
     if ((NULL != namespace_id) && ('\0' == namespace_id[0]))
     {
       g_free (namespace_id);
@@ -2158,10 +2154,12 @@ GNUNET_GTK_master_publish_dialog_execute_button_clicked_cb (GtkButton * button,
       ns = ctx->ns;
     }
     else if (!do_global)
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Global publication is disabled, but namespace_id unavailable or zero-length\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Global publication is disabled, but namespace_id unavailable or zero-length\n");
   }
   else if (!do_global)
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Global publication is disabled, ns is either NULL or disabled, yet 'Execute' was pressed\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Global publication is disabled, ns is either NULL or disabled, yet 'Execute' was pressed\n");
   if ((!do_global) && (NULL == ns))
   {
     g_free (namespace_id);
@@ -2179,7 +2177,8 @@ GNUNET_GTK_master_publish_dialog_execute_button_clicked_cb (GtkButton * button,
         GNUNET_FS_file_information_inspect (fi, insert_advertisement, ctx);
       /* FIXME-FEATURE-BUG-MINOR: should we convert namespace id and uid from UTF8? */
       GNUNET_FS_publish_start (GNUNET_FS_GTK_get_fs_handle (), 
-                               fi, ns,
+                               fi,
+                               GNUNET_IDENTITY_ego_get_private_key (ns),
                                namespace_id, namespace_uid,
                                GNUNET_FS_PUBLISH_OPTION_NONE);
     }
@@ -2384,7 +2383,7 @@ struct UpdateableContext
   /**
    * Handle to the namespace.
    */
-  struct GNUNET_FS_Namespace *ns;
+  struct GNUNET_IDENTITY_Ego *ns;
 
   /**
    * Hash codes of identifiers already added to tree store.
@@ -2531,7 +2530,10 @@ add_updateable_to_ts (void *cls, const char *last_id,
   sc.ns = uc->ns;
   sc.seen = uc->seen;
   sc.update_called = GNUNET_NO;
-  GNUNET_FS_namespace_list_updateable (uc->ns, next_id, &add_updateable_to_ts,
+  GNUNET_FS_namespace_list_updateable (GNUNET_FS_GTK_get_fs_handle (), 
+                                       GNUNET_IDENTITY_ego_get_private_key (uc->ns),
+                                       next_id,
+                                       &add_updateable_to_ts,
                                        &sc);
   if ((sc.update_called == GNUNET_NO) && (next_id != NULL) &&
       (strlen (next_id) > 0))
@@ -2560,12 +2562,15 @@ add_updateable_to_ts (void *cls, const char *last_id,
  * @return GNUNET_YES, always.
  */
 static int
-free_seen_paths (void *cls, const struct GNUNET_HashCode * key, void *value)
+free_seen_paths (void *cls, 
+                 const struct GNUNET_HashCode *key, 
+                 void *value)
 {
   GNUNET_free_non_null (value);
   return GNUNET_YES;
 }
 
+
 /**
  * Add all updateable entries of the current namespace to the
  * tree store.
@@ -2575,7 +2580,8 @@ free_seen_paths (void *cls, const struct GNUNET_HashCode * key, void *value)
  * @param id identity of the namespace to add
  */
 static void
-add_namespace_to_ts (GtkTreeStore *ts, struct GNUNET_FS_Namespace *ns)
+add_namespace_to_ts (GtkTreeStore *ts, 
+                     struct GNUNET_IDENTITY_Ego *ns)
 {
   struct UpdateableContext uc;
 
@@ -2584,13 +2590,15 @@ add_namespace_to_ts (GtkTreeStore *ts, struct GNUNET_FS_Namespace *ns)
   uc.ns = ns;
   uc.update_called = GNUNET_NO;
   uc.seen = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO);
-  GNUNET_FS_namespace_list_updateable (uc.ns, NULL, &add_updateable_to_ts, &uc);
+  GNUNET_FS_namespace_list_updateable (GNUNET_FS_GTK_get_fs_handle (), 
+                                       GNUNET_IDENTITY_ego_get_private_key (uc.ns),
+                                       NULL,
+                                       &add_updateable_to_ts, &uc);
   GNUNET_CONTAINER_multihashmap_iterate (uc.seen, free_seen_paths, NULL);
   GNUNET_CONTAINER_multihashmap_destroy (uc.seen);
 }
 
 
-
 /**
  * Run the file-publishing operation (by opening the master publishing dialog).
  * 
@@ -2598,7 +2606,8 @@ add_namespace_to_ts (GtkTreeStore *ts, struct GNUNET_FS_Namespace *ns)
  * @param user_data builder of the main window
  */
 void
-GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy, gpointer user_data)
+GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy, 
+                                               gpointer user_data)
 {
   struct MainPublishingDialogContext *ctx;
 /*  GtkTreeView *pseudonym_treeview;*/
@@ -2608,9 +2617,9 @@ GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy, gpointer user_
   int own_enabled;
   int global_enabled;
 
-  ctx = GNUNET_malloc (sizeof (struct MainPublishingDialogContext));
+  ctx = GNUNET_new (struct MainPublishingDialogContext);
   ctx->builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_publish_dialog.glade", ctx);
-  if (ctx->builder == NULL)
+  if (NULL == ctx->builder)
   {
     GNUNET_break (0);
     GNUNET_free (ctx);
@@ -2678,16 +2687,21 @@ GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy, gpointer user_
                     G_CALLBACK (identifiers_selection_changed_cb), ctx);
 
   cfg = GNUNET_FS_GTK_get_configuration ();
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg,
-      "gnunet-fs-gtk", "DEFAULT_NAMESPACE", &ctx->ns_name))
+#if FIXME_MIGRATE_TO_IDENTITY_SERVICE
+  if (GNUNET_OK != 
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             "gnunet-fs-gtk",
+                                             "DEFAULT_NAMESPACE",
+                                             &ctx->ns_name))
     ctx->ns_name = NULL;
   else
   {
-    ctx->ns = GNUNET_FS_namespace_open_existing (GNUNET_FS_GTK_get_fs_handle (), ctx->ns_name);
+    ctx->ns = GNUNET_FS_namespace_open_existing (GNUNET_FS_GTK_get_fs_handle (), 
+                                                 ctx->ns_name);
     if (NULL == ctx->ns)
       GNUNET_free (ctx->ns_name);
   }
-
+#endif
   have_ns = (NULL != ctx->ns);
 
   gtk_widget_set_sensitive (ctx->own_checkbox, have_ns);
diff --git a/src/fs/gnunet-fs-gtk_create-pseudonym.c b/src/identity/gnunet-identity-gtk_create_ego.c
index e88c617c..e88c617c 100644
--- a/src/fs/gnunet-fs-gtk_create-pseudonym.c
+++ b/src/identity/gnunet-identity-gtk_create_ego.c
diff --git a/src/fs/gnunet-fs-gtk_namespace_organizer.c b/src/identity/gnunet-identity-gtk_ego_organizer.c
index 2cf7db65..2cf7db65 100644
--- a/src/fs/gnunet-fs-gtk_namespace_organizer.c
+++ b/src/identity/gnunet-identity-gtk_ego_organizer.c
diff --git a/src/fs/gnunet-fs-gtk_namespace_organizer.h b/src/identity/gnunet-identity-gtk_ego_organizer.h
index 72392f7d..72392f7d 100644
--- a/src/fs/gnunet-fs-gtk_namespace_organizer.h
+++ b/src/identity/gnunet-identity-gtk_ego_organizer.h