1 files changed, 2 insertions, 12 deletions

diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index 73160fdd..914c62f5 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -1396,7 +1396,6 @@ GNUNET_GTK_master_publish_dialog_add_button_clicked_cb (GtkWidget * dummy,
   struct MainPublishingDialogContext *ctx = user_data;
   GtkWidget *ad;
   GtkComboBox *combo;
-  GtkTreeModel *anon_treemodel;
 
   /* FIXME-UGLY: should we use a fresh, specific context for this dialog?
      FIXME-BUG: how does this right now prevent two dialogs from being opened?
@@ -1416,13 +1415,10 @@ GNUNET_GTK_master_publish_dialog_add_button_clicked_cb (GtkWidget * dummy,
   
   ctx->open_file_handler_id = g_signal_connect (G_OBJECT (ad), "response",
                                                 G_CALLBACK (publish_file_dialog_response_cb), ctx);
-
-  /* FIXME-BUG-MAYBE: possibly bad sharing of the anonymity tree model */
-  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_combo_box_set_model (combo, 
+                           GNUNET_FS_GTK_get_anonymity_level_list_store ());
   
   /* show dialog */
   gtk_window_set_transient_for (GTK_WINDOW (ad), ctx->master_pubdialog);
@@ -1589,10 +1585,7 @@ GNUNET_GTK_master_publish_dialog_edit_button_clicked_cb (GtkWidget * dummy,
 {
   struct MainPublishingDialogContext *ctx = user_data;
   struct EditPublishContext *epc;
-  GtkListStore *anon_liststore;
 
-  anon_liststore = GTK_LIST_STORE (gtk_builder_get_object (ctx->main_window_builder, 
-                                                           "main_window_search_anonymity_liststore"));
   epc = GNUNET_malloc (sizeof (struct EditPublishContext));
   epc->tm = ctx->file_info_treemodel;
   if (! gtk_tree_selection_get_selected (ctx->file_info_selection, NULL, &epc->iter))
@@ -1605,12 +1598,9 @@ GNUNET_GTK_master_publish_dialog_edit_button_clicked_cb (GtkWidget * dummy,
                       &epc->iter,
                       5, &epc->fip, 
                       -1);
-  /* FIXME-UGLY: can we just give our anon_liststore out like this? What about
-     (unintended) sharing of state? */
   GNUNET_FS_GTK_edit_publish_dialog (ctx->master_pubdialog, 
                                      epc->fip, 
                                      GNUNET_YES, 
-                                     anon_liststore,
                                      &master_publish_edit_publish_dialog_cb,
                                      epc);
 }