diff -u xsane-0.996/debian/changelog xsane-0.996/debian/changelog --- xsane-0.996/debian/changelog +++ xsane-0.996/debian/changelog @@ -1,3 +1,10 @@ +xsane (0.996-2ubuntu1.2) lucid-proposed; urgency=low + + * lp: #370818: Fixed a problem in mouse event processing that interfered + with selecting the scan rectangle in the preview window. + + -- Reinhard Fössmeier "Aisano" Thu, 20 May 2010 21:02:28 +0200 + xsane (0.996-2ubuntu1.1) karmic-proposed; urgency=low * Modified .desktop entry to match POT changes (LP: #410234) only in patch2: unchanged: --- xsane-0.996.orig/src/xsane-preview.c +++ xsane-0.996/src/xsane-preview.c @@ -80,7 +80,6 @@ #include "xsane-preview.h" #include "xsane-preferences.h" #include "xsane-gamma.h" -#include #ifndef PATH_MAX @@ -3022,9 +3021,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"); @@ -3291,8 +3290,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)