1 files changed, 85 insertions, 60 deletions

diff --git a/src/fs/gnunet-fs-gtk-main_window_file_publish.c b/src/fs/gnunet-fs-gtk-main_window_file_publish.c
index 72915041..74e7cf5f 100644
--- a/src/fs/gnunet-fs-gtk-main_window_file_publish.c
+++ b/src/fs/gnunet-fs-gtk-main_window_file_publish.c
@@ -278,7 +278,6 @@ add_file_at_iter (gpointer data, const char *filename, const struct GNUNET_FS_Bl
 }
 
 
-
 /**
  * Add an empty directory to the tree model.
  *
@@ -873,7 +872,6 @@ move_entry (gpointer data, GtkTreeModel * tm, GtkTreeIter * old, GtkTreeIter * n
   GtkBuilder *builder;
   
   builder = GTK_BUILDER (data);
-
   gtk_tree_model_get (tm, old, 0, &fsf, 1, &do_index, 2, &short_fn, 3,
                       &anonymity_level, 4, &priority, 5, &fip, -1);
   gtk_tree_store_set (GTK_TREE_STORE (tm), newpos, 0, fsf, 1, do_index, 2,
@@ -926,20 +924,21 @@ move_entry (gpointer data, GtkTreeModel * tm, GtkTreeIter * old, GtkTreeIter * n
   update_selectivity (data);
 }
 
+
 /**
  * User has changed the "current" identifier for the content in
  * the GtkTreeView.  Update the model.
  */
-void GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer_edited_cb
-    (GtkCellRendererText * renderer, gchar * cpath, gchar * new_text,
-     gpointer user_data)
+void 
+GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer_edited_cb (GtkCellRendererText * renderer, 
+                                                                       gchar * cpath, gchar * new_text,
+                                                                       gpointer user_data)
 {
   GtkTreeIter iter;
   GtkTreeStore *ts;
   GtkBuilder *builder;
   
   builder = GTK_BUILDER (user_data);
-
   ts = GTK_TREE_STORE (gtk_builder_get_object
                        (builder, "GNUNET_GTK_pseudonym_tree_store"));
 
@@ -958,16 +957,16 @@ void GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer_edited_cb
  * User has changed the "current" identifier for the content in
  * the GtkTreeView.  Update the model.
  */
-void GNUNET_GTK_master_publish_dialog_pseudonym_identifier_renderer_edited_cb
-    (GtkCellRendererText * renderer, gchar * cpath, gchar * new_text,
-     gpointer user_data)
+void 
+GNUNET_GTK_master_publish_dialog_pseudonym_identifier_renderer_edited_cb (GtkCellRendererText * renderer, 
+                                                                          gchar * cpath, gchar * new_text,
+                                                                          gpointer user_data)
 {
   GtkTreeIter iter;
   GtkTreeStore *ts;
   GtkBuilder *builder;
   
   builder = GTK_BUILDER (user_data);
-
   ts = GTK_TREE_STORE (gtk_builder_get_object
                        (builder, "GNUNET_GTK_pseudonym_tree_store"));
 
@@ -1228,35 +1227,48 @@ GNUNET_GTK_master_publish_dialog_add_button_clicked_cb (GtkWidget * dummy,
   gtk_window_present (GTK_WINDOW (ad));
 }
 
-struct edit_pub_cb_args
+
+struct EditPublishContext
 {
   GtkTreeModel *tm;
   GtkTreeIter iter;
-  /* FIXME: this indirection madness is not really required any longer.
-   * we only need to pass over *tm and iter, everything else can be
-   * copied.
-   */
-  gchar *short_fn;
-  struct GNUNET_FS_FileInformation *fip;
-  int do_index;
-  guint anonymity_level;
-  guint priority;
 };
 
-void
-master_publish_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)
+
+/**
+ * Function called when the edit publish dialog has been closed.
+ *
+ * @param cls closure
+ * @param do_index index flag set?
+ * @param short_fn short filename
+ * @param anonymity_level anonymity degree chosen for publishing
+ * @param priority replication setting (rename!)
+ * @param root always NULL here
+ * @param ret GTK_RESPONSE_OK if the dialog was closed with "OK"
+ */
+static void
+master_publish_edit_publish_dialog_cb (gpointer cls, 
+                                       int do_index, 
+                                       const char *short_fn,
+                                       uint32_t anonymity_level,
+                                       uint32_t priority, 
+                                       const char *root,
+                                       gint ret)
 {
-  struct edit_pub_cb_args *cbargs = (struct edit_pub_cb_args *) cls;
+  struct EditPublishContext *cbargs = cls;
+  
+  GNUNET_assert (NULL == root);
   if (ret == GTK_RESPONSE_OK)
     gtk_tree_store_set (GTK_TREE_STORE (cbargs->tm), &cbargs->iter,
-        1, *do_index, 2, *short_fn, 3, *anonymity_level, 4, *priority, -1);
-  g_free (root);
-  g_free (short_fn);
-  g_free (cbargs);
+                        1, do_index, 
+                        2, short_fn, 
+                        3, (guint) anonymity_level, 
+                        4, (guint) priority, 
+                        -1);
+  GNUNET_free (cbargs);
 }
 
