Index: src/window.c
===================================================================
RCS file: /cvs/gnome/metacity/src/window.c,v
retrieving revision 1.343
diff -p -u -r1.343 window.c
--- src/window.c	30 Aug 2004 04:56:07 -0000	1.343
+++ src/window.c	6 Sep 2004 16:55:40 -0000
@@ -1083,13 +1083,7 @@ meta_window_free (MetaWindow  *window)
     g_object_unref (G_OBJECT (window->mini_icon));
 
   meta_icon_cache_free (&window->icon_cache);
-
-  /* Avoid a race condition between the focusing of the mru window and the
-   * mouse entering the window beneath the one closed in sloppy/mouse focus
-   * modes.
-   */  
-  meta_display_increment_focus_sentinel (window->display);
-
+  
   g_free (window->sm_client_id);
   g_free (window->wm_client_machine);
   g_free (window->startup_id);
@@ -1497,23 +1491,6 @@ idle_calc_showing (gpointer data)
    * condition.
    */
   tmp = should_show;
-  while (tmp != NULL)
-    {
-      MetaWindow *window = tmp->data;
-      
-      if (g_slist_find (displays, window->display) == NULL)
-        {
-          displays = g_slist_prepend (displays, window->display);
-          meta_display_increment_focus_sentinel (window->display);
-        }
-
-      tmp = tmp->next;
-    }
-  /* There's also a potential race condition on window minimize.
-   * So we need to avoid that to, in the same manner.  As with the
-   * case above, this race condition is only for sloppy/mouse focus.
-   */
-  tmp = should_hide;
   while (tmp != NULL)
     {
       MetaWindow *window = tmp->data;
