[Pkg-xfce-commits] r798 - in desktop/trunk/xfwm4/debian: . patches

[Yves-Alexis Perez]

Author: corsac-guest
Date: 2006-07-25 07:59:52 +0000 (Tue, 25 Jul 2006)
New Revision: 798

Added:
   desktop/trunk/xfwm4/debian/patches/xfwm4-mouse-grab-fix.patch
Modified:
   desktop/trunk/xfwm4/debian/changelog
Log:
added upstream patch for focus grab


Modified: desktop/trunk/xfwm4/debian/changelog
===================================================================
--- desktop/trunk/xfwm4/debian/changelog	2006-07-25 07:58:33 UTC (rev 797)
+++ desktop/trunk/xfwm4/debian/changelog	2006-07-25 07:59:52 UTC (rev 798)
@@ -1,3 +1,9 @@
+xfwm4 (4.3.90.2-2) UNRELEASED; urgency=low
+
+  * Add upstream patch to fix mouse focus grab.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Tue, 25 Jul 2006 09:59:09 +0200
+
 xfwm4 (4.3.90.2-1) unstable; urgency=low
 
   (Yves-Alexis Perez)

Added: desktop/trunk/xfwm4/debian/patches/xfwm4-mouse-grab-fix.patch
===================================================================
--- desktop/trunk/xfwm4/debian/patches/xfwm4-mouse-grab-fix.patch	2006-07-25 07:58:33 UTC (rev 797)
+++ desktop/trunk/xfwm4/debian/patches/xfwm4-mouse-grab-fix.patch	2006-07-25 07:59:52 UTC (rev 798)
@@ -0,0 +1,51 @@
+diff -Naur xfwm4-r22409/src/client.c xfwm4-mouse-grab-fix/src/client.c
+--- xfwm4-r22409/src/client.c	2006-07-11 23:47:05.000000000 +0200
++++ xfwm4-mouse-grab-fix/src/client.c	2006-07-12 09:24:35.000000000 +0200
+@@ -3732,7 +3732,7 @@
+     }
+     clientConfigure (c, &wc, changes, NO_CFG_FLAG);
+ 
+-    myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
++    myScreenUngrabKeyboard (screen_info, CurrentTime);
+     if (!passdata.released)
+     {
+         /* If this is a drag-move, wait for the button to be released.
+@@ -3742,7 +3742,7 @@
+         gtk_main ();
+         eventFilterPop (display_info->xfilter);
+     }
+-    myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
++    myScreenUngrabPointer (screen_info, CurrentTime);
+     if (passdata.grab && screen_info->params->box_move)
+     {
+         myDisplayUngrabServer (display_info);
+@@ -4243,7 +4243,7 @@
+     wc.height = c->height;
+     clientConfigure (c, &wc, CWX | CWY | CWHeight | CWWidth, CFG_NOTIFY);
+ 
+-    myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
++    myScreenUngrabKeyboard (screen_info, CurrentTime);
+     if (!passdata.released)
+     {
+         /* If this is a drag-resize, wait for the button to be released.
+@@ -4253,7 +4253,7 @@
+         gtk_main ();
+         eventFilterPop (display_info->xfilter);
+     }
+-    myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
++    myScreenUngrabPointer (screen_info, CurrentTime);
+     if (passdata.grab && screen_info->params->box_resize)
+     {
+         myDisplayUngrabServer (display_info);
+@@ -4445,8 +4445,8 @@
+         tabwinDestroy (passdata.tabwin);
+         g_free (passdata.tabwin);
+     }
+-    myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime (display_info));
+-    myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
++    myScreenUngrabKeyboard (screen_info, CurrentTime);
++    myScreenUngrabPointer (screen_info, CurrentTime);
+ 
+     if (passdata.c)
+     {
+