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

[Olivier Fourdan]

Author: olivier
Date: 2007-10-28 17:14:34 +0000 (Sun, 28 Oct 2007)
New Revision: 26211

Modified:
   xfwm4/trunk/src/display.c
Log:
Work around time going back (like broken clients or clock change)

Modified: xfwm4/trunk/src/display.c
===================================================================
--- xfwm4/trunk/src/display.c	2007-10-28 17:06:31 UTC (rev 26210)
+++ xfwm4/trunk/src/display.c	2007-10-28 17:14:34 UTC (rev 26211)
@@ -187,7 +187,7 @@
 
     attributes.event_mask = PropertyChangeMask;
     attributes.override_redirect = TRUE;
-    display_info->timestamp_win = 
+    display_info->timestamp_win =
         XCreateWindow (display_info->dpy, DefaultRootWindow (display_info->dpy),
                        -100, -100, 10, 10, 0, 0, CopyFromParent, CopyFromParent,
                        CWEventMask | CWOverrideRedirect, &attributes);
@@ -744,11 +744,13 @@
 myDisplaySetLastUserTime (DisplayInfo *display, Time timestamp)
 {
     g_return_if_fail (display != NULL);
+    g_return_if_fail (timestamp != (Time) 0);
 
-    if (TIMESTAMP_IS_BEFORE(display->last_user_time, timestamp))
+    if (!TIMESTAMP_IS_BEFORE(display->last_user_time, timestamp))
     {
-        display->last_user_time = timestamp;
+        g_warning ("Last user time set back to %u (was %u)", (unsigned int) timestamp, (unsigned int) display->last_user_time);
     }
+    display->last_user_time = timestamp;
 }
 
 gboolean