summaryrefslogtreecommitdiff
path: root/src/netwm.c
diff options
context:
space:
mode:
authorOlivier Fourdan <fourdan.olivier@wanadoo.fr>2009-03-19 12:46:50 +0000
committerOlivier Fourdan <fourdan.olivier@wanadoo.fr>2009-03-19 12:46:50 +0000
commitd6534ae3c7d123606a648b4f8554f2e481975f23 (patch)
treea2f62073b8079d70782354a405d12fa3ecd7f3c3 /src/netwm.c
parent20c1540d8d5609eefedcd3e4fd3ce8728a6bddd1 (diff)
downloadxfwm4-d6534ae3c7d123606a648b4f8554f2e481975f23.tar.gz
* 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 (Old svn revision: 29674)
Diffstat (limited to 'src/netwm.c')
-rw-r--r--src/netwm.c5
1 files changed, 4 insertions, 1 deletions
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);
}