1 files changed, 20 insertions, 11 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 da3d6c4d..6791e61b 100644
--- a/src/fs/gnunet-fs-gtk-main_window_file_publish.c
+++ b/src/fs/gnunet-fs-gtk-main_window_file_publish.c
@@ -51,6 +51,7 @@ struct MainPublishingDialogContext
 
   gulong open_directory_handler_id;
   GtkBuilder *open_directory_builder;
+  GtkBuilder *open_file_builder;
   gulong open_file_handler_id;
 };
 
@@ -1150,12 +1151,22 @@ GNUNET_GTK_master_publish_dialog_add_button_clicked_cb (GtkWidget * dummy,
 {
   GtkWidget *ad;
 
+  GtkComboBox *combo;
+  GtkTreeModel *anon_treemodel;
+
+  ctx->open_file_builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_publish_file_dialog.glade", ctx);
+  GNUNET_FS_GTK_setup_expiration_year_adjustment (ctx->open_file_builder);
   ad = GTK_WIDGET (gtk_builder_get_object
-                   (ctx->main_window_builder, "GNUNET_GTK_publish_file_dialog"));
-  GNUNET_FS_GTK_setup_expiration_year_adjustment (ctx->main_window_builder);
+                   (ctx->open_file_builder, "GNUNET_GTK_publish_file_dialog"));
 
   ctx->open_file_handler_id = g_signal_connect (G_OBJECT (ad), "response", G_CALLBACK (GNUNET_GTK_publish_file_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_file_builder,
+      "GNUNET_GTK_publish_file_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));
@@ -1709,41 +1720,39 @@ GNUNET_GTK_publish_file_dialog_response_cb (GtkDialog * dialog,
   GtkSpinButton *sb;
   GtkWidget *ad;
 
-  GtkBuilder *builder = ctx->main_window_builder;
-
   if (g_signal_handler_is_connected (G_OBJECT (dialog), ctx->open_file_handler_id))
     g_signal_handler_disconnect (G_OBJECT (dialog), ctx->open_file_handler_id);
   ctx->open_file_handler_id = 0;
 
   ad = GTK_WIDGET (gtk_builder_get_object
-                   (builder, "GNUNET_GTK_publish_file_dialog"));
+                   (ctx->open_file_builder, "GNUNET_GTK_publish_file_dialog"));
 
   if (response_id == -5)
   {
     /* OK */
     sb = GTK_SPIN_BUTTON (gtk_builder_get_object
-                          (builder,
+                          (ctx->open_file_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",
+        (ctx->open_file_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,
+                                    (ctx->open_file_builder,
                                      "GNUNET_GTK_publish_file_dialog_priority_spin_button")));
     bo.expiration_time = GNUNET_FS_GTK_get_expiration_time (sb);
     bo.replication_level =
       gtk_spin_button_get_value (GTK_SPIN_BUTTON
                                  (gtk_builder_get_object
-                                  (builder,
+                                  (ctx->open_file_builder,
                                    "GNUNET_GTK_publish_file_dialog_replication_spin_button")));
     do_index =
         gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
                                       (gtk_builder_get_object
-                                       (builder,
+                                       (ctx->open_file_builder,
                                         "GNUNET_GTK_publish_file_dialog_do_index_checkbutton")));
 
     filename = GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (ad));
@@ -1755,7 +1764,7 @@ GNUNET_GTK_publish_file_dialog_response_cb (GtkDialog * dialog,
   {
     /* Cancel/Escape/close/etc */
   }
-  gtk_widget_hide (ad);
+  gtk_widget_destroy (ad);
 }