From: Mikael Magnusson <mikachu@comhem.se>
Date: Wed, 28 Mar 2007 19:58:58 +0000 (+0000)
Subject: merge r5719 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~261
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=32abec5afa3884cf0d81d03de2c166ad7d009a88;p=dana%2Fopenbox.git

merge r5719 from trunk
---

diff --git a/openbox/client.c b/openbox/client.c
index 3e069464..c9e09f54 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -272,7 +272,7 @@ void client_manage(Window window)
     self->wmstate = WithdrawnState; /* make sure it gets updated first time */
     self->layer = -1;
     self->desktop = screen_num_desktops; /* always an invalid value */
-    self->user_time = ~0; /* maximum value, always newer than the real time */
+    self->user_time = client_last_user_time;
 
     client_get_all(self);
     client_restore_session_state(self);