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

[Olivier Fourdan]

Author: olivier
Date: 2006-12-07 19:45:10 +0000 (Thu, 07 Dec 2006)
New Revision: 24053

Modified:
   xfwm4/trunk/src/events.c
Log:
Fix a bug introduced with last commit.

Modified: xfwm4/trunk/src/events.c
===================================================================
--- xfwm4/trunk/src/events.c	2006-12-06 21:39:15 UTC (rev 24052)
+++ xfwm4/trunk/src/events.c	2006-12-07 19:45:10 UTC (rev 24053)
@@ -1687,6 +1687,7 @@
 
         screen_info = c->screen_info;
 
+        clientUpdateFocus (screen_info, c, FOCUS_SORT);
         if ((user_focus != c) && (user_focus != NULL))
         {
             /* 
@@ -1706,14 +1707,10 @@
             }
             else
             {
-                clientUpdateFocus (screen_info, c, FOCUS_SORT);
-                reset_timeout (screen_info);
                 clientRaise (c, None);
             }
-            return;
         }
 
-        clientUpdateFocus (screen_info, c, FOCUS_SORT);
         if (screen_info->params->raise_on_focus)
         {
             reset_timeout (screen_info);