+
 void
 GNUNET_GTK_master_publish_dialog_edit_button_clicked_cb (GtkWidget * dummy,
                                                          gpointer data)
@@ -1264,36 +1276,47 @@ GNUNET_GTK_master_publish_dialog_edit_button_clicked_cb (GtkWidget * dummy,
   GtkTreeView *tv;
   GtkTreeModel *tm;
   GtkTreeSelection *sel;
-  struct edit_pub_cb_args *cbargs;
+  struct EditPublishContext *cbargs;
   GtkBuilder *builder;
   GtkWindow *master_pubdialog;
+  gint do_index;
+  char *short_fn;
+  guint anonymity_level;
+  guint priority;
+  struct GNUNET_FS_FileInformation *fip;
 
   builder = GTK_BUILDER (data);
-
   tv = GTK_TREE_VIEW (gtk_builder_get_object
                       (builder,
                        "GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
 
-  cbargs = g_new0 (struct edit_pub_cb_args, 1);
+  cbargs = GNUNET_malloc (sizeof (struct EditPublishContext));
   cbargs->tm = gtk_tree_view_get_model (tv);
-
   master_pubdialog = GTK_WINDOW (gtk_builder_get_object (builder,
-      "GNUNET_GTK_master_publish_dialog"));
+                                                         "GNUNET_GTK_master_publish_dialog"));
   sel = gtk_tree_view_get_selection (tv);
   if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &cbargs->iter))
   {
     GNUNET_break (0);
-    g_free (cbargs);
+    GNUNET_free (cbargs);
     return;
   }
 
-  gtk_tree_model_get (tm, &cbargs->iter, 1, &cbargs->do_index, 2,
-      &cbargs->short_fn, 3, &cbargs->anonymity_level, 4, &cbargs->priority,
-      5, &cbargs->fip, -1);
-
-  GNUNET_FS_GTK_edit_publish_dialog (builder, master_pubdialog, &cbargs->do_index,
-      &cbargs->short_fn, &cbargs->anonymity_level, &cbargs->priority,
-      cbargs->fip, TRUE, &master_publish_edit_publish_dialog_cb, cbargs);
+  gtk_tree_model_get (tm, &cbargs->iter, 
+                      1, &do_index, 
+                      2, &short_fn, 
+                      3, &anonymity_level, 
+                      4, &priority,
+                      5, &fip,
+                      -1);
+  /* FIXME: shouldn't this use a fresh builder? */
+  GNUNET_FS_GTK_edit_publish_dialog (builder, master_pubdialog, 
+                                     do_index,
+                                     short_fn, 
+                                     (uint32_t) anonymity_level, 
+                                     (uint32_t) priority,
+                                     fip,
+                                     TRUE, &master_publish_edit_publish_dialog_cb, cbargs);
 }
 
 
@@ -1320,7 +1343,6 @@ free_fi_row_reference (void *cls, struct GNUNET_FS_FileInformation *fi,
 }
 
 
-
 void
 GNUNET_GTK_master_publish_dialog_delete_button_clicked_cb (GtkWidget * dummy,
                                                            gpointer data)
@@ -1333,7 +1355,6 @@ GNUNET_GTK_master_publish_dialog_delete_button_clicked_cb (GtkWidget * dummy,
   GtkBuilder *builder;
   
   builder = GTK_BUILDER (data);
-
   tv = GTK_TREE_VIEW (gtk_builder_get_object
                       (builder,
                        "GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
@@ -1349,9 +1370,10 @@ GNUNET_GTK_master_publish_dialog_delete_button_clicked_cb (GtkWidget * dummy,
   update_selectivity (data);
 }
 
+
 void
 GNUNET_GTK_publish_directory_dialog_response_cb (GtkDialog *dialog,
-    gint response_id, gpointer user_data)
+                                                 gint response_id, gpointer user_data)
 {
   char *filename;
   int do_index;
@@ -1361,10 +1383,8 @@ GNUNET_GTK_publish_directory_dialog_response_cb (GtkDialog *dialog,
   GtkBuilder *builder;
 
   builder = GTK_BUILDER (user_data);
-
   ad = GTK_WIDGET (gtk_builder_get_object (builder,
-      "GNUNET_GTK_publish_directory_dialog"));
-
+                                           "GNUNET_GTK_publish_directory_dialog"));
   if (response_id == -5)
   {
     filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (ad));
@@ -1637,9 +1657,10 @@ free_file_information_tree_store (GtkTreeModel * tm, GtkTreeIter * iter)
   }
 }
 
