Index: src/window.c
===================================================================
RCS file: /cvs/gnome/metacity/src/window.c,v
retrieving revision 1.358
diff -p -u -r1.358 window.c
--- src/window.c	24 Dec 2004 19:40:09 -0000	1.358
+++ src/window.c	24 Dec 2004 20:06:50 -0000
@@ -1761,25 +1761,22 @@ meta_window_show (MetaWindow *window)
         }
     }
 
-  if (did_placement)
+  if (takes_focus_on_map)
     {
-      if (takes_focus_on_map)
-        {                
-          meta_window_focus (window,
-                             meta_display_get_current_time_roundtrip (window->display));
-        }
-      else
-        {
-          window->wm_state_demands_attention = TRUE;
+      meta_window_focus (window,
+                         meta_display_get_current_time_roundtrip (window->display));
+    }
+  else
+    {
+      window->wm_state_demands_attention = TRUE;
 
-          /* Prevent EnterNotify events in sloppy/mouse focus from
-           * erroneously focusing the window that had been denied
-           * focus.  FIXME: This introduces a race; I have a couple
-           * ideas for a better way to accomplish the same thing, but
-           * they're more involved so do it this way for now.
-           */
-          meta_display_increment_focus_sentinel (window->display);
-        }
+      /* Prevent EnterNotify events in sloppy/mouse focus from
+       * erroneously focusing the window that had been denied
+       * focus.  FIXME: This introduces a race; I have a couple
+       * ideas for a better way to accomplish the same thing, but
+       * they're more involved so do it this way for now.
+       */
+      meta_display_increment_focus_sentinel (window->display);
     }
 
   if (did_show)
