* [gentoo-commits] gentoo-x86 commit in www-client/midori/files: midori-0.4.6-dl.patch
@ 2012-07-02 17:24 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2012-07-02 17:24 UTC (permalink / raw
To: gentoo-commits
ssuominen 12/07/02 17:24:39
Added: midori-0.4.6-dl.patch
Log:
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.
(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)
Revision Changes Path
1.1 www-client/midori/files/midori-0.4.6-dl.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/files/midori-0.4.6-dl.patch?rev=1.1&view=markup
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
Index: midori-0.4.6-dl.patch
===================================================================
From f38715efb279e08bb3ddcd941d5d9ff6091b98c8 Mon Sep 17 00:00:00 2001
From: André Stösel <andre@stoesel.de>
Date: Thu, 31 May 2012 14:19:54 +0000
Subject: Bugfix: "save as" doesn't download anything
Fixes: https://bugs.launchpad.net/midori/+bug/1005881
---
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 22d74f5..bae714a 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -1342,24 +1342,6 @@ midori_view_new_view_cb (GtkWidget* view,
}
static void
-midori_view_download_save_as_response_cb (GtkWidget* dialog,
- gint response,
- MidoriBrowser* browser)
-{
- WebKitDownload* download = g_object_get_data (G_OBJECT (dialog), "download");
- if (response == GTK_RESPONSE_OK)
- {
- gchar* uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
- if (midori_browser_prepare_download (browser, download, uri))
- webkit_download_start (download);
- g_free (uri);
- }
- else
- g_object_unref (download);
- gtk_widget_hide (dialog);
-}
-
-static void
midori_browser_download_status_cb (WebKitDownload* download,
GParamSpec* pspec,
GtkWidget* widget)
@@ -1515,14 +1497,28 @@ midori_view_download_requested_cb (GtkWidget* view,
g_free (folder);
g_signal_connect (dialog, "destroy",
G_CALLBACK (gtk_widget_destroyed), &dialog);
- g_signal_connect (dialog, "response",
- G_CALLBACK (midori_view_download_save_as_response_cb), browser);
}
g_object_set_data (G_OBJECT (dialog), "download", download);
filename = sokoke_get_download_filename (download);
gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), filename);
g_free (filename);
- gtk_widget_show (dialog);
+
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
+ {
+ gtk_widget_hide (dialog);
+ gchar* uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
+ if (!midori_browser_prepare_download (browser, download, uri))
+ {
+ g_free (uri);
+ return FALSE;
+ }
+ g_free (uri);
+ }
+ else
+ {
+ gtk_widget_hide (dialog);
+ return FALSE;
+ }
}
else
{
--
cgit v0.9.0.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-client/midori/files: midori-0.4.6-dl.patch
@ 2013-07-31 4:50 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-07-31 4:50 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/07/31 04:50:26
Removed: midori-0.4.6-dl.patch
Log:
old
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-07-31 4:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-02 17:24 [gentoo-commits] gentoo-x86 commit in www-client/midori/files: midori-0.4.6-dl.patch Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2013-07-31 4:50 Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox