1 files changed, 30 insertions, 16 deletions

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;