1 files changed, 18 insertions, 12 deletions

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)))