1 files changed, 39 insertions, 34 deletions

diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index 4f33fc62..20a05400 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -1215,10 +1215,10 @@ scan_file_or_directory (struct MainPublishingDialogContext *ctx,
  * @param response_id result of the dialog ("-5" means to "run")
  * @param user_data master publishing dialog context of our window
  */
-static void
-publish_directory_dialog_response_cb (GtkDialog * dialog,
-                                      gint response_id,
-                                      gpointer user_data)
+void
+GNUNET_GTK_publish_directory_dialog_response_cb (GtkDialog * dialog,
+                                                 gint response_id,
+                                                 gpointer user_data)
 {
   struct MainPublishingDialogContext *ctx = user_data;
 
@@ -1276,10 +1276,10 @@ publish_directory_dialog_response_cb (GtkDialog * dialog,
  * @param response_id result of the dialog ("-5" means to "run")
  * @param user_data master publishing dialog context of our window
  */
-static void
-publish_file_dialog_response_cb (GtkDialog * dialog,
-                                 gint response_id,
-                                 gpointer user_data)
+void
+GNUNET_GTK_publish_file_dialog_response_cb (GtkDialog * dialog,
+                                            gint response_id,
+                                            gpointer user_data)
 {
   struct MainPublishingDialogContext *ctx = user_data;
 
@@ -1344,13 +1344,9 @@ GNUNET_GTK_master_publish_dialog_add_button_clicked_cb (GtkWidget * dummy,
                                                          gpointer user_data)
 {
   struct MainPublishingDialogContext *ctx = user_data;
-  GtkWidget *ad;
-  GtkComboBox *combo;
 
   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->open_file_builder, "GNUNET_GTK_publish_file_dialog"));
 
   /* FIXME-FEATURE: Use some kind of adjustable defaults instead of 1000, 0 and TRUE */
   gtk_spin_button_set_value (GTK_SPIN_BUTTON (gtk_builder_get_object (ctx->open_file_builder,
@@ -1360,17 +1356,24 @@ GNUNET_GTK_master_publish_dialog_add_button_clicked_cb (GtkWidget * dummy,
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (ctx->open_file_builder,
                                                                            "GNUNET_GTK_publish_file_dialog_do_index_checkbutton")), TRUE);
 
-  /* FIXME-STYLE: automatically connect using glade  instead */
-  g_signal_connect (G_OBJECT (ad), "response",
-                    G_CALLBACK (publish_file_dialog_response_cb), ctx);
-  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, 
-                           GNUNET_FS_GTK_get_anonymity_level_list_store ());
-  
+  {
+    GtkComboBox *combo;
+    
+    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, 
+                             GNUNET_FS_GTK_get_anonymity_level_list_store ());
+  }
+
   /* show dialog */
-  gtk_window_set_transient_for (GTK_WINDOW (ad), ctx->master_pubdialog);
-  gtk_window_present (GTK_WINDOW (ad));
+  {
+    GtkWidget *ad;
+
+    ad = GTK_WIDGET (gtk_builder_get_object
+                     (ctx->open_file_builder, "GNUNET_GTK_publish_file_dialog"));
+    gtk_window_set_transient_for (GTK_WINDOW (ad), ctx->master_pubdialog);
+    gtk_window_present (GTK_WINDOW (ad));
+  }
 }
 
 
@@ -1388,8 +1391,6 @@ GNUNET_GTK_master_publish_dialog_open_button_clicked_cb (GtkWidget * dummy,
                                                          gpointer user_data)
 {
   struct MainPublishingDialogContext *ctx = user_data;
-  GtkWidget *ad;
-  GtkComboBox *combo;
 
   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);
@@ -1402,19 +1403,23 @@ GNUNET_GTK_master_publish_dialog_open_button_clicked_cb (GtkWidget * dummy,
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (ctx->open_directory_builder,
                                                                            "GNUNET_GTK_publish_directory_dialog_do_index_checkbutton")), TRUE);
 
-  ad = GTK_WIDGET (gtk_builder_get_object
-                   (ctx->open_directory_builder, "GNUNET_GTK_publish_directory_dialog"));
+  {
+    GtkComboBox *combo;
 
-  /* FIXME-STYLE: automatically connect using glade  instead */
-  g_signal_connect (G_OBJECT (ad), "response",
-                    G_CALLBACK (publish_directory_dialog_response_cb), ctx);
-  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, GNUNET_FS_GTK_get_anonymity_level_list_store ());
+    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, GNUNET_FS_GTK_get_anonymity_level_list_store ());
+  }
 
   /* show dialog */
-  gtk_window_set_transient_for (GTK_WINDOW (ad), ctx->master_pubdialog);
-  gtk_window_present (GTK_WINDOW (ad));
+  {
+    GtkWidget *ad;
+
+    ad = GTK_WIDGET (gtk_builder_get_object
+                     (ctx->open_directory_builder, "GNUNET_GTK_publish_directory_dialog"));
+    gtk_window_set_transient_for (GTK_WINDOW (ad), ctx->master_pubdialog);
+    gtk_window_present (GTK_WINDOW (ad));
+  }
 }