diff options
| author | Diego Escalante Urrelo <descalante@igalia.com> | 2010-02-24 23:27:31 +0800 |
|---|---|---|
| committer | Diego Escalante Urrelo <descalante@igalia.com> | 2010-02-26 06:56:33 +0800 |
| commit | d3038a0b98a28b84782b22f3127f1e1708914733 (patch) | |
| tree | 63822931c43e908b7558ef88d2fd241628ffb198 /src | |
| parent | 7795f72123d8aced9247c512a708583cef62b95a (diff) | |
| download | gsoc2013-epiphany-d3038a0b98a28b84782b22f3127f1e1708914733.tar.gz gsoc2013-epiphany-d3038a0b98a28b84782b22f3127f1e1708914733.tar.zst gsoc2013-epiphany-d3038a0b98a28b84782b22f3127f1e1708914733.zip | |
ephy-window: fix button-press callback return value
Don't always return FALSE when is_middle_clickable or is_middle_click or
middle_click_opens are FALSE. This can overwrite left_click + shift cases that
are handled and hence should be TRUE.
Bug #610844
Diffstat (limited to 'src')
| -rw-r--r-- | src/ephy-window.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c index 21ed75841..f3125d625 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -2259,7 +2259,7 @@ ephy_window_dom_mouse_click_cb (WebKitWebView *view, EphyWindow *window) { guint button, modifier, context; - gboolean handled = TRUE; + gboolean handled = FALSE; gboolean with_control, with_shift; gboolean is_left_click, is_middle_click; gboolean is_link, is_image, is_middle_clickable; @@ -2270,7 +2270,7 @@ ephy_window_dom_mouse_click_cb (WebKitWebView *view, hit_test_result = webkit_web_view_get_hit_test_result (view, event); button = event->button; - if (event->button == 3) + if (button == 3) { show_embed_popup (window, view, event, hit_test_result); g_object_unref (hit_test_result); @@ -2315,7 +2315,6 @@ ephy_window_dom_mouse_click_cb (WebKitWebView *view, { handled = save_property_url (EPHY_GET_EMBED_FROM_EPHY_WEB_VIEW (view), event, hit_test_result, "image-uri"); } - } /* middle click opens the selection url */ @@ -2345,11 +2344,8 @@ ephy_window_dom_mouse_click_cb (WebKitWebView *view, GDK_SELECTION_PRIMARY), (GtkClipboardTextReceivedFunc) clipboard_text_received_cb, cb_data); - } - /* we didn't handle the event */ - else - { - handled = FALSE; + + handled = TRUE; } g_object_unref (hit_test_result); |