| 1 |
ssuominen 12/07/02 17:24:39 |
| 2 |
|
| 3 |
Added: midori-0.4.6-dl.patch |
| 4 |
Log: |
| 5 |
Upstream patch for fixing "Save as..." wrt #422933 by "Vladimir". Also switch 0.4.6-r1 to dev-lang/vala SLOT of 0.16 like -9999 is. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha114/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 www-client/midori/files/midori-0.4.6-dl.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/files/midori-0.4.6-dl.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/files/midori-0.4.6-dl.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: midori-0.4.6-dl.patch |
| 16 |
=================================================================== |
| 17 |
From f38715efb279e08bb3ddcd941d5d9ff6091b98c8 Mon Sep 17 00:00:00 2001 |
| 18 |
From: André Stösel <andre@×××××××.de> |
| 19 |
Date: Thu, 31 May 2012 14:19:54 +0000 |
| 20 |
Subject: Bugfix: "save as" doesn't download anything |
| 21 |
|
| 22 |
Fixes: https://bugs.launchpad.net/midori/+bug/1005881 |
| 23 |
--- |
| 24 |
diff --git a/midori/midori-browser.c b/midori/midori-browser.c |
| 25 |
index 22d74f5..bae714a 100644 |
| 26 |
--- a/midori/midori-browser.c |
| 27 |
+++ b/midori/midori-browser.c |
| 28 |
@@ -1342,24 +1342,6 @@ midori_view_new_view_cb (GtkWidget* view, |
| 29 |
} |
| 30 |
|
| 31 |
static void |
| 32 |
-midori_view_download_save_as_response_cb (GtkWidget* dialog, |
| 33 |
- gint response, |
| 34 |
- MidoriBrowser* browser) |
| 35 |
-{ |
| 36 |
- WebKitDownload* download = g_object_get_data (G_OBJECT (dialog), "download"); |
| 37 |
- if (response == GTK_RESPONSE_OK) |
| 38 |
- { |
| 39 |
- gchar* uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); |
| 40 |
- if (midori_browser_prepare_download (browser, download, uri)) |
| 41 |
- webkit_download_start (download); |
| 42 |
- g_free (uri); |
| 43 |
- } |
| 44 |
- else |
| 45 |
- g_object_unref (download); |
| 46 |
- gtk_widget_hide (dialog); |
| 47 |
-} |
| 48 |
- |
| 49 |
-static void |
| 50 |
midori_browser_download_status_cb (WebKitDownload* download, |
| 51 |
GParamSpec* pspec, |
| 52 |
GtkWidget* widget) |
| 53 |
@@ -1515,14 +1497,28 @@ midori_view_download_requested_cb (GtkWidget* view, |
| 54 |
g_free (folder); |
| 55 |
g_signal_connect (dialog, "destroy", |
| 56 |
G_CALLBACK (gtk_widget_destroyed), &dialog); |
| 57 |
- g_signal_connect (dialog, "response", |
| 58 |
- G_CALLBACK (midori_view_download_save_as_response_cb), browser); |
| 59 |
} |
| 60 |
g_object_set_data (G_OBJECT (dialog), "download", download); |
| 61 |
filename = sokoke_get_download_filename (download); |
| 62 |
gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), filename); |
| 63 |
g_free (filename); |
| 64 |
- gtk_widget_show (dialog); |
| 65 |
+ |
| 66 |
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) |
| 67 |
+ { |
| 68 |
+ gtk_widget_hide (dialog); |
| 69 |
+ gchar* uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); |
| 70 |
+ if (!midori_browser_prepare_download (browser, download, uri)) |
| 71 |
+ { |
| 72 |
+ g_free (uri); |
| 73 |
+ return FALSE; |
| 74 |
+ } |
| 75 |
+ g_free (uri); |
| 76 |
+ } |
| 77 |
+ else |
| 78 |
+ { |
| 79 |
+ gtk_widget_hide (dialog); |
| 80 |
+ return FALSE; |
| 81 |
+ } |
| 82 |
} |
| 83 |
else |
| 84 |
{ |
| 85 |
-- |
| 86 |
cgit v0.9.0.3 |
Archives