Index: src/display.c
===================================================================
RCS file: /cvs/gnome/metacity/src/display.c,v
retrieving revision 1.241
diff -p -u -r1.241 display.c
--- src/display.c	23 Dec 2004 06:44:56 -0000	1.241
+++ src/display.c	27 Dec 2004 23:21:08 -0000
@@ -4611,7 +4611,11 @@ meta_display_set_input_focus_window (Met
                                      gboolean     focus_frame,
                                      Time         timestamp)
 {
-  if (XSERVER_TIME_IS_BEFORE (timestamp, display->last_focus_time))
+  if (timestamp == CurrentTime)
+    meta_warning ("meta_display_set_input_focus_window called with a timestamp "
+                  "of 0 for window %s.  This shouldn't happen!\n",
+                  window->desc);
+  else if (XSERVER_TIME_IS_BEFORE (timestamp, display->last_focus_time))
     return;
 
   XSetInputFocus (display->xdisplay,
@@ -4629,8 +4633,14 @@ void
 meta_display_focus_the_no_focus_window (MetaDisplay *display, 
                                         Time         timestamp)
 {
-  if (XSERVER_TIME_IS_BEFORE (timestamp, display->last_focus_time))
+  if (timestamp == CurrentTime)
+    meta_warning ("meta_display_focus_the_no_focus_window called with a "
+                  "timestamp of 0.  This shouldn't happen!\n");
+  else if (XSERVER_TIME_IS_BEFORE (timestamp, display->last_focus_time))
+    {
+      meta_warning ("Ignoring focus request for no_focus_window since %lu is less than %lu.\n", timestamp, display->last_focus_time);
     return;
+    }
 
   XSetInputFocus (display->xdisplay,
                   display->no_focus_window,
