1 files changed, 4 insertions, 13 deletions

diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index 15c6767b..73160fdd 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -1259,7 +1259,6 @@ publish_directory_dialog_response_cb (GtkDialog * dialog,
                                       gpointer user_data)
 {
   struct MainPublishingDialogContext *ctx = user_data;
-  GtkWidget *ad;
 
   /* FIXME-UGLY: how about using a separate closure and not needing this mess? 
      In fact, even without it I don't see why we need to disconnect the handler... */
@@ -1267,16 +1266,13 @@ publish_directory_dialog_response_cb (GtkDialog * dialog,
     g_signal_handler_disconnect (G_OBJECT (dialog), ctx->open_directory_handler_id);
   ctx->open_directory_handler_id = 0;
 
-  ad = GTK_WIDGET (gtk_builder_get_object
-                   (ctx->open_directory_builder,
-                    "GNUNET_GTK_publish_directory_dialog"));
   if (response_id == -5 /* OK */)
   {
     char *filename;
     int do_index;
     struct GNUNET_FS_BlockOptions bo;
 
-    filename = GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (ad));
+    filename = GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (dialog));
     if (! GNUNET_GTK_get_selected_anonymity_level
         (ctx->open_directory_builder, 
          "GNUNET_GTK_publish_directory_dialog_anonymity_combobox",
@@ -1311,8 +1307,7 @@ publish_directory_dialog_response_cb (GtkDialog * dialog,
     scan_file_or_directory (ctx, filename, &bo, do_index);
     g_free (filename);
   }
-  /* FIXME: do we need to do widget-destroy + builder destroy? */
-  gtk_widget_destroy (ad);
+  gtk_widget_destroy (GTK_WIDGET (dialog));
   g_object_unref (G_OBJECT (ctx->open_directory_builder));
   ctx->open_directory_builder = NULL;
 }
@@ -1331,7 +1326,6 @@ publish_file_dialog_response_cb (GtkDialog * dialog,
                                  gpointer user_data)
 {
   struct MainPublishingDialogContext *ctx = user_data;
-  GtkWidget *ad;
 
   /* FIXME-UGLY: how about using a separate closure and not needing this mess? 
      In fact, even without it I don't see why we need to disconnect the handler... */
@@ -1339,15 +1333,13 @@ publish_file_dialog_response_cb (GtkDialog * dialog,
     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
-                   (ctx->open_file_builder, "GNUNET_GTK_publish_file_dialog"));
   if (response_id == -5 /* OK */)
   {
     char *filename;
     struct GNUNET_FS_BlockOptions bo;
     int do_index;
 
-    filename = GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (ad));
+    filename = GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (dialog));
     if (!GNUNET_GTK_get_selected_anonymity_level
         (ctx->open_file_builder, "GNUNET_GTK_publish_file_dialog_anonymity_combobox",
          &bo.anonymity_level))
@@ -1382,8 +1374,7 @@ publish_file_dialog_response_cb (GtkDialog * dialog,
     scan_file_or_directory (ctx, filename, &bo, do_index);
     g_free (filename);
   }
-  /* FIXME: do we need to do widget-destroy + builder destroy? */
-  gtk_widget_destroy (ad);
+  gtk_widget_destroy (GTK_WIDGET (dialog));
   g_object_unref (G_OBJECT (ctx->open_file_builder));
   ctx->open_file_builder = NULL;
 }