[Xfce4-commits] r26295 - in xfdesktop: branches/xfce_4_4/common trunk/common

[Brian Tarricone]

Author: kelnos
Date: 2007-11-15 07:51:55 +0000 (Thu, 15 Nov 2007)
New Revision: 26295

Modified:
   xfdesktop/branches/xfce_4_4/common/xfdesktop-common.c
   xfdesktop/trunk/common/xfdesktop-common.c
Log:
increase timeout waiting for keyboard grab to popup menu from 0.01s to
0.25s to hopefully fix popup failures, again (bug 441)


Modified: xfdesktop/branches/xfce_4_4/common/xfdesktop-common.c
===================================================================
--- xfdesktop/branches/xfce_4_4/common/xfdesktop-common.c	2007-11-15 07:37:46 UTC (rev 26294)
+++ xfdesktop/branches/xfce_4_4/common/xfdesktop-common.c	2007-11-15 07:51:55 UTC (rev 26295)
@@ -262,7 +262,7 @@
     g1 = gdk_pointer_grab (win, TRUE, mask, NULL, NULL, timestamp);
     g2 = gdk_keyboard_grab (win, TRUE, timestamp);
 
-    while ((i++ < 100) && (grab_failed = ((g1 != GDK_GRAB_SUCCESS)
+    while ((i++ < 2500) && (grab_failed = ((g1 != GDK_GRAB_SUCCESS)
                 || (g2 != GDK_GRAB_SUCCESS))))
     {
         TRACE ("grab not available yet, waiting... (%i)", i);

Modified: xfdesktop/trunk/common/xfdesktop-common.c
===================================================================
--- xfdesktop/trunk/common/xfdesktop-common.c	2007-11-15 07:37:46 UTC (rev 26294)
+++ xfdesktop/trunk/common/xfdesktop-common.c	2007-11-15 07:51:55 UTC (rev 26295)
@@ -245,7 +245,7 @@
     g1 = gdk_pointer_grab (win, TRUE, mask, NULL, NULL, timestamp);
     g2 = gdk_keyboard_grab (win, TRUE, timestamp);
 
-    while ((i++ < 300) && (grab_failed = ((g1 != GDK_GRAB_SUCCESS)
+    while ((i++ < 2500) && (grab_failed = ((g1 != GDK_GRAB_SUCCESS)
                 || (g2 != GDK_GRAB_SUCCESS))))
     {
         TRACE ("grab not available yet, waiting... (%i)", i);