1 files changed, 42 insertions, 36 deletions

diff --git a/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c b/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
index 9b76f2ab..77ae7353 100644
--- a/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
+++ b/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
@@ -66,20 +66,22 @@ selection_changed_cb (GtkTreeSelection * ts, gpointer user_data)
     gtk_widget_set_sensitive (ok_button, FALSE);
 }
 
-struct namespace_data_struct
+struct NamespaceAdvertisementContext
 {
   struct GNUNET_FS_Namespace *ns;
   int do_index;
-  char *short_fn;
+  const char *short_fn;
   guint anonymity_level;
   guint priority;
-  gchar *root;
+  const char *root;
+  struct GNUNET_FS_FileInformation *fip;
 };
 
+
 /**
  * Function called on entries in a GNUNET_FS_FileInformation publish-structure.
  *
- * @param cls closure
+ * @param cls closure, a 'struct NamespaceAdvertisementContext *'
  * @param fi the entry in the publish-structure
  * @param length length of the file or directory
  * @param meta metadata for the file or directory (can be modified)
@@ -91,41 +93,44 @@ struct namespace_data_struct
  *         this entry from the directory, GNUNET_SYSERR
  *         to abort the iteration
  */
-int
+static int
 advertise_namespace (void *cls, struct GNUNET_FS_FileInformation *fi,
-    uint64_t length, struct GNUNET_CONTAINER_MetaData *meta,
-    struct GNUNET_FS_Uri **uri, struct GNUNET_FS_BlockOptions *bo,
-    int *do_index, void **client_info)
+                     uint64_t length, struct GNUNET_CONTAINER_MetaData *meta,
+                     struct GNUNET_FS_Uri **uri, struct GNUNET_FS_BlockOptions *bo,
+                     int *do_index, void **client_info)
 {
-  struct namespace_data_struct *nds;
-  nds = (struct namespace_data_struct *) cls;
+  struct NamespaceAdvertisementContext *nds = cls;
+
   GNUNET_FS_namespace_advertise (GNUNET_FS_GTK_get_fs_handle (), *uri,
       nds->ns, meta, bo, nds->root, NULL, NULL);
   return GNUNET_SYSERR;
 }
 
-void
-adv_pseudonym_edit_publish_dialog_cb (gpointer cls, int *do_index, char **short_fn,
-    guint * anonymity_level, guint * priority, gchar *root,
-    struct GNUNET_FS_FileInformation *fip, gint ret)
+
+static void
+adv_pseudonym_edit_publish_dialog_cb (gpointer cls, 
+                                      int do_index, 
+                                      const char *short_fn,
+                                      guint anonymity_level, 
+                                      guint priority, 
+                                      const char *root,                               
+                                      gint ret)
 {
-  struct namespace_data_struct *nds;
-  nds = (struct namespace_data_struct *) cls;
+  struct NamespaceAdvertisementContext *nds = cls;
 
   if (ret == GTK_RESPONSE_OK)
   {
-    nds->do_index = *do_index;
-    nds->short_fn = *short_fn;
-    nds->anonymity_level = *anonymity_level;
-    nds->priority = *priority;
+    nds->do_index = do_index;
+    nds->short_fn = short_fn;
+    nds->anonymity_level = anonymity_level;
+    nds->priority = priority;
     nds->root = root;
-    GNUNET_FS_file_information_inspect (fip,
-        advertise_namespace, nds);
+    GNUNET_FS_file_information_inspect (nds->fip,
+                                        &advertise_namespace, nds);
   }
-  g_free (nds->root);
   GNUNET_FS_namespace_delete (nds->ns, GNUNET_NO);
-  g_free (nds);
-  GNUNET_FS_file_information_destroy (fip, NULL, NULL);
+  GNUNET_FS_file_information_destroy (nds->fip, NULL, NULL);
+  GNUNET_free (nds);
 }
 
 void
@@ -141,12 +146,11 @@ GNUNET_GTK_select_pseudonym_dialog_response_cb (GtkDialog *dialog,
   struct GNUNET_FS_Namespace *ns;
   struct GNUNET_FS_Namespace *nso;
   GtkWindow *transient;
-  struct namespace_data_struct *nds;
-  struct GNUNET_FS_FileInformation *fip;
+  struct NamespaceAdvertisementContext *nds;
   struct GNUNET_CONTAINER_MetaData *meta;
-  builder = GTK_BUILDER (user_data);
   struct GNUNET_FS_BlockOptions bo;
 
+  builder = GTK_BUILDER (user_data);
   ad = GTK_WIDGET (gtk_builder_get_object
                    (builder, "GNUNET_GTK_select_pseudonym_dialog"));
 
@@ -178,7 +182,7 @@ GNUNET_GTK_select_pseudonym_dialog_response_cb (GtkDialog *dialog,
 
   meta = GNUNET_CONTAINER_meta_data_create ();
 
-  nds = g_new0 (struct namespace_data_struct, 1);
+  nds = GNUNET_malloc (sizeof (struct NamespaceAdvertisementContext));
   nds->ns = ns;
   nds->do_index = FALSE;
   nds->short_fn = NULL;
@@ -188,14 +192,16 @@ GNUNET_GTK_select_pseudonym_dialog_response_cb (GtkDialog *dialog,
   /* This is a bogus fileinfo. It's needed because edit_publish_dialog
    * was written to work with fileinfo, and return a fileinfo.
    */
-  memset (&bo, 0, sizeof (bo));
-  fip = GNUNET_FS_file_information_create_empty_directory (NULL, NULL,
-      NULL, meta, &bo);
+  nds->fip = GNUNET_FS_file_information_create_empty_directory (NULL, NULL,
+                                                                NULL, meta, &bo);
+    memset (&bo, 0, sizeof (bo));
   GNUNET_CONTAINER_meta_data_destroy (meta);
-
-  GNUNET_FS_GTK_edit_publish_dialog (builder, transient, &nds->do_index,
-      &nds->short_fn, &nds->anonymity_level, &nds->priority,
-      fip, FALSE, &adv_pseudonym_edit_publish_dialog_cb, nds);
+  GNUNET_FS_GTK_edit_publish_dialog (builder, transient, 
+                                     nds->do_index,
+                                     nds->short_fn, 
+                                     nds->anonymity_level, 
+                                     nds->priority,
+                                     nds->fip, FALSE, &adv_pseudonym_edit_publish_dialog_cb, nds);
 }
 
 void