aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Noronha Silva <kov@debian.org>2009-06-02 10:42:42 +0800
committerGustavo Noronha Silva <kov@debian.org>2009-06-02 10:42:42 +0800
commit2aa3ce4a65e157968b159554ecb554a269a3915c (patch)
treefc8c0e9d854aeb4688fc199e158354cac48ef13e
parent184f7e5e525b404dafc6decfea9dff0586eaae37 (diff)
downloadgsoc2013-epiphany-2aa3ce4a65e157968b159554ecb554a269a3915c.tar
gsoc2013-epiphany-2aa3ce4a65e157968b159554ecb554a269a3915c.tar.gz
gsoc2013-epiphany-2aa3ce4a65e157968b159554ecb554a269a3915c.tar.bz2
gsoc2013-epiphany-2aa3ce4a65e157968b159554ecb554a269a3915c.tar.lz
gsoc2013-epiphany-2aa3ce4a65e157968b159554ecb554a269a3915c.tar.xz
gsoc2013-epiphany-2aa3ce4a65e157968b159554ecb554a269a3915c.tar.zst
gsoc2013-epiphany-2aa3ce4a65e157968b159554ecb554a269a3915c.zip
Correctly handle the 'cancel' case in the download decision dialog
Bug #583855 The code that handled responses for the download decision dialog was getting the downloader view from the embed too early. This change confines the request for the downloader view to the condition block that actually uses it.
-rw-r--r--embed/webkit/webkit-embed.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/embed/webkit/webkit-embed.c b/embed/webkit/webkit-embed.c
index f98e6037d..7794ea8b0 100644
--- a/embed/webkit/webkit-embed.c
+++ b/embed/webkit/webkit-embed.c
@@ -537,7 +537,7 @@ confirm_action_response_cb (GtkWidget *dialog,
WebKitDownload *download)
{
WebKitWebView *web_view = g_object_get_data (G_OBJECT(dialog), "webkit-view");
- DownloaderView *dview = EPHY_DOWNLOADER_VIEW (ephy_embed_shell_get_downloader_view (embed_shell));
+ DownloaderView *dview;
gtk_widget_destroy (dialog);
@@ -562,6 +562,7 @@ confirm_action_response_cb (GtkWidget *dialog,
if (!define_destination_uri (download, FALSE)) {
goto cleanup;
}
+ dview = EPHY_DOWNLOADER_VIEW (ephy_embed_shell_get_downloader_view (embed_shell));
downloader_view_add_download (dview, download);
}
g_object_unref (download);