* 015_gdkmain-x11_button-mask.patch, stolen from upstream SVN: fix the

issue of resizing columns needing two tries in some cases 
    (closes: #406906).

debian/changelog

@@ -3,6 +3,9 @@ gtk+2.0 (2.10.7-2) UNRELEASED; urgency=low
   [ Josselin Mouette ]
   * 024_filechooser_single-click.patch: monitor selection changes
     instead of monitoring the cursor.
+  * 015_gdkmain-x11_button-mask.patch, stolen from upstream SVN: fix the 
+    issue of resizing columns needing two tries in some cases
+    (closes: #406906).
 
   [ Loic Minier ]
   * Add a get-orig-source target to retrieve the upstream tarball.
@@ -18,7 +21,10 @@ gtk+2.0 (2.10.7-2) UNRELEASED; urgency=low
   * Bump up libglib2.0-dev of libgtk2.0-dev dep to >= 2.12.0 as well; thanks
     Marc Brockschmidt.
 
- -- Loic Minier <lool@dooz.org>  Fri,  9 Feb 2007 16:45:08 +0100
+  [ Josselin Mouette ]
+  * 
+
+ -- Josselin Mouette <joss@debian.org>  Sat, 17 Feb 2007 23:40:08 +0100
 
 gtk+2.0 (2.10.7-1) experimental; urgency=low
 

debian/patches/015_gdkmain-x11_button-mask.patch

@@ -0,0 +1,26 @@
+Index: gtk+-2.10.7/gdk/x11/gdkmain-x11.c
+===================================================================
+--- gtk+-2.10.7.orig/gdk/x11/gdkmain-x11.c	2007-02-17 23:39:12.000000000 +0100
++++ gtk+-2.10.7/gdk/x11/gdkmain-x11.c	2007-02-17 23:39:31.000000000 +0100
+@@ -504,6 +504,12 @@
+     }
+ }
+ 
++#define GDK_ANY_BUTTON_MASK (GDK_BUTTON1_MASK | \
++                             GDK_BUTTON2_MASK | \
++                             GDK_BUTTON3_MASK | \
++                             GDK_BUTTON4_MASK | \
++                             GDK_BUTTON5_MASK)
++
+ /**
+  * _gdk_xgrab_check_button_event:
+  * @window: a #GdkWindow
+@@ -533,7 +539,7 @@
+     case ButtonRelease:
+       if (display_x11->pointer_xgrab_window &&
+ 	  display_x11->pointer_xgrab_implicit &&
+-	  (xevent->xbutton.state & ~(GDK_BUTTON1_MASK << (xevent->xbutton.button - 1))) == 0)
++	  (xevent->xbutton.state & GDK_ANY_BUTTON_MASK & ~(GDK_BUTTON1_MASK << (xevent->xbutton.button - 1))) == 0)
+ 	{
+ 	  display_x11->pointer_xgrab_window = NULL;
+ 	}

debian/patches/series

@@ -12,6 +12,7 @@
 012_missing-stub-files.patch
 013_gdkproperty-directfb-strdup.patch
 014_gtktreeview_missing-icons.patch
+015_gdkmain-x11_button-mask.patch
 020_immodules-files-d.patch
 021_loader-files-d.patch
 030_gtkentry_password-char-circle.patch