[GNUnet-SVN] r19681 - gnunet-gtk/src/fs

[gnunet]

Author: grothoff
Date: 2012-02-04 18:56:27 +0100 (Sat, 04 Feb 2012)
New Revision: 19681

Modified:
   gnunet-gtk/src/fs/gnunet-fs-gtk_download-save-as.c
   gnunet-gtk/src/fs/gnunet-fs-gtk_download-save-as.h
   gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
Log:
-dce

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_download-save-as.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_download-save-as.c  2012-02-04 17:53:32 UTC 
(rev 19680)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_download-save-as.c  2012-02-04 17:56:27 UTC 
(rev 19681)
@@ -62,7 +62,6 @@
 {
   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);

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_download-save-as.h
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_download-save-as.h  2012-02-04 17:53:32 UTC 
(rev 19680)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_download-save-as.h  2012-02-04 17:56:27 UTC 
(rev 19681)
@@ -51,11 +51,6 @@
   struct GNUNET_CONTAINER_MetaData *meta;
 
   /**
-   * Mime type.
-   */
-  char *mime;
-
-  /**
    * Suggested filename, or NULL.
    */
   char *filename;

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c     2012-02-04 17:53:32 UTC 
(rev 19680)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c     2012-02-04 17:56:27 UTC 
(rev 19681)
@@ -327,7 +327,6 @@
   struct GNUNET_FS_Uri *uri;
   struct GNUNET_CONTAINER_MetaData *meta;
   struct SearchResult *sr;
-  gchar *mime;
   struct DownloadContext *dc;
   char *buf = NULL;
   char *tmp;
@@ -351,18 +350,16 @@
     GNUNET_break (0);
     return;
   }
-  gtk_tree_model_get (tm, &iter, 0, &meta, 1, &uri, 9, &sr, 10, &mime, -1);
+  gtk_tree_model_get (tm, &iter, 0, &meta, 1, &uri, 9, &sr, -1);
   if (NULL == uri)
   {
     /* user clicked on directory that was opened (not downloaded!), so we
        have no URI and downloading makes no sense. Ignore! */
-    g_free (mime);
     return;
   }
   if (!(GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri)))
   {
     /* can only download chk/loc URIs, ignore */
-    g_free (mime);
     return;
   }
 
@@ -419,7 +416,7 @@
   /* now setup everything for the save-as dialog */
   dc = GNUNET_malloc (sizeof (struct DownloadContext));
   dc->uri = GNUNET_FS_uri_dup (uri);
-  dc->mime = mime;
+
   dc->filename = buf;
   dc->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
   dc->rr = gtk_tree_row_reference_new (tm, path);