From 08b756b0a67515f8b23d2e94570b7d744a3580d4 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 16 Apr 2011 04:08:16 +0200 Subject: [PATCH] Revert "Left mouse button and mouse wheel changes zoom level" This reverts commit c2e0342bb395e65bdb895599f3744a82bfaebdc4. The feature is unusable on some touchpads. Fixes: https://bugs.launchpad.net/midori/+bug/761106 --- midori/midori-view.c | 3 +-- midori/sokoke.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 6590bd5d..8b50cdb6 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1724,8 +1724,7 @@ midori_view_ensure_link_uri (MidoriView* view, } #define MIDORI_KEYS_MODIFIER_MASK (GDK_SHIFT_MASK | GDK_CONTROL_MASK \ - | GDK_MOD1_MASK | GDK_META_MASK | GDK_SUPER_MASK | GDK_HYPER_MASK \ - | GDK_BUTTON1_MASK) + | GDK_MOD1_MASK | GDK_META_MASK | GDK_SUPER_MASK | GDK_HYPER_MASK ) static gboolean gtk_widget_button_press_event_cb (WebKitWebView* web_view, diff --git a/midori/sokoke.h b/midori/sokoke.h index de20a40f..e76a914f 100644 --- a/midori/sokoke.h +++ b/midori/sokoke.h @@ -17,8 +17,7 @@ #define MIDORI_MOD_NEW_WINDOW(state) (state & GDK_SHIFT_MASK) #define MIDORI_MOD_NEW_TAB(state) (state & GDK_CONTROL_MASK) #define MIDORI_MOD_BACKGROUND(state) (state & GDK_SHIFT_MASK) -#define MIDORI_MOD_SCROLL(state) (state & GDK_CONTROL_MASK) \ - || (state & GDK_BUTTON1_MASK) +#define MIDORI_MOD_SCROLL(state) (state & GDK_CONTROL_MASK) #include