Index: src/window.c
===================================================================
RCS file: /cvs/gnome/metacity/src/window.c,v
retrieving revision 1.372
diff -p -u -r1.372 window.c
--- src/window.c	6 Feb 2005 17:01:41 -0000	1.372
+++ src/window.c	8 Feb 2005 23:21:32 -0000
@@ -2169,8 +2169,10 @@ meta_window_activate (MetaWindow *window
       return;
     }
   
-  if (timestamp != 0)
-    window->net_wm_user_time = timestamp;
+  if (timestamp == 0)
+    timestamp = meta_display_get_current_time_roundtrip (window->display);
+
+  window->net_wm_user_time = timestamp;
 
   /* disable show desktop mode unless we're a desktop component */
   maybe_leave_show_desktop_mode (window);
