diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-02-04 17:56:27 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-02-04 17:56:27 +0000 |
commit | a4bea383983ee8bb0bc37a676e215e0ad09df84b (patch) | |
tree | afcd9f799a49e4796e20566ddfdce7609d96ded2 | |
parent | 38933733dd90cefd601cdca02e16532135903e6c (diff) | |
download | gnunet-gtk-a4bea383983ee8bb0bc37a676e215e0ad09df84b.tar.gz gnunet-gtk-a4bea383983ee8bb0bc37a676e215e0ad09df84b.zip |
-dce
-rw-r--r-- | src/fs/gnunet-fs-gtk_download-save-as.c | 1 | ||||
-rw-r--r-- | src/fs/gnunet-fs-gtk_download-save-as.h | 5 | ||||
-rw-r--r-- | src/fs/gnunet-fs-gtk_event-handler.c | 7 |
3 files changed, 2 insertions, 11 deletions
diff --git a/src/fs/gnunet-fs-gtk_download-save-as.c b/src/fs/gnunet-fs-gtk_download-save-as.c index 5db0d296..8cf3b1de 100644 --- a/src/fs/gnunet-fs-gtk_download-save-as.c +++ b/src/fs/gnunet-fs-gtk_download-save-as.c | |||
@@ -62,7 +62,6 @@ save_as_dialog_free_download_context (struct DownloadContext *dc) | |||
62 | { | 62 | { |
63 | if (NULL != dc->rr) | 63 | if (NULL != dc->rr) |
64 | gtk_tree_row_reference_free (dc->rr); | 64 | gtk_tree_row_reference_free (dc->rr); |
65 | GNUNET_free_non_null (dc->mime); | ||
66 | GNUNET_free_non_null (dc->filename); | 65 | GNUNET_free_non_null (dc->filename); |
67 | if (NULL != dc->meta) | 66 | if (NULL != dc->meta) |
68 | GNUNET_CONTAINER_meta_data_destroy (dc->meta); | 67 | GNUNET_CONTAINER_meta_data_destroy (dc->meta); |
diff --git a/src/fs/gnunet-fs-gtk_download-save-as.h b/src/fs/gnunet-fs-gtk_download-save-as.h index d5b4d051..37a6e3a9 100644 --- a/src/fs/gnunet-fs-gtk_download-save-as.h +++ b/src/fs/gnunet-fs-gtk_download-save-as.h | |||
@@ -51,11 +51,6 @@ struct DownloadContext | |||
51 | struct GNUNET_CONTAINER_MetaData *meta; | 51 | struct GNUNET_CONTAINER_MetaData *meta; |
52 | 52 | ||
53 | /** | 53 | /** |
54 | * Mime type. | ||
55 | */ | ||
56 | char *mime; | ||
57 | |||
58 | /** | ||
59 | * Suggested filename, or NULL. | 54 | * Suggested filename, or NULL. |
60 | */ | 55 | */ |
61 | char *filename; | 56 | char *filename; |
diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c index 86153ddc..5c0a5710 100644 --- a/src/fs/gnunet-fs-gtk_event-handler.c +++ b/src/fs/gnunet-fs-gtk_event-handler.c | |||
@@ -327,7 +327,6 @@ start_download (GtkTreeView *tree_view, | |||
327 | struct GNUNET_FS_Uri *uri; | 327 | struct GNUNET_FS_Uri *uri; |
328 | struct GNUNET_CONTAINER_MetaData *meta; | 328 | struct GNUNET_CONTAINER_MetaData *meta; |
329 | struct SearchResult *sr; | 329 | struct SearchResult *sr; |
330 | gchar *mime; | ||
331 | struct DownloadContext *dc; | 330 | struct DownloadContext *dc; |
332 | char *buf = NULL; | 331 | char *buf = NULL; |
333 | char *tmp; | 332 | char *tmp; |
@@ -351,18 +350,16 @@ start_download (GtkTreeView *tree_view, | |||
351 | GNUNET_break (0); | 350 | GNUNET_break (0); |
352 | return; | 351 | return; |
353 | } | 352 | } |
354 | gtk_tree_model_get (tm, &iter, 0, &meta, 1, &uri, 9, &sr, 10, &mime, -1); | 353 | gtk_tree_model_get (tm, &iter, 0, &meta, 1, &uri, 9, &sr, -1); |
355 | if (NULL == uri) | 354 | if (NULL == uri) |
356 | { | 355 | { |
357 | /* user clicked on directory that was opened (not downloaded!), so we | 356 | /* user clicked on directory that was opened (not downloaded!), so we |
358 | have no URI and downloading makes no sense. Ignore! */ | 357 | have no URI and downloading makes no sense. Ignore! */ |
359 | g_free (mime); | ||
360 | return; | 358 | return; |
361 | } | 359 | } |
362 | if (!(GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri))) | 360 | if (!(GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri))) |
363 | { | 361 | { |
364 | /* can only download chk/loc URIs, ignore */ | 362 | /* can only download chk/loc URIs, ignore */ |
365 | g_free (mime); | ||
366 | return; | 363 | return; |
367 | } | 364 | } |
368 | 365 | ||
@@ -419,7 +416,7 @@ start_download (GtkTreeView *tree_view, | |||
419 | /* now setup everything for the save-as dialog */ | 416 | /* now setup everything for the save-as dialog */ |
420 | dc = GNUNET_malloc (sizeof (struct DownloadContext)); | 417 | dc = GNUNET_malloc (sizeof (struct DownloadContext)); |
421 | dc->uri = GNUNET_FS_uri_dup (uri); | 418 | dc->uri = GNUNET_FS_uri_dup (uri); |
422 | dc->mime = mime; | 419 | |
423 | dc->filename = buf; | 420 | dc->filename = buf; |
424 | dc->meta = GNUNET_CONTAINER_meta_data_duplicate (meta); | 421 | dc->meta = GNUNET_CONTAINER_meta_data_duplicate (meta); |
425 | dc->rr = gtk_tree_row_reference_new (tm, path); | 422 | dc->rr = gtk_tree_row_reference_new (tm, path); |