1 files changed, 22 insertions, 14 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 18be9531..e8003acf 100644
--- a/src/fs/gnunet-fs-gtk-main_window_file_publish.c
+++ b/src/fs/gnunet-fs-gtk-main_window_file_publish.c
@@ -50,6 +50,7 @@ struct MainPublishingDialogContext
   GtkWindow *master_pubdialog;
 
   gulong open_directory_handler_id;
+  GtkBuilder *open_directory_builder;
   gulong open_file_handler_id;
 };
 
@@ -1294,40 +1295,38 @@ GNUNET_GTK_publish_directory_dialog_response_cb (GtkDialog * dialog,
   GtkSpinButton *sb;
   struct GNUNET_FS_BlockOptions bo;
   GtkWidget *ad;
-  GtkBuilder *builder;
 
   if (g_signal_handler_is_connected (G_OBJECT (dialog), ctx->open_directory_handler_id))
     g_signal_handler_disconnect (G_OBJECT (dialog), ctx->open_directory_handler_id);
   ctx->open_directory_handler_id = 0;
 
-  builder = ctx->main_window_builder;
   ad = GTK_WIDGET (gtk_builder_get_object
-                   (builder, "GNUNET_GTK_publish_directory_dialog"));
+                   (ctx->open_directory_builder, "GNUNET_GTK_publish_directory_dialog"));
   if (response_id == -5)
   {
     filename = GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (ad));
     sb = GTK_SPIN_BUTTON (gtk_builder_get_object
-                          (builder,
+                          (ctx->open_directory_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",
+        (ctx->open_directory_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,
+                                    (ctx->open_directory_builder,
                                      "GNUNET_GTK_publish_directory_dialog_priority_spin_button")));
     bo.replication_level = 
       gtk_spin_button_get_value (GTK_SPIN_BUTTON
                                  (gtk_builder_get_object
-                                  (builder,
+                                  (ctx->open_directory_builder,
                                    "GNUNET_GTK_publish_directory_dialog_replication_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,
+                                       (ctx->open_directory_builder,
                                         "GNUNET_GTK_publish_directory_dialog_do_index_checkbutton")));
 
     /* FIXME: open progress dialog here... */
@@ -1335,7 +1334,8 @@ GNUNET_GTK_publish_directory_dialog_response_cb (GtkDialog * dialog,
     g_free (filename);
     update_selectivity (ctx);
   }
-  gtk_widget_hide (ad);
+  gtk_widget_destroy (ad);
+  g_object_unref (G_OBJECT (ctx->open_directory_builder));
 }
 
 
@@ -1344,15 +1344,23 @@ GNUNET_GTK_master_publish_dialog_open_button_clicked_cb (GtkWidget * dummy,
                                                          struct MainPublishingDialogContext *ctx)
 {
   GtkWidget *ad;
-  GtkBuilder *builder;
 
-  builder = ctx->main_window_builder;
-  GNUNET_FS_GTK_setup_expiration_year_adjustment (builder);
+  GtkComboBox *combo;
+  GtkTreeModel *anon_treemodel;
+
+  ctx->open_directory_builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_publish_directory_dialog.glade", ctx);
+  GNUNET_FS_GTK_setup_expiration_year_adjustment (ctx->open_directory_builder);
   ad = GTK_WIDGET (gtk_builder_get_object
-                   (builder, "GNUNET_GTK_publish_directory_dialog"));
+                   (ctx->open_directory_builder, "GNUNET_GTK_publish_directory_dialog"));
 
   ctx->open_directory_handler_id = g_signal_connect (G_OBJECT (ad), "response", G_CALLBACK (GNUNET_GTK_publish_directory_dialog_response_cb), ctx);
 
+  anon_treemodel = GTK_TREE_MODEL (gtk_builder_get_object (ctx->main_window_builder,
+      "main_window_search_anonymity_liststore"));
+  combo = GTK_COMBO_BOX (gtk_builder_get_object (ctx->open_directory_builder,
+      "GNUNET_GTK_publish_directory_dialog_anonymity_combobox"));
+  gtk_combo_box_set_model (combo, anon_treemodel);
+
   gtk_window_set_transient_for (GTK_WINDOW (ad), ctx->master_pubdialog);
 
   gtk_window_present (GTK_WINDOW (ad));
@@ -1659,7 +1667,7 @@ hide_master_publish_dialog (struct MainPublishingDialogContext *ctx, gint ret)
     while (TRUE == gtk_tree_model_iter_next (ctx->file_info_treemodel, &iter));
   gtk_tree_store_clear (GTK_TREE_STORE (ctx->file_info_treemodel));
   gtk_widget_destroy (GTK_WIDGET (ctx->master_pubdialog));
-  gtk_object_unref (GTK_OBJECT (ctx->builder));
+  g_object_unref (G_OBJECT (ctx->builder));
   GNUNET_free (ctx);
 }