+
 void
 GNUNET_GTK_master_publish_dialog_realize_cb (GtkWidget *widget,
-    gpointer user_data)
+                                             gpointer user_data)
 {
   GtkTreeView *tv;
   GtkTreeSelection *sel;
@@ -1661,7 +1682,8 @@ GNUNET_GTK_master_publish_dialog_realize_cb (GtkWidget *widget,
                     G_CALLBACK (selection_changed_cb), user_data);
 }
 
-void
+
+static void
 hide_master_publish_dialog (gpointer user_data, gint ret)
 {
   GtkTreeView *tv, *ptv;
@@ -1673,11 +1695,11 @@ hide_master_publish_dialog (gpointer user_data, gint ret)
   gchar *namespace_uid;
   struct GNUNET_FS_FileInformation *fi;
   GtkWidget *ad;
-  GtkBuilder *builder = GTK_BUILDER (user_data);
+  GtkBuilder *builder;
 
+  builder = GTK_BUILDER (user_data);
   ad = GTK_WIDGET (gtk_builder_get_object
                    (builder, "GNUNET_GTK_master_publish_dialog"));
-
   ptv = GTK_TREE_VIEW (gtk_builder_get_object
                       (builder,
                        "GNUNET_GTK_master_publish_dialog_pseudonym_tree_view"));
@@ -1732,35 +1754,40 @@ hide_master_publish_dialog (gpointer user_data, gint ret)
     }
     while (TRUE == gtk_tree_model_iter_next (tm, &iter));
   gtk_tree_store_clear (GTK_TREE_STORE (tm));
-
   gtk_widget_hide (ad);
+  /* FIXME: doesn't this leak everything (builder + window)?
+     I think we need to unref the builder here! */
 }
 
+
 void
 GNUNET_GTK_master_publish_dialog_execute_button_clicked_cb (GtkButton *button,
-    gpointer user_data)
+                                                            gpointer user_data)
 {
   hide_master_publish_dialog (user_data, GTK_RESPONSE_OK);
 }
 
+
 void
 GNUNET_GTK_master_publish_dialog_cancel_button_clicked_cb (GtkButton *button,
-    gpointer user_data)
+                                                           gpointer user_data)
 {
   hide_master_publish_dialog (user_data, GTK_RESPONSE_CANCEL);
 }
 
+
 gboolean
 GNUNET_GTK_master_publish_dialog_delete_event_cb (GtkWidget *widget,
-    GdkEvent *event, gpointer user_data)
+                                                  GdkEvent *event, gpointer user_data)
 {
   hide_master_publish_dialog (user_data, GTK_RESPONSE_CANCEL);
   return TRUE;
 }
 
+
 void
 GNUNET_GTK_publish_file_dialog_response_cb (GtkDialog *dialog,
-    gint response_id, gpointer user_data)
+                                            gint response_id, gpointer user_data)
 {
   char *filename;
   struct GNUNET_FS_BlockOptions bo;
@@ -1802,6 +1829,7 @@ GNUNET_GTK_publish_file_dialog_response_cb (GtkDialog *dialog,
   gtk_widget_hide (ad);
 }
 
+
 /**
  */
 void
@@ -1812,10 +1840,8 @@ GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy, gpointer data)
   GtkBuilder *builder;
   
   builder = GTK_BUILDER (data);
-
   ad = GTK_WIDGET (gtk_builder_get_object
                    (builder, "GNUNET_GTK_master_publish_dialog"));
-
   if (!gtk_widget_get_visible (ad))
   {
     ts = GTK_TREE_STORE (gtk_builder_get_object (builder,
@@ -1823,7 +1849,6 @@ GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy, gpointer data)
     GNUNET_FS_namespace_list (GNUNET_FS_GTK_get_fs_handle (),
         &add_namespace_to_ts, ts);
   }
-
   gtk_window_present (GTK_WINDOW (ad));
 }