[Xfce4-commits] r25149 - xfwm4/trunk/src

[Olivier Fourdan]

Author: olivier
Date: 2007-03-11 21:41:34 +0000 (Sun, 11 Mar 2007)
New Revision: 25149

Modified:
   xfwm4/trunk/src/focus.c
Log:
No need to pass the client, we keep track ot it separately to be able to cancel 
the delayed focus

Modified: xfwm4/trunk/src/focus.c
===================================================================
--- xfwm4/trunk/src/focus.c     2007-03-10 21:00:57 UTC (rev 25148)
+++ xfwm4/trunk/src/focus.c     2007-03-11 21:41:34 UTC (rev 25149)
@@ -766,14 +766,13 @@
 {
     ScreenInfo *screen_info;
     DisplayInfo *display_info;
-    Client *c;
 
     TRACE ("entering delayed_focus_cb");
+    g_return_val_if_fail (delayed_focus != NULL, FALSE);
 
-    c = (Client *) data;
-    screen_info = c->screen_info;
+    screen_info = delayed_focus->screen_info;
     display_info = screen_info->display_info;
-    clientSetFocus (screen_info, c, myDisplayGetCurrentTime (display_info), 
NO_FOCUS_FLAG);
+    clientSetFocus (screen_info, delayed_focus, myDisplayGetCurrentTime 
(display_info), NO_FOCUS_FLAG);
     focus_timeout = 0;
     delayed_focus = NULL;
 
@@ -801,7 +800,7 @@
     focus_timeout = g_timeout_add_full (G_PRIORITY_DEFAULT, 
                                         screen_info->params->focus_delay, 
                                         (GSourceFunc) delayed_focus_cb, 
-                                        delayed_focus, NULL);
+                                        NULL, NULL);
 }
 
 Client *

_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits