merge r5719 from trunk

diff --git a/openbox/client.c b/openbox/client.c
index 3e069464218c5ba1bfcb7b724b753bcc322dfff0..c9e09f54fd0d2b1ef76aee8719ed537bb88e5f23 100644 (file)
--- 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);