aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--embed/ephy-web-view.c4
-rw-r--r--src/ephy-window.c9
2 files changed, 9 insertions, 4 deletions
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index ca32314d0..129ee3bc7 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -526,10 +526,6 @@ ephy_web_view_button_press_event (GtkWidget *widget, GdkEventButton *event)
if (event->button == 3 && event->state == GDK_CONTROL_MASK)
return FALSE;
- /* We use this for downloading. */
- if (event->button == 1 && event->state == GDK_SHIFT_MASK)
- return FALSE;
-
/* Let WebKitWebView handle this. */
return GTK_WIDGET_CLASS (ephy_web_view_parent_class)->button_press_event (widget, event);
}
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 91f99307a..21ed75841 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -2521,6 +2521,15 @@ policy_decision_required_cb (WebKitWebView *web_view,
{
flags |= EPHY_NEW_TAB_IN_EXISTING_WINDOW;
}
+ /* Because we connect to button-press-event *after*
+ * (G_CONNECT_AFTER) we need to prevent WebKit from browsing to
+ * a link when you shift+click it. Otherwise when you
+ * shift+click a link to download it you would also be taken to
+ * the link destination. */
+ else if (button == 1 && state == GDK_SHIFT_MASK)
+ {
+ return TRUE;
+ }
/* Those were our special cases, we won't handle this */
else
{