summaryrefslogtreecommitdiff
path: root/debian/patches/fix_preview_mouse_events.patch
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-12-16 13:51:43 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-12-16 13:51:43 +0100
commit66bc6024fa12fb3f7f3bddc8dee752b10f68eefb (patch)
tree577707fbcd4ffa280c3e1644e4ce48f06de7defd /debian/patches/fix_preview_mouse_events.patch
parent81369a5ae42dd8686eeec40e420eca1d409700d3 (diff)
parent37d9e876966aea3c5dd7e61326b7486aa2d593c5 (diff)
Merge tag 'upstream/0.999'
Upstream version 0.999
Diffstat (limited to 'debian/patches/fix_preview_mouse_events.patch')
-rw-r--r--debian/patches/fix_preview_mouse_events.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/debian/patches/fix_preview_mouse_events.patch b/debian/patches/fix_preview_mouse_events.patch
deleted file mode 100644
index c047ed8..0000000
--- a/debian/patches/fix_preview_mouse_events.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Fix mouse events handling in preview window
- Event handling was using key values as masks on mouse events, leading
- to valid mouse events being discarded in some setups.
-Bug-Debian: http://bugs.debian.org/583661
-Author: Reinhard Fössmeier <info@ais-sanmarino.org>
-
-Index: xsane-0.998/src/xsane-preview.c
-===================================================================
---- xsane-0.998.orig/src/xsane-preview.c 2010-11-16 21:52:39.000000000 +0100
-+++ xsane-0.998/src/xsane-preview.c 2011-02-04 19:51:41.789016002 +0100
-@@ -80,7 +80,6 @@
- #include "xsane-preview.h"
- #include "xsane-preferences.h"
- #include "xsane-gamma.h"
--#include <gdk/gdkkeysyms.h>
-
-
- #ifndef PATH_MAX
-@@ -3023,9 +3022,9 @@
- preview_display_color_components(p, event->motion.x, event->motion.y);
-
- switch (((GdkEventMotion *)event)->state &
-- GDK_Num_Lock & GDK_Caps_Lock & GDK_Shift_Lock & GDK_Scroll_Lock) /* mask all Locks */
-+ (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)) /* only check for mouse buttons */
- {
-- case 256: /* left button */
-+ case GDK_BUTTON1_MASK: /* left button */
-
- DBG(DBG_info2, "left button\n");
-
-@@ -3292,8 +3291,8 @@
- }
- break;
-
-- case 512: /* middle button */
-- case 1024: /* right button */
-+ case GDK_BUTTON2_MASK: /* middle button */
-+ case GDK_BUTTON3_MASK: /* right button */
- DBG(DBG_info2, "middle or right button\n");
-
- if (p->selection_drag)