1 files changed, 37 insertions, 40 deletions

diff --git a/src/fs/gnunet-fs-gtk-download.c b/src/fs/gnunet-fs-gtk-download.c
index 61b34419..05a5ae95 100644
--- a/src/fs/gnunet-fs-gtk-download.c
+++ b/src/fs/gnunet-fs-gtk-download.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2010 Christian Grothoff (and other contributing authors)
+     (C) 2010, 2011, 2012 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -27,7 +27,7 @@
 #include "gnunet-fs-gtk.h"
 #include "gnunet-fs-gtk-event_handler.h"
 
-struct dialog_context
+struct DownloadAsDialogContext
 {
   GtkBuilder *builder;
   GtkWidget *dialog;
@@ -36,12 +36,27 @@ struct dialog_context
 };
 
 
+static void
+free_download_context (struct DownloadContext *dc)
+{
+  if (NULL != dc->rr)
+    gtk_tree_row_reference_free (dc->rr);
+  GNUNET_free_non_null (dc->mime);
+  GNUNET_free_non_null (dc->filename);
+  if (NULL != dc->meta)
+    GNUNET_CONTAINER_meta_data_destroy (dc->meta);
+  if (NULL != dc->uri)
+    GNUNET_FS_uri_destroy (dc->uri);
+  GNUNET_free (dc);  
+}
+
+
 gboolean
 GNUNET_GTK_save_as_dialog_delete_event_cb (GtkWidget * widget, GdkEvent * event,
                                            gpointer user_data)
 {
+  struct DownloadAsDialogContext *dlc = user_data;
   GtkBuilder *builder;
-  struct dialog_context *dlc;
   struct DownloadContext *dc;
   enum GNUNET_FS_DownloadOptions opt;
   struct GNUNET_FS_Handle *fs;
@@ -50,26 +65,20 @@ GNUNET_GTK_save_as_dialog_delete_event_cb (GtkWidget * widget, GdkEvent * event,
   uint32_t anonymity;
   uint64_t len;
 
-  builder = GTK_BUILDER (user_data);
-  dlc = g_object_get_data (G_OBJECT (widget), "dialog-context");
   if (dlc == NULL)
   {
-    g_object_unref (G_OBJECT (builder));
+    GNUNET_break (0);
     return FALSE;
   }
+  builder = dlc->builder;
   dc = dlc->dc;
   cb = GTK_WIDGET (gtk_builder_get_object
                    (builder, "GNUNET_GTK_save_as_recursive_check_button"));
   if (GTK_RESPONSE_OK != dlc->response)
   {
+    free_download_context (dc);
     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);
-    g_free (dlc);
+    GNUNET_free (dlc);
     return FALSE;
   }
   GNUNET_free_non_null (dc->filename);
@@ -90,9 +99,12 @@ GNUNET_GTK_save_as_dialog_delete_event_cb (GtkWidget * widget, GdkEvent * event,
                                    "GNUNET_GTK_save_as_dialog_anonymity_spin_button")));
   len = GNUNET_FS_uri_chk_get_file_size (dc->uri);
   g_object_unref (G_OBJECT (builder));
+
   de = GNUNET_malloc (sizeof (struct DownloadEntry));
   de->uri = dc->uri;
+  dc->uri = NULL;
   de->meta = dc->meta;
+  dc->meta = NULL;
   if (dc->rr != NULL)
   {
     de->rr = dc->rr;
@@ -117,18 +129,18 @@ GNUNET_GTK_save_as_dialog_delete_event_cb (GtkWidget * widget, GdkEvent * event,
                                             len, anonymity, opt, de,
                                             NULL /* parent download ctx */ ));
   }
-  GNUNET_free (dc);
+  free_download_context (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;
+  struct DownloadAsDialogContext *dlc = user_data;
 
-  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,
@@ -139,24 +151,24 @@ GNUNET_GTK_save_as_dialog_response_cb (GtkDialog * dialog, gint response_id,
   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;
+  struct DownloadAsDialogContext *dlc;
 
+  dlc = GNUNET_malloc (sizeof (struct DownloadAsDialogContext));
   builder =
-      GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_download_as_dialog.glade");
+    GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_download_as_dialog.glade",
+                                dlc);
   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);
+    GNUNET_break (0);
+    free_download_context (dc);
+    GNUNET_free (dlc);
     return;
   }
   cb = GTK_WIDGET (gtk_builder_get_object
@@ -166,26 +178,11 @@ GNUNET_FS_GTK_open_download_as_dialog (struct DownloadContext *dc)
   ad = GTK_WIDGET (gtk_builder_get_object
                    (builder, "GNUNET_GTK_save_as_dialog"));
   if (dc->filename != NULL)
-  {
-    char buf[FILENAME_MAX];
-
-    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);
-
+    gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (ad), dc->filename);
   dlc->builder = builder;
   dlc->dialog = ad;
   dlc->response = 0;
   dlc->dc = dc;
-  g_object_set_data (G_OBJECT (ad), "dialog-context", dlc);
   gtk_window_present (GTK_WINDOW (ad));
 }