Index: src/display.c
===================================================================
RCS file: /cvs/gnome/metacity/src/display.c,v
retrieving revision 1.249
diff -p -u -r1.249 display.c
--- src/display.c	7 Feb 2005 04:37:34 -0000	1.249
+++ src/display.c	8 Feb 2005 23:43:54 -0000
@@ -4660,6 +4660,7 @@ meta_display_set_input_focus_window (Met
                     "timestamp of 0 for window %s.  This shouldn't happen!\n",
                     window->desc);
       meta_print_backtrace ();
+      timestamp = meta_display_get_current_time_roundtrip (display);
     }
   else if (XSERVER_TIME_IS_BEFORE (timestamp, display->last_focus_time))
     return;
@@ -4684,6 +4685,7 @@ meta_display_focus_the_no_focus_window (
       meta_warning ("meta_display_focus_the_no_focus_window called with a "
                     "timestamp of 0.  This shouldn't happen!\n");
       meta_print_backtrace ();
+      timestamp = meta_display_get_current_time_roundtrip (display);
     }
   else if (XSERVER_TIME_IS_BEFORE (timestamp, display->last_focus_time))
     {
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:43:54 -0000
@@ -2109,7 +2109,7 @@ meta_window_shade (MetaWindow  *window)
                   "Re-focusing window %s after shading it\n",
                   window->desc);
       meta_window_focus (window,
-                         meta_display_get_current_time (window->display));
+                         meta_display_get_current_time_roundtrip (window->display));
       
       set_net_wm_state (window);
     }
@@ -2130,7 +2130,8 @@ meta_window_unshade (MetaWindow  *window
       meta_topic (META_DEBUG_FOCUS,
                   "Focusing window %s after unshading it\n",
                   window->desc);
-      meta_window_focus (window, meta_display_get_current_time (window->display));
+      meta_window_focus (window,
+                         meta_display_get_current_time_roundtrip (window->display));
 
       set_net_wm_state (window);
     }
