[Xfce4-commits] r29674 - in xfwm4/trunk: . src

[Olivier Fourdan]

Author: olivier
Date: 2009-03-19 12:46:50 +0000 (Thu, 19 Mar 2009)
New Revision: 29674

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/src/netwm.c
Log:
	* src/netwm.c: Do not try to update last user timestamp if the given
	  timestamp is outdated, that avoids some unecessary warnings for
	  "Last user time set back to..." upon restart.
	  Fix raise delay settings in xfwm4 dialog being totally ignored

Modified: xfwm4/trunk/ChangeLog
===================================================================
--- xfwm4/trunk/ChangeLog	2009-03-19 09:16:34 UTC (rev 29673)
+++ xfwm4/trunk/ChangeLog	2009-03-19 12:46:50 UTC (rev 29674)
@@ -1,10 +1,16 @@
 2009-03-19	olivier
 
+	* src/netwm.c: Do not try to update last user timestamp if the given
+	  timestamp is outdated, that avoids some unecessary warnings for
+	  "Last user time set back to..." upon restart.
+
+2009-03-19	olivier
+
 	* settings-dialogs/xfwm4-settings.c, 
 	  settings-dialogs/xfwm4-dialog.glade,
 	  src/settings.c: Reduce minimum timeout for focus delay in focus 
 	  follow mouse (100ms was way too much),
-      Fix raise delay settings in xfwm4 dialog being totally ignored
+	  Fix raise delay settings in xfwm4 dialog being totally ignored
 
 2009-03-13	olivier
 

Modified: xfwm4/trunk/NEWS
===================================================================
--- xfwm4/trunk/NEWS	2009-03-19 09:16:34 UTC (rev 29673)
+++ xfwm4/trunk/NEWS	2009-03-19 12:46:50 UTC (rev 29674)
@@ -7,6 +7,7 @@
 - Reduce minimum timeout for focus delay in focus follow mouse (100ms was way
   too much)
 - Fix raise delay settings in xfwm4 dialog being totally ignored
+- Avoid unecessary warnings about timestamps at startup
 
 4.6.0
 =====

Modified: xfwm4/trunk/src/netwm.c
===================================================================
--- xfwm4/trunk/src/netwm.c	2009-03-19 09:16:34 UTC (rev 29673)
+++ xfwm4/trunk/src/netwm.c	2009-03-19 12:46:50 UTC (rev 29674)
@@ -1467,7 +1467,10 @@
 
     if (getNetWMUserTime (display_info, c->user_time_win, &c->user_time))
     {
-        if (c->user_time != 0)
+        guint32 last_user_time;
+        
+        last_user_time = myDisplayGetLastUserTime (display_info);
+        if (c->user_time && TIMESTAMP_IS_BEFORE(last_user_time, c->user_time))
         {
             myDisplaySetLastUserTime (display_info, c->user_time);
         }