1 files changed, 114 insertions, 40 deletions

diff --git a/src/fs/gnunet-fs-gtk-download.c b/src/fs/gnunet-fs-gtk-download.c
index fe239e5a..d9451e1c 100644
--- a/src/fs/gnunet-fs-gtk-download.c
+++ b/src/fs/gnunet-fs-gtk-download.c
@@ -27,65 +27,74 @@
 #include "gnunet-fs-gtk.h"
 #include "gnunet-fs-gtk-event_handler.h"
 
+struct dialog_context
+{
+  GtkBuilder *builder;
+  GtkWidget *dialog;
+  gint response;
+  struct DownloadContext *dc;
+};
 
 void
-GNUNET_FS_GTK_open_download_as_dialog (struct DownloadContext *dc)
+GNUNET_GTK_save_as_dialog_ok_button_clicked_cb (GtkButton *button,
+    gpointer user_data)
 {
-  GtkWidget *ad;
-  GtkBuilder *builder;
-  struct GNUNET_FS_Handle *fs;
-  uint64_t len;
+  return;
+  struct dialog_context *dlc = NULL;
+  dlc = g_object_get_data (G_OBJECT (button), "dialog-context");
+  if (dlc != NULL)
+    dlc->response = 1;
+}
+
+void
+GNUNET_GTK_save_as_dialog_cancel_button_clicked_cb (GtkButton *button,
+    gpointer user_data)
+{
+  return;
+  struct dialog_context *dlc = NULL;
+  dlc = g_object_get_data (G_OBJECT (button), "dialog-context");
+  if (dlc != NULL)
+    dlc->response = 2;
+}
+
+gboolean
+GNUNET_GTK_save_as_dialog_delete_event_cb (GtkWidget *widget, GdkEvent  *event,
+    gpointer user_data)
+{
+  GtkBuilder *builder = NULL;
+  struct dialog_context *dlc = NULL;
+  struct DownloadContext *dc = NULL;
   enum GNUNET_FS_DownloadOptions opt;
-  uint32_t anonymity;
+  struct GNUNET_FS_Handle *fs;
   struct DownloadEntry *de;
   GtkWidget *cb;
+  uint32_t anonymity;
+  uint64_t len;
 
-  builder =
-      GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_download_as_dialog.glade");
-  if (builder == NULL)
+  builder = GTK_BUILDER (user_data);
+  dlc = g_object_get_data (G_OBJECT (widget), "dialog-context");
+  if (dlc == NULL)
   {
-    if (dc->rr != NULL)
-      gtk_tree_row_reference_free (dc->rr);
-    GNUNET_free_non_null (dc->mime);
-    GNUNET_free_non_null (dc->filename);
-    GNUNET_FS_uri_destroy (dc->uri);
-    GNUNET_free (dc);
-    return;
+    g_object_unref (G_OBJECT (builder));
+    return FALSE;
   }
+  dc = dlc->dc;
   cb = GTK_WIDGET (gtk_builder_get_object
                    (builder, "GNUNET_GTK_save_as_recursive_check_button"));
-  if (GNUNET_FS_meta_data_test_for_directory (dc->meta))
-    gtk_widget_set_sensitive (cb, TRUE);
-  ad = GTK_WIDGET (gtk_builder_get_object
-                   (builder, "GNUNET_GTK_save_as_dialog"));
-  if (dc->filename != NULL)
-  {
-    char buf[1024];
-
-    if (NULL != getcwd (buf, sizeof (buf)))
-    {
-      if (strlen (buf) + strlen (dc->filename) + 2 < sizeof (buf))
-      {
-        strcat (buf, DIR_SEPARATOR_STR);
-        strcat (buf, dc->filename);
-      }
-      gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (ad), buf);
-    }
-  }
-  if (GTK_RESPONSE_OK != gtk_dialog_run (GTK_DIALOG (ad)))
+  if (GTK_RESPONSE_OK != dlc->response)
   {
-    gtk_widget_destroy (ad);
-    g_object_unref (G_OBJECT (builder));
+    g_object_unref (G_OBJECT (dlc->builder));
     if (dc->rr != NULL)
       gtk_tree_row_reference_free (dc->rr);
     GNUNET_free_non_null (dc->mime);
     GNUNET_free_non_null (dc->filename);
     GNUNET_FS_uri_destroy (dc->uri);
     GNUNET_free (dc);
-    return;
+    g_free (dlc);
+    return FALSE;
   }
   GNUNET_free_non_null (dc->filename);
-  dc->filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (ad));
+  dc->filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dlc->dialog));
   dc->is_recursive =
       (TRUE ==
        gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cb))) ? GNUNET_YES :
@@ -100,7 +109,6 @@ GNUNET_FS_GTK_open_download_as_dialog (struct DownloadContext *dc)
                                   (builder,
                                    "GNUNET_GTK_save_as_dialog_anonymity_spin_button")));
   len = GNUNET_FS_uri_chk_get_file_size (dc->uri);
-  gtk_widget_destroy (ad);
   g_object_unref (G_OBJECT (builder));
   de = GNUNET_malloc (sizeof (struct DownloadEntry));
   de->uri = dc->uri;
@@ -130,6 +138,72 @@ GNUNET_FS_GTK_open_download_as_dialog (struct DownloadContext *dc)
                                             NULL /* parent download ctx */ ));
   }
   GNUNET_free (dc);
+  GNUNET_free (dlc);
+  return FALSE;
+}
+
+void
+GNUNET_GTK_save_as_dialog_response_cb (GtkDialog *dialog,
+    gint response_id, gpointer user_data)
+{
+  struct dialog_context *dlc = NULL;
+  dlc = g_object_get_data (G_OBJECT (dialog), "dialog-context");
+  if (dlc != NULL)
+    dlc->response = response_id;
+  /* dialogs don't get delete-event the way normal windows do,
+   * call the handler manually
+   */
+  GNUNET_GTK_save_as_dialog_delete_event_cb (GTK_WIDGET (dialog), NULL, user_data);
+  gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+void
+GNUNET_FS_GTK_open_download_as_dialog (struct DownloadContext *dc)
+{
+  GtkWidget *ad;
+  GtkBuilder *builder;
+  GtkWidget *cb;
+  struct dialog_context *dlc;
+
+  builder =
+      GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_download_as_dialog.glade");
+  if (builder == NULL)
+  {
+    if (dc->rr != NULL)
+      gtk_tree_row_reference_free (dc->rr);
+    GNUNET_free_non_null (dc->mime);
+    GNUNET_free_non_null (dc->filename);
+    GNUNET_FS_uri_destroy (dc->uri);
+    GNUNET_free (dc);
+    return;
+  }
+  cb = GTK_WIDGET (gtk_builder_get_object
+                   (builder, "GNUNET_GTK_save_as_recursive_check_button"));
+  if (GNUNET_FS_meta_data_test_for_directory (dc->meta))
+    gtk_widget_set_sensitive (cb, TRUE);
+  ad = GTK_WIDGET (gtk_builder_get_object
+                   (builder, "GNUNET_GTK_save_as_dialog"));
+  if (dc->filename != NULL)
+  {
+    char buf[1024];
+
+    if (NULL != getcwd (buf, sizeof (buf)))
+    {
+      if (strlen (buf) + strlen (dc->filename) + 2 < sizeof (buf))
+      {
+        strcat (buf, DIR_SEPARATOR_STR);
+        strcat (buf, dc->filename);
+      }
+      gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (ad), buf);
+    }
+  }
+  dlc = g_new0 (struct dialog_context, 1);
+  dlc->builder = builder;
+  dlc->dialog = ad;
+  dlc->response = 0;
+  dlc->dc = dc;
+  g_object_set_data (G_OBJECT (ad), "dialog-context", dlc);
+  gtk_widget_show_all (ad);
 }
 
 /* end of gnunet-fs-gtk-download.c */