1 files changed, 48 insertions, 38 deletions

diff --git a/src/gns/gnunet-gns-gtk.c b/src/gns/gnunet-gns-gtk.c
index a9c451f0..4751f24a 100644
--- a/src/gns/gnunet-gns-gtk.c
+++ b/src/gns/gnunet-gns-gtk.c
@@ -61,7 +61,7 @@ static char *zone_as_string;
  */
 static char *zonefile_directory;
 
-GtkWidget *main_window;
+static GtkWidget *main_window;
 
 /**
  * Get cfg.
@@ -129,6 +129,38 @@ GNUNET_GNS_GTK_new_imagemenuitem_activate_cb (GtkMenuItem *menuitem,
   GNUNET_break (0); // FIXME, not implemented
 }
 
+
+/**
+ * Function called from the open-directory dialog upon completion.
+ *
+ * @param dialog the pseudonym selection dialog
+ * @param response_id response code from the dialog
+ * @param user_data the builder of the dialog
+ */
+void
+GNUNET_GNS_GTK_zone_open_dialog_response_cb (GtkDialog * dialog,
+                                             gint response_id,
+                                             gpointer user_data)
+{
+  GtkBuilder *builder = user_data;
+  char *filename;
+
+  if (GTK_RESPONSE_OK != response_id)
+  {
+    gtk_widget_destroy (GTK_WIDGET (dialog));
+    g_object_unref (G_OBJECT (builder));
+    return;
+  }
+  filename = GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (dialog));
+  gtk_widget_destroy (GTK_WIDGET (dialog));
+  g_object_unref (G_OBJECT (builder));
+
+  /* FIXME: move to new zone 'filename' */
+  fprintf (stderr, "Got zone `%s'\n", filename);
+  GNUNET_free (filename);  
+}
+
+
 /**
  * The user selected 'OPEN' in the menu.  Open a dialog to select
  * a different zonefile (for editing).
@@ -140,45 +172,23 @@ void
 GNUNET_GNS_GTK_open_imagemenuitem_activate_cb (GtkMenuItem *menuitem,
                                                gpointer user_data)
 {
-  GtkWidget *dialog;
-  dialog = gtk_file_chooser_dialog_new ("Open zone file...",
-                                        main_window,
-                                        GTK_FILE_CHOOSER_ACTION_OPEN,
-                                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                        GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-                                        NULL);
-  if (NULL != zonefile_directory)
-    gtk_file_chooser_set_current_folder (dialog, zonefile_directory);
-  if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+  GtkWidget *ad;
+  GtkBuilder *builder;
+  GtkWidget *toplevel;
+
+  builder =
+    GNUNET_GTK_get_new_builder ("gnunet_gns_gtk_zone_open.glade", NULL);
+  if (NULL == builder)
   {
-    char *filename;
-    filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                _("Opening `%s'\n"), filename);
-    if (NULL != zone_pkey)
-    {
-      GNUNET_CRYPTO_rsa_key_free(zone_pkey);
-      zone_pkey = GNUNET_CRYPTO_rsa_key_create_from_file(filename);
-      if (NULL == zone_pkey)
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    _("Not a valid zone file `%s'\n"), filename);
-
-        GtkWidget *err_dialog;
-        err_dialog = gtk_message_dialog_new (main_window,
-                                         GTK_DIALOG_DESTROY_WITH_PARENT,
-                                         GTK_MESSAGE_ERROR,
-                                         GTK_BUTTONS_CLOSE,
-                                         _("Error loading file '%s':\n not a valid zone file"),
-                                         filename);
-        gtk_dialog_run (GTK_DIALOG (err_dialog));
-        gtk_widget_destroy (err_dialog);
-      }
-      //if (zone_pkey = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);)
-    }
-    g_free (filename);
+    GNUNET_break (0);
+    return;
   }
-  gtk_widget_destroy (dialog);
+  ad = GTK_WIDGET (gtk_builder_get_object
+                   (builder, "GNUNET_GNS_GTK_zone_open_filechooserdialog"));
+  toplevel = gtk_widget_get_toplevel (menuitem);
+  if (GTK_IS_WINDOW (toplevel))
+    gtk_window_set_transient_for (GTK_WINDOW (ad), GTK_WINDOW (toplevel));
+  gtk_window_present (GTK_WINDOW (ad));
 }