Index: src/window.c
===================================================================
RCS file: /cvs/gnome/metacity/src/window.c,v
retrieving revision 1.370
diff -p -u -r1.370 window.c
--- src/window.c	5 Feb 2005 03:02:42 -0000	1.370
+++ src/window.c	5 Feb 2005 21:53:53 -0000
@@ -2155,6 +2155,17 @@ void
 meta_window_activate (MetaWindow *window,
                       guint32     timestamp)
 {
+  if (XSERVER_TIME_IS_BEFORE (timestamp, window->display->last_focus_time) ||
+      timestamp == 0)
+    {
+      meta_topic (META_DEBUG_FOCUS,
+                  "_NET_ACTIVE_WINDOW message sent but with a timestamp that"
+                  "requests the window not be active, so we're ignoring it.\n");
+      window->wm_state_demands_attention = TRUE;
+      set_net_wm_state (window);
+      return;
+    }
+  
   if (timestamp != 0)
     window->net_wm_user_time = timestamp;
 
