1 files changed, 16 insertions, 9 deletions

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.
  *