1 files changed, 35 insertions, 15 deletions

diff --git a/src/fs/gnunet-fs-gtk-main_window_open_directory.c b/src/fs/gnunet-fs-gtk-main_window_open_directory.c
index ae3b7d0b..23e71fc6 100644
--- a/src/fs/gnunet-fs-gtk-main_window_open_directory.c
+++ b/src/fs/gnunet-fs-gtk-main_window_open_directory.c
@@ -85,6 +85,34 @@ add_child (void *cls, const char *filename, const struct GNUNET_FS_Uri *uri,
                                                meta, NULL, 0));
 }
 
+void
+GNUNET_GTK_open_directory_dialog_response_cb (GtkDialog *dialog,
+    gint response_id, gpointer user_data)
+{
+  GtkBuilder *builder;
+  GtkWidget *ad;
+  char *filename;
+  struct AddChildContext acc;
+
+  builder = GTK_BUILDER (user_data);
+  ad = GTK_WIDGET (gtk_builder_get_object
+                   (builder, "GNUNET_GTK_open_directory_dialog"));
+
+  if (response_id != -5)
+  {
+    gtk_widget_destroy (ad);
+    g_object_unref (G_OBJECT (builder));
+    return;
+  }
+
+  filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (ad));
+  gtk_widget_destroy (ad);
+  g_object_unref (G_OBJECT (builder));
+  acc.filename = filename;
+  acc.ts = NULL;
+  GNUNET_FS_GTK_mmap_and_scan (filename, &add_child, &acc);
+  g_free (filename);
+}
 
 /**
  * User selected "Open directory" in menu.  Display dialog, open
@@ -94,12 +122,12 @@ void
 GNUNET_GTK_main_menu_file_open_gnunet_directory_activate_cb (GtkWidget * dummy,
                                                              gpointer data)
 {
-  struct AddChildContext acc;
   GtkWidget *ad;
   GtkBuilder *builder;
-  char *filename;
+  GtkWidget *toplevel;
   GtkFileFilter *ff;
 
+
   builder =
       GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_open_directory_dialog.glade");
   if (builder == NULL)
@@ -113,19 +141,11 @@ GNUNET_GTK_main_menu_file_open_gnunet_directory_activate_cb (GtkWidget * dummy,
                         (builder, "gnunet_directory_filter"));
   /* FIXME: some day, write a custom file filter for gnunet-directories... */
   gtk_file_filter_add_pattern (ff, "*" GNUNET_FS_DIRECTORY_EXT);
-  if (GTK_RESPONSE_OK != gtk_dialog_run (GTK_DIALOG (ad)))
-  {
-    gtk_widget_destroy (ad);
-    g_object_unref (G_OBJECT (builder));
-    return;
-  }
-  filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (ad));
-  gtk_widget_destroy (ad);
-  g_object_unref (G_OBJECT (builder));
-  acc.filename = filename;
-  acc.ts = NULL;
-  GNUNET_FS_GTK_mmap_and_scan (filename, &add_child, &acc);
-  g_free (filename);
+
+  toplevel = gtk_widget_get_toplevel (dummy);
+  if (GTK_IS_WINDOW (toplevel))
+    gtk_window_set_transient_for (GTK_WINDOW (ad), GTK_WINDOW (toplevel));
+  gtk_window_present (GTK_WINDOW (ad));
 }
 
 /* end of gnunet-fs-gtk-main_window_open_directory.c */