summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--NEWS1
-rw-r--r--src/netwm.c5
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fca36b850..356e0d885 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/NEWS b/NEWS
index 7ece49cb0..0a1ff1a28 100644
--- a/NEWS
+++ b/NEWS
@@ -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
=====
diff --git a/src/netwm.c b/src/netwm.c
index 7fb91de5e..dc15a1bdd 100644
--- a/src/netwm.c
+++ b/src/netwm.c
@@ -1467,7 +1467,10 @@ clientGetUserTime (Client * c)
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);
}