1 files changed, 324 insertions, 192 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 c4ad5117..72915041 100644
--- a/src/fs/gnunet-fs-gtk-main_window_file_publish.c
+++ b/src/fs/gnunet-fs-gtk-main_window_file_publish.c
@@ -26,16 +26,11 @@
 #include "gnunet-fs-gtk.h"
 #include "gnunet-fs-gtk-edit_publish_dialog.h"
 #include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_fs_service.h>
 
 #define MARKER_DIR_FILE_SIZE "-"
 
 /**
- * Builder used for the master publish dialog.
- */
-static GtkBuilder *master_builder;
-
-
-/**
  * Check if two GtkTreeIters refer to the same element.
  *
  * @param tm tree model of the iterators
@@ -63,7 +58,7 @@ gtk_tree_iter_equals (GtkTreeModel * tm, GtkTreeIter * i1, GtkTreeIter * i2)
  * Update selectivity in the master dialog.
  */
 static void
-update_selectivity ()
+update_selectivity (gpointer data)
 {
   GtkTreeView *tv;
   GtkTreeModel *tm;
@@ -83,12 +78,15 @@ update_selectivity ()
   struct GNUNET_FS_FileInformation *fip;
   int ns_ok;
   gchar *namespace_id;
+  GtkBuilder *builder;
+  
+  builder = GTK_BUILDER (data);
 
   tm = GTK_TREE_MODEL (gtk_builder_get_object
-                       (master_builder,
+                       (builder,
                         "GNUNET_GTK_file_sharing_publishing_tree_store"));
   tv = GTK_TREE_VIEW (gtk_builder_get_object
-                      (master_builder,
+                      (builder,
                        "GNUNET_GTK_master_publish_dialog_pseudonym_tree_view"));
   sel = gtk_tree_view_get_selection (tv);
   ns_ok = GNUNET_YES;
@@ -102,34 +100,34 @@ update_selectivity ()
   }
   up_button =
       GTK_WIDGET (gtk_builder_get_object
-                  (master_builder,
+                  (builder,
                    "GNUNET_GTK_master_publish_dialog_up_button"));
   down_button =
       GTK_WIDGET (gtk_builder_get_object
-                  (master_builder,
+                  (builder,
                    "GNUNET_GTK_master_publish_dialog_down_button"));
   left_button =
       GTK_WIDGET (gtk_builder_get_object
-                  (master_builder,
+                  (builder,
                    "GNUNET_GTK_master_publish_dialog_left_button"));
   right_button =
       GTK_WIDGET (gtk_builder_get_object
-                  (master_builder,
+                  (builder,
                    "GNUNET_GTK_master_publish_dialog_right_button"));
   delete_button =
       GTK_WIDGET (gtk_builder_get_object
-                  (master_builder,
+                  (builder,
                    "GNUNET_GTK_master_publish_dialog_delete_button"));
   edit_button =
       GTK_WIDGET (gtk_builder_get_object
-                  (master_builder,
+                  (builder,
                    "GNUNET_GTK_master_publish_dialog_edit_button"));
   execute_button =
       GTK_WIDGET (gtk_builder_get_object
-                  (master_builder,
+                  (builder,
                    "GNUNET_GTK_master_publish_dialog_execute_button"));
   tv = GTK_TREE_VIEW (gtk_builder_get_object
-                      (master_builder,
+                      (builder,
                        "GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
   sel = gtk_tree_view_get_selection (tv);
   tm = gtk_tree_view_get_model (tv);
@@ -208,7 +206,7 @@ update_selectivity ()
  * @param iter parent entry, or NULL for top-level addition
  */
 static void
-add_file_at_iter (const char *filename, const struct GNUNET_FS_BlockOptions *bo,
+add_file_at_iter (gpointer data, const char *filename, const struct GNUNET_FS_BlockOptions *bo,
                   int do_index, GtkTreeIter * iter)
 {
   struct GNUNET_FS_FileInformation *fi;
@@ -223,6 +221,9 @@ add_file_at_iter (const char *filename, const struct GNUNET_FS_BlockOptions *bo,
   char *file_size_fancy;
   const char *ss;
   struct stat sbuf;
+  GtkBuilder *builder;
+  
+  builder = GTK_BUILDER (data);
 
   if (0 != STAT (filename, &sbuf))
     return;
@@ -239,7 +240,7 @@ add_file_at_iter (const char *filename, const struct GNUNET_FS_BlockOptions *bo,
     }
   }
   ts = GTK_TREE_STORE (gtk_builder_get_object
-                       (master_builder,
+                       (builder,
                         "GNUNET_GTK_file_sharing_publishing_tree_store"));
 
   meta = GNUNET_CONTAINER_meta_data_create ();
@@ -273,7 +274,7 @@ add_file_at_iter (const char *filename, const struct GNUNET_FS_BlockOptions *bo,
                       short_fn, 3, (guint) bo->anonymity_level, 4,
                       (guint) bo->content_priority, 5, fi, -1);
   GNUNET_free (file_size_fancy);
-  update_selectivity ();
+  update_selectivity (data);
 }
 
 
@@ -287,7 +288,7 @@ add_file_at_iter (const char *filename, const struct GNUNET_FS_BlockOptions *bo,
  * @param pos iterator to set to the location of the new element
  */
 static void
-create_dir_at_iter (const char *name, const struct GNUNET_FS_BlockOptions *bo,
+create_dir_at_iter (gpointer data, const char *name, const struct GNUNET_FS_BlockOptions *bo,
                     GtkTreeIter * iter, GtkTreeIter * pos)
 {
   struct GNUNET_FS_FileInformation *fi;
@@ -295,9 +296,12 @@ create_dir_at_iter (const char *name, const struct GNUNET_FS_BlockOptions *bo,
   GtkTreePath *path;
   struct GNUNET_CONTAINER_MetaData *meta;
   GtkTreeStore *ts;
+  GtkBuilder *builder;
+  
+  builder = GTK_BUILDER (data);
 
   ts = GTK_TREE_STORE (gtk_builder_get_object
-                       (master_builder,
+                       (builder,
                         "GNUNET_GTK_file_sharing_publishing_tree_store"));
   meta = GNUNET_CONTAINER_meta_data_create ();
   GNUNET_FS_meta_data_make_directory (meta);
@@ -315,7 +319,7 @@ create_dir_at_iter (const char *name, const struct GNUNET_FS_BlockOptions *bo,
   gtk_tree_store_set (ts, pos, 0, MARKER_DIR_FILE_SIZE, 1, (gboolean) GNUNET_NO,
                       2, name, 3, (guint) bo->anonymity_level, 4,
                       (guint) bo->content_priority, 5, fi, -1);
-  update_selectivity ();
+  update_selectivity (data);
 }
 
 
@@ -797,11 +801,14 @@ scan_directory (void *cls, const char *filename)
  * @param do_index should we index?
  */
 static void
-add_dir (const char *filename, const struct GNUNET_FS_BlockOptions *bo,
+add_dir (gpointer data, const char *filename, const struct GNUNET_FS_BlockOptions *bo,
          int do_index)
 {
   struct stat sbuf;
   struct AddDirContext scan_ctx;
+  GtkBuilder *builder;
+  
+  builder = GTK_BUILDER (data);
 
   if (0 != STAT (filename, &sbuf))
     return;
@@ -815,7 +822,7 @@ add_dir (const char *filename, const struct GNUNET_FS_BlockOptions *bo,
   scan_ctx.do_index = do_index;
   scan_ctx.ts =
       GTK_TREE_STORE (gtk_builder_get_object
-                      (master_builder,
+                      (builder,
                        "GNUNET_GTK_file_sharing_publishing_tree_store"));
   scan_directory (&scan_ctx, filename);
 }
@@ -827,7 +834,7 @@ add_dir (const char *filename, const struct GNUNET_FS_BlockOptions *bo,
 static void
 selection_changed_cb (GtkTreeSelection * ts, gpointer user_data)
 {
-  update_selectivity ();
+  update_selectivity (user_data);
 }
 
 
@@ -847,7 +854,7 @@ remove_old_entry (GtkTreeStore * ts, GtkTreeIter * root)
  * Move an entry in the tree.
  */
 static void
-move_entry (GtkTreeModel * tm, GtkTreeIter * old, GtkTreeIter * newpos,
+move_entry (gpointer data, GtkTreeModel * tm, GtkTreeIter * old, GtkTreeIter * newpos,
             int dsel)
 {
   struct GNUNET_FS_FileInformation *fip;
@@ -863,6 +870,9 @@ move_entry (GtkTreeModel * tm, GtkTreeIter * old, GtkTreeIter * newpos,
   GtkTreeIter cnewpos;
   GtkTreeRowReference *rr;
   GtkTreeRowReference *rr2;
+  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);
@@ -874,7 +884,7 @@ move_entry (GtkTreeModel * tm, GtkTreeIter * old, GtkTreeIter * newpos,
   if (dsel == GNUNET_YES)
   {
     tv = GTK_TREE_VIEW (gtk_builder_get_object
-                        (master_builder,
+                        (builder,
                          "GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
     sel = gtk_tree_view_get_selection (tv);
     path = gtk_tree_model_get_path (tm, newpos);
@@ -894,7 +904,7 @@ move_entry (GtkTreeModel * tm, GtkTreeIter * old, GtkTreeIter * newpos,
       gtk_tree_path_free (path);
       gtk_tree_store_insert_before (GTK_TREE_STORE (tm), &cnewpos, newpos,
                                     NULL);
-      move_entry (tm, &child, &cnewpos, GNUNET_NO);
+      move_entry (data, tm, &child, &cnewpos, GNUNET_NO);
       path = gtk_tree_row_reference_get_path (rr2);
       gtk_tree_row_reference_free (rr2);
       GNUNET_assert (TRUE == gtk_tree_model_get_iter (tm, &child, path));
@@ -913,7 +923,7 @@ move_entry (GtkTreeModel * tm, GtkTreeIter * old, GtkTreeIter * newpos,
     gtk_tree_path_free (path);
     gtk_tree_selection_select_iter (sel, newpos);
   }
-  update_selectivity ();
+  update_selectivity (data);
 }
 
 /**
@@ -926,9 +936,12 @@ void GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer_edited_cb
 {
   GtkTreeIter iter;
   GtkTreeStore *ts;
+  GtkBuilder *builder;
+  
+  builder = GTK_BUILDER (user_data);
 
   ts = GTK_TREE_STORE (gtk_builder_get_object
-                       (master_builder, "GNUNET_GTK_pseudonym_tree_store"));
+                       (builder, "GNUNET_GTK_pseudonym_tree_store"));
 
   if (TRUE !=
       gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (ts), &iter, cpath))
@@ -937,7 +950,7 @@ void GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer_edited_cb
     return;
   }
   gtk_tree_store_set (ts, &iter, 5, new_text, -1);
-  update_selectivity ();
+  update_selectivity (user_data);
 }
 
 
@@ -951,9 +964,12 @@ void GNUNET_GTK_master_publish_dialog_pseudonym_identifier_renderer_edited_cb
 {
   GtkTreeIter iter;
   GtkTreeStore *ts;
+  GtkBuilder *builder;
+  
+  builder = GTK_BUILDER (user_data);
 
   ts = GTK_TREE_STORE (gtk_builder_get_object
-                       (master_builder, "GNUNET_GTK_pseudonym_tree_store"));
+                       (builder, "GNUNET_GTK_pseudonym_tree_store"));
 
   if (TRUE !=
       gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (ts), &iter, cpath))
@@ -962,7 +978,7 @@ void GNUNET_GTK_master_publish_dialog_pseudonym_identifier_renderer_edited_cb
     return;
   }
   gtk_tree_store_set (ts, &iter, 2, new_text, -1);
-  update_selectivity ();
+  update_selectivity (user_data);
 }
 
 
@@ -978,9 +994,12 @@ GNUNET_GTK_master_publish_dialog_right_button_clicked_cb (GtkWidget * dummy,
   GtkTreeIter pred;
   GtkTreeIter prev;
   GtkTreeIter pos;
+  GtkBuilder *builder;
+  
+  builder = GTK_BUILDER (data);
 
   tv = GTK_TREE_VIEW (gtk_builder_get_object
-                      (master_builder,
+                      (builder,
                        "GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
   sel = gtk_tree_view_get_selection (tv);
   if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
@@ -1010,7 +1029,7 @@ GNUNET_GTK_master_publish_dialog_right_button_clicked_cb (GtkWidget * dummy,
     GNUNET_break (0);
     return;
   }
-  move_entry (tm, &iter, &pos, GNUNET_YES);
+  move_entry (data, tm, &iter, &pos, GNUNET_YES);
   remove_old_entry (GTK_TREE_STORE (tm), &iter);
 }
 
@@ -1025,9 +1044,12 @@ GNUNET_GTK_master_publish_dialog_left_button_clicked_cb (GtkWidget * dummy,
   GtkTreeIter iter;
   GtkTreeIter parent;
   GtkTreeIter pos;
+  GtkBuilder *builder;
+  
+  builder = GTK_BUILDER (data);
 
   tv = GTK_TREE_VIEW (gtk_builder_get_object
-                      (master_builder,
+                      (builder,
                        "GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
   sel = gtk_tree_view_get_selection (tv);
   if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
@@ -1046,7 +1068,7 @@ GNUNET_GTK_master_publish_dialog_left_button_clicked_cb (GtkWidget * dummy,
     GNUNET_break (0);
     return;
   }
-  move_entry (tm, &iter, &pos, GNUNET_YES);
+  move_entry (data, tm, &iter, &pos, GNUNET_YES);
   remove_old_entry (GTK_TREE_STORE (tm), &iter);
 }
 
@@ -1064,9 +1086,12 @@ GNUNET_GTK_master_publish_dialog_up_button_clicked_cb (GtkWidget * dummy,
   GtkTreeIter prev;
   GtkTreeIter *pprev;
   GtkTreeIter pos;
+  GtkBuilder *builder;
+  
+  builder = GTK_BUILDER (data);
 
   tv = GTK_TREE_VIEW (gtk_builder_get_object
-                      (master_builder,
+                      (builder,
                        "GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
   sel = gtk_tree_view_get_selection (tv);
   if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
@@ -1101,7 +1126,7 @@ GNUNET_GTK_master_publish_dialog_up_button_clicked_cb (GtkWidget * dummy,
     GNUNET_break (0);
     return;
   }
-  move_entry (tm, &iter, &pos, GNUNET_YES);
+  move_entry (data, tm, &iter, &pos, GNUNET_YES);
   remove_old_entry (GTK_TREE_STORE (tm), &iter);
 }
 
@@ -1116,9 +1141,12 @@ GNUNET_GTK_master_publish_dialog_down_button_clicked_cb (GtkWidget * dummy,
   GtkTreeIter iter;
   GtkTreeIter next;
   GtkTreeIter pos;
+  GtkBuilder *builder;
+  
+  builder = GTK_BUILDER (data);
 
   tv = GTK_TREE_VIEW (gtk_builder_get_object
-                      (master_builder,
+                      (builder,
                        "GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
   sel = gtk_tree_view_get_selection (tv);
   if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
@@ -1138,7 +1166,7 @@ GNUNET_GTK_master_publish_dialog_down_button_clicked_cb (GtkWidget * dummy,
     GNUNET_break (0);
     return;
   }
-  move_entry (tm, &iter, &pos, GNUNET_YES);
+  move_entry (data, tm, &iter, &pos, GNUNET_YES);
   remove_old_entry (GTK_TREE_STORE (tm), &iter);
 }
 
@@ -1152,9 +1180,12 @@ GNUNET_GTK_master_publish_dialog_new_button_clicked_cb (GtkWidget * dummy,
   GtkTreeIter iter;
   GtkTreeIter pos;
   struct GNUNET_FS_BlockOptions bo;
+  GtkBuilder *builder;
+  
+  builder = GTK_BUILDER (data);
 
   tv = GTK_TREE_VIEW (gtk_builder_get_object
-                      (master_builder,
+                      (builder,
                        "GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
   sel = gtk_tree_view_get_selection (tv);
   /* FIXME: consider opening a dialog to get
@@ -1169,10 +1200,10 @@ GNUNET_GTK_master_publish_dialog_new_button_clicked_cb (GtkWidget * dummy,
   bo.replication_level = 1;
   if (TRUE != gtk_tree_selection_get_selected (sel, NULL, &iter))
   {
-    create_dir_at_iter ("unnamed/", &bo, NULL, &pos);
+    create_dir_at_iter (data, "unnamed/", &bo, NULL, &pos);
     return;
   }
-  create_dir_at_iter ("unnamed/", &bo, &iter, &pos);
+  create_dir_at_iter (data, "unnamed/", &bo, &iter, &pos);
 }
 
 
@@ -1182,55 +1213,49 @@ GNUNET_GTK_master_publish_dialog_add_button_clicked_cb (GtkWidget * dummy,
 {
   GtkWidget *ad;
   GtkBuilder *builder;
-  char *filename;
-  struct GNUNET_FS_BlockOptions bo;
-  int do_index;
-  GtkSpinButton *sb;
+  GtkWindow *master_pubdialog;
+  
+  builder = GTK_BUILDER (data);
 
-  builder =
-      GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_publish_file_dialog.glade");
-  if (builder == NULL)
-  {
-    GNUNET_break (0);
-    return;
-  }
   ad = GTK_WIDGET (gtk_builder_get_object
                    (builder, "GNUNET_GTK_publish_file_dialog"));
   GNUNET_FS_GTK_setup_expiration_year_adjustment (builder);
-  if (GTK_RESPONSE_OK != gtk_dialog_run (GTK_DIALOG (ad)))
-  {
-    gtk_widget_destroy (ad);
-    g_object_unref (G_OBJECT (builder));
-    return;
-  }
-  filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (ad));
-  sb = GTK_SPIN_BUTTON (gtk_builder_get_object
-                        (builder,
-                         "GNUNET_GTK_publish_file_dialog_expiration_year_spin_button"));
-  bo.anonymity_level =
-      gtk_spin_button_get_value (GTK_SPIN_BUTTON
-                                 (gtk_builder_get_object
-                                  (builder,
-                                   "GNUNET_GTK_publish_file_dialog_anonymity_spin_button")));
-  bo.content_priority =
-      gtk_spin_button_get_value (GTK_SPIN_BUTTON
-                                 (gtk_builder_get_object
-                                  (builder,
-                                   "GNUNET_GTK_publish_file_dialog_priority_spin_button")));
-  bo.expiration_time = GNUNET_FS_GTK_get_expiration_time (sb);
-  bo.replication_level = 1;     /* FIXME... */
-  do_index =
-      gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
-                                    (gtk_builder_get_object
-                                     (builder,
-                                      "GNUNET_GTK_publish_file_dialog_do_index_checkbutton")));
-  add_file_at_iter (filename, &bo, do_index, NULL);
-  gtk_widget_destroy (ad);
-  g_object_unref (G_OBJECT (builder));
-  g_free (filename);
-  update_selectivity ();
+
+  master_pubdialog = GTK_WINDOW (gtk_builder_get_object (builder,
+      "GNUNET_GTK_master_publish_dialog"));
+  gtk_window_set_transient_for (GTK_WINDOW (ad), master_pubdialog);
+
+  gtk_window_present (GTK_WINDOW (ad));
 }
 
+struct edit_pub_cb_args
+{
+  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)
+{
+  struct edit_pub_cb_args *cbargs = (struct edit_pub_cb_args *) cls;
+  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);
+}
 
 void
 GNUNET_GTK_master_publish_dialog_edit_button_clicked_cb (GtkWidget * dummy,
@@ -1239,29 +1264,36 @@ GNUNET_GTK_master_publish_dialog_edit_button_clicked_cb (GtkWidget * dummy,
   GtkTreeView *tv;
   GtkTreeModel *tm;
   GtkTreeSelection *sel;
-  GtkTreeIter iter;
-  int do_index;
-  guint anonymity_level;
-  guint priority;
-  gchar *short_fn;
-  struct GNUNET_FS_FileInformation *fip;
+  struct edit_pub_cb_args *cbargs;
+  GtkBuilder *builder;
+  GtkWindow *master_pubdialog;
+
+  builder = GTK_BUILDER (data);
 
   tv = GTK_TREE_VIEW (gtk_builder_get_object
-                      (master_builder,
+                      (builder,
                        "GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
+
+  cbargs = g_new0 (struct edit_pub_cb_args, 1);
+  cbargs->tm = gtk_tree_view_get_model (tv);
+
+  master_pubdialog = GTK_WINDOW (gtk_builder_get_object (builder,
+      "GNUNET_GTK_master_publish_dialog"));
   sel = gtk_tree_view_get_selection (tv);
-  if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
+  if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &cbargs->iter))
   {
     GNUNET_break (0);
+    g_free (cbargs);
     return;
   }
-  gtk_tree_model_get (tm, &iter, 1, &do_index, 2, &short_fn, 3,
-                      &anonymity_level, 4, &priority, 5, &fip, -1);
-  GNUNET_FS_GTK_edit_publish_dialog (&do_index, &short_fn, &anonymity_level,
-                                     &priority, fip);
-  gtk_tree_store_set (GTK_TREE_STORE (tm), &iter, 1, do_index, 2, short_fn, 3,
-                      anonymity_level, 4, priority, -1);
-  g_free (short_fn);
+
+  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);
 }
 
 
@@ -1298,9 +1330,12 @@ GNUNET_GTK_master_publish_dialog_delete_button_clicked_cb (GtkWidget * dummy,
   GtkTreeSelection *sel;
   GtkTreeIter iter;
   struct GNUNET_FS_FileInformation *fip;
+  GtkBuilder *builder;
+  
+  builder = GTK_BUILDER (data);
 
   tv = GTK_TREE_VIEW (gtk_builder_get_object
-                      (master_builder,
+                      (builder,
                        "GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
   sel = gtk_tree_view_get_selection (tv);
   if (TRUE != gtk_tree_selection_get_selected (sel, &tm, &iter))
@@ -1311,65 +1346,69 @@ GNUNET_GTK_master_publish_dialog_delete_button_clicked_cb (GtkWidget * dummy,
   gtk_tree_model_get (tm, &iter, 5, &fip, -1);
   GNUNET_FS_file_information_destroy (fip, &free_fi_row_reference, NULL);
   gtk_tree_store_remove (GTK_TREE_STORE (tm), &iter);
-  update_selectivity ();
+  update_selectivity (data);
 }
 
-
 void
-GNUNET_GTK_master_publish_dialog_open_button_clicked_cb (GtkWidget * dummy,
-                                                         gpointer data)
+GNUNET_GTK_publish_directory_dialog_response_cb (GtkDialog *dialog,
+    gint response_id, gpointer user_data)
 {
-  GtkWidget *ad;
-  GtkBuilder *builder;
   char *filename;
   int do_index;
   GtkSpinButton *sb;
   struct GNUNET_FS_BlockOptions bo;
+  GtkWidget *ad;
+  GtkBuilder *builder;
+
+  builder = GTK_BUILDER (user_data);
 
-  builder =
-      GNUNET_GTK_get_new_builder
-      ("gnunet_fs_gtk_publish_directory_dialog.glade");
-  if (builder == NULL)
+  ad = GTK_WIDGET (gtk_builder_get_object (builder,
+      "GNUNET_GTK_publish_directory_dialog"));
+
+  if (response_id == -5)
   {
-    GNUNET_break (0);
-    return;
+    filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (ad));
+    sb = GTK_SPIN_BUTTON (gtk_builder_get_object (builder,
+        "GNUNET_GTK_publish_directory_dialog_expiration_year_spin_button"));
+    if (!GNUNET_GTK_get_selected_anonymity_level (builder,
+        "GNUNET_GTK_publish_directory_dialog_anonymity_combobox",
+        &bo.anonymity_level))
+      bo.anonymity_level = 1;
+    bo.content_priority = gtk_spin_button_get_value (GTK_SPIN_BUTTON (
+        gtk_builder_get_object (builder,
+        "GNUNET_GTK_publish_directory_dialog_priority_spin_button")));
+    bo.expiration_time = GNUNET_FS_GTK_get_expiration_time (sb);
+    do_index = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (
+        gtk_builder_get_object (builder,
+        "GNUNET_GTK_publish_directory_dialog_do_index_checkbutton")));
+
+    /* FIXME: open progress dialog here... */
+    add_dir (user_data, filename, &bo, do_index);
+    g_free (filename);
+    update_selectivity (user_data);
   }
+  gtk_widget_hide (ad);
+}
+
+
+void
+GNUNET_GTK_master_publish_dialog_open_button_clicked_cb (GtkWidget * dummy,
+                                                         gpointer data)
+{
+  GtkWidget *ad;
+  GtkBuilder *builder;
+  GtkWindow *master_pubdialog;
+  
+  builder = GTK_BUILDER (data);
   GNUNET_FS_GTK_setup_expiration_year_adjustment (builder);
   ad = GTK_WIDGET (gtk_builder_get_object
                    (builder, "GNUNET_GTK_publish_directory_dialog"));
-  if (GTK_RESPONSE_OK != gtk_dialog_run (GTK_DIALOG (ad)))
-  {
-    gtk_widget_destroy (ad);
-    g_object_unref (G_OBJECT (builder));
-    return;
-  }
-  filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (ad));
-  sb = GTK_SPIN_BUTTON (gtk_builder_get_object
-                        (builder,
-                         "GNUNET_GTK_publish_directory_dialog_expiration_year_spin_button"));
-  bo.anonymity_level =
-      gtk_spin_button_get_value (GTK_SPIN_BUTTON
-                                 (gtk_builder_get_object
-                                  (builder,
-                                   "GNUNET_GTK_publish_directory_dialog_anonymity_spin_button")));
-  bo.content_priority =
-      gtk_spin_button_get_value (GTK_SPIN_BUTTON
-                                 (gtk_builder_get_object
-                                  (builder,
-                                   "GNUNET_GTK_publish_directory_dialog_priority_spin_button")));
-  bo.expiration_time = GNUNET_FS_GTK_get_expiration_time (sb);
-  do_index =
-      gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
-                                    (gtk_builder_get_object
-                                     (builder,
-                                      "GNUNET_GTK_publish_directory_dialog_do_index_checkbutton")));
-
-  gtk_widget_destroy (ad);
-  g_object_unref (G_OBJECT (builder));
-  /* FIXME: open progress dialog here... */
-  add_dir (filename, &bo, do_index);
-  g_free (filename);
-  update_selectivity ();
+
+  master_pubdialog = GTK_WINDOW (gtk_builder_get_object (builder,
+      "GNUNET_GTK_master_publish_dialog"));
+  gtk_window_set_transient_for (GTK_WINDOW (ad), master_pubdialog);
+
+  gtk_window_present (GTK_WINDOW (ad));
 }
 
 
@@ -1598,52 +1637,58 @@ free_file_information_tree_store (GtkTreeModel * tm, GtkTreeIter * iter)
   }
 }
 
-
-/**
- */
 void
-GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy, gpointer data)
+GNUNET_GTK_master_publish_dialog_realize_cb (GtkWidget *widget,
+    gpointer user_data)
 {
-  GtkWidget *ad;
-  GtkTreeStore *ts;
-  gint ret;
   GtkTreeView *tv;
   GtkTreeSelection *sel;
-  GtkTreeIter iter;
-  struct GNUNET_FS_FileInformation *fi;
-  GtkTreeModel *tm;
-  GtkTreeModel *ptm;
-  struct GNUNET_FS_Namespace *namespace;
-  gchar *namespace_id;
-  gchar *namespace_uid;
+  GtkBuilder *builder;
+  
+  builder = GTK_BUILDER (user_data);
 
-  GNUNET_assert (master_builder == NULL);
-  master_builder =
-      GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_publish_dialog.glade");
-  if (master_builder == NULL)
-    return;
   tv = GTK_TREE_VIEW (gtk_builder_get_object
-                      (master_builder,
+                      (builder,
                        "GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
   sel = gtk_tree_view_get_selection (tv);
   g_signal_connect (G_OBJECT (sel), "changed",
-                    G_CALLBACK (selection_changed_cb), NULL);
-  ad = GTK_WIDGET (gtk_builder_get_object
-                   (master_builder, "GNUNET_GTK_master_publish_dialog"));
-  ts = GTK_TREE_STORE (gtk_builder_get_object
-                       (master_builder, "GNUNET_GTK_pseudonym_tree_store"));
-  GNUNET_FS_namespace_list (GNUNET_FS_GTK_get_fs_handle (),
-                            &add_namespace_to_ts, ts);
-  tm = GTK_TREE_MODEL (gtk_builder_get_object
-                       (master_builder,
-                        "GNUNET_GTK_file_sharing_publishing_tree_store"));
+                    G_CALLBACK (selection_changed_cb), user_data);
   tv = GTK_TREE_VIEW (gtk_builder_get_object
-                      (master_builder,
+                      (builder,
                        "GNUNET_GTK_master_publish_dialog_pseudonym_tree_view"));
   sel = gtk_tree_view_get_selection (tv);
   g_signal_connect (G_OBJECT (sel), "changed",
-                    G_CALLBACK (selection_changed_cb), NULL);
-  ret = gtk_dialog_run (GTK_DIALOG (ad));
+                    G_CALLBACK (selection_changed_cb), user_data);
+}
+
+void
+hide_master_publish_dialog (gpointer user_data, gint ret)
+{
+  GtkTreeView *tv, *ptv;
+  GtkTreeSelection *sel;
+  GtkTreeModel *tm, *ptm;
+  GtkTreeIter iter;
+  gpointer namespace;
+  gchar *namespace_id;
+  gchar *namespace_uid;
+  struct GNUNET_FS_FileInformation *fi;
+  GtkWidget *ad;
+  GtkBuilder *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"));
+  sel = gtk_tree_view_get_selection (ptv);
+  ptm = gtk_tree_view_get_model (ptv);
+
+  tv = GTK_TREE_VIEW (gtk_builder_get_object
+                      (builder,
+                       "GNUNET_GTK_master_publish_dialog_file_information_tree_view"));
+  tm = gtk_tree_view_get_model (tv);
+  
   if (ret == GTK_RESPONSE_OK)
   {
     if (TRUE == gtk_tree_selection_get_selected (sel, &ptm, &iter))
@@ -1666,14 +1711,10 @@ GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy, gpointer data)
                                  GNUNET_FS_PUBLISH_OPTION_NONE);
       }
       while (gtk_tree_model_iter_next (tm, &iter));
-    if (namespace_id != NULL)
-      g_free (namespace_id);
-    if (namespace_uid != NULL)
-      g_free (namespace_uid);
+    g_free (namespace_id);
+    g_free (namespace_uid);
   }
-  ptm =
-      GTK_TREE_MODEL (gtk_builder_get_object
-                      (master_builder, "GNUNET_GTK_pseudonym_tree_store"));
+
   /* free state from 'ptm' */
   if (TRUE == gtk_tree_model_get_iter_first (ptm, &iter))
     do
@@ -1681,6 +1722,7 @@ GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy, gpointer data)
       free_pseudonym_tree_store (ptm, &iter);
     }
     while (TRUE == gtk_tree_model_iter_next (ptm, &iter));
+  gtk_tree_store_clear (GTK_TREE_STORE (ptm));
 
   /* free state from 'tm' */
   if (TRUE == gtk_tree_model_get_iter_first (tm, &iter))
@@ -1689,10 +1731,100 @@ GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy, gpointer data)
       free_file_information_tree_store (tm, &iter);
     }
     while (TRUE == gtk_tree_model_iter_next (tm, &iter));
+  gtk_tree_store_clear (GTK_TREE_STORE (tm));
+
+  gtk_widget_hide (ad);
+}
+
+void
+GNUNET_GTK_master_publish_dialog_execute_button_clicked_cb (GtkButton *button,
+    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)
+{
+  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)
+{
+  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)
+{
+  char *filename;
+  struct GNUNET_FS_BlockOptions bo;
+  int do_index;
+  GtkSpinButton *sb;
+  GtkWidget *ad;
+
+  GtkBuilder *builder = GTK_BUILDER (user_data);
+
+  ad = GTK_WIDGET (gtk_builder_get_object (builder,
+      "GNUNET_GTK_publish_file_dialog"));
+
+  if (response_id == -5)
+  {
+    /* OK */
+    filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (ad));
+    sb = GTK_SPIN_BUTTON (gtk_builder_get_object (builder,
+        "GNUNET_GTK_publish_file_dialog_expiration_year_spin_button"));
+
+    if (!GNUNET_GTK_get_selected_anonymity_level (builder,
+        "GNUNET_GTK_publish_file_dialog_anonymity_combobox", &bo.anonymity_level))
+      bo.anonymity_level = 1;
+    bo.content_priority = gtk_spin_button_get_value (GTK_SPIN_BUTTON (
+        gtk_builder_get_object (builder,
+        "GNUNET_GTK_publish_file_dialog_priority_spin_button")));
+    bo.expiration_time = GNUNET_FS_GTK_get_expiration_time (sb);
+    bo.replication_level = 1;     /* FIXME... */
+    do_index = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (
+        gtk_builder_get_object (builder,
+        "GNUNET_GTK_publish_file_dialog_do_index_checkbutton")));
+    add_file_at_iter (user_data, filename, &bo, do_index, NULL);
+    g_free (filename);
+    update_selectivity (user_data);
+  }
+  else
+  {
+    /* Cancel/Escape/close/etc */
+  }
+  gtk_widget_hide (ad);
+}
+
+/**
+ */
+void
+GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy, gpointer data)
+{
+  GtkWidget *ad;
+  GtkTreeStore *ts;
+  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,
+        "GNUNET_GTK_pseudonym_tree_store"));
+    GNUNET_FS_namespace_list (GNUNET_FS_GTK_get_fs_handle (),
+        &add_namespace_to_ts, ts);
+  }
 
-  gtk_widget_destroy (ad);
-  g_object_unref (G_OBJECT (master_builder));
-  master_builder = NULL;
+  gtk_window_present (GTK_WINDOW (ad));
 }