diff options
| author | Martin Natano <natano@natano.net> | 2012-04-16 19:46:26 +0200 |
|---|---|---|
| committer | Christian Dywan <christian@twotoasts.de> | 2012-04-16 19:46:26 +0200 |
| commit | 5ec14121f2bb06781d009aff358ebc05b44a649e (patch) | |
| tree | 32584fb42ef4bf2db23046bbbd0ff048cb2f0ca9 /midori/midori-browser.c | |
| parent | 2742926b0997bb6c44e458589be8c77070874ff5 (diff) | |
| download | midori-5ec14121f2bb06781d009aff358ebc05b44a649e.tar.gz | |
Refactor webkit_web_view_download_requested_cb
See: https://bugs.launchpad.net/midori/+bug/973646
Diffstat (limited to 'midori/midori-browser.c')
| -rw-r--r-- | midori/midori-browser.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 6d052f68..a409663d 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1458,7 +1458,15 @@ midori_view_download_requested_cb (GtkWidget* view, WebKitDownload* download, MidoriBrowser* browser) { - if (g_object_get_data (G_OBJECT (download), "open-in-viewer")) + gboolean handled; + + g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); + handled = TRUE; + if (g_object_get_data (G_OBJECT (download), "cancel-download")) + { + handled = FALSE; + } + else if (g_object_get_data (G_OBJECT (download), "open-in-viewer")) { gchar* destination_uri = midori_browser_download_prepare_destination_uri (download, NULL); @@ -1506,7 +1514,7 @@ midori_view_download_requested_cb (GtkWidget* view, g_free (destination_uri); } } - return TRUE; + return handled; } static void |