[Xfce4-commits] r22892 - xfwm4/branches/xfce_4_2/src

[Olivier Fourdan]

Author: olivier
Date: 2006-08-26 21:02:28 +0000 (Sat, 26 Aug 2006)
New Revision: 22892

Modified:
   xfwm4/branches/xfce_4_2/src/focus.c
Log:
Plug grab leak

Modified: xfwm4/branches/xfce_4_2/src/focus.c
===================================================================
--- xfwm4/branches/xfce_4_2/src/focus.c	2006-08-26 20:17:52 UTC (rev 22891)
+++ xfwm4/branches/xfce_4_2/src/focus.c	2006-08-26 21:02:28 UTC (rev 22892)
@@ -560,14 +560,9 @@
     TRACE ("ungrabing buttons for client \"%s\" (0x%lx)", c->name, c->window);
 
     screen_info = c->screen_info;
-    if (screen_info->params->raise_with_any_button)
-    {
-        ungrabButton(clientGetXDisplay (c), AnyButton, 0, c->window);
-    }
-    else
-    {
-        ungrabButton(clientGetXDisplay (c), Button1, 0, c->window);
-    }
+    ungrabButton(clientGetXDisplay (c), AnyButton, AnyModifier, c->window);
+    /* We've ungrabbed way too much, so regrab the regular buttons/modifiers */
+    clientGrabButtons (c);
 }
 
 void