[epiphany] ephy-window: fix button-press callback return value
- From: Diego Escalante Urrelo <diegoe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] ephy-window: fix button-press callback return value
- Date: Thu, 25 Feb 2010 22:57:44 +0000 (UTC)
commit d3038a0b98a28b84782b22f3127f1e1708914733
Author: Diego Escalante Urrelo <descalante igalia com>
Date: Wed Feb 24 10:27:31 2010 -0500
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
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 21ed758..f3125d6 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]