Index: src/screen.c
===================================================================
RCS file: /cvs/gnome/metacity/src/screen.c,v
retrieving revision 1.127
diff -p -u -r1.127 screen.c
--- src/screen.c	7 Aug 2004 16:33:11 -0000	1.127
+++ src/screen.c	6 Sep 2004 15:49:52 -0000
@@ -2239,8 +2239,6 @@ meta_screen_show_desktop (MetaScreen *sc
   queue_windows_showing (screen);
 
   update_showing_desktop_hint (screen);
-
-  meta_workspace_focus_top_window (screen->active_workspace, NULL);
 }
 
 void
Index: src/workspace.c
===================================================================
RCS file: /cvs/gnome/metacity/src/workspace.c,v
retrieving revision 1.60
diff -p -u -r1.60 workspace.c
--- src/workspace.c	27 Aug 2004 17:22:54 -0000	1.60
+++ src/workspace.c	6 Sep 2004 15:49:52 -0000
@@ -27,9 +27,12 @@
 #include <X11/Xatom.h>
 #include <string.h>
 
-void meta_workspace_queue_calc_showing  (MetaWorkspace *workspace);
-
-static void set_active_space_hint      (MetaScreen *screen);
+void meta_workspace_queue_calc_showing      (MetaWorkspace *workspace);
+static void set_active_space_hint           (MetaScreen *screen);
+static void meta_workspace_focus_mru_window (MetaWorkspace *workspace,
+                                             MetaWindow    *not_this_one);
+static void meta_workspace_focus_top_window (MetaWorkspace *workspace,
+                                             MetaWindow    *not_this_one);
 
 static void
 maybe_add_to_list (MetaScreen *screen, MetaWindow *window, gpointer data)
Index: src/workspace.h
===================================================================
RCS file: /cvs/gnome/metacity/src/workspace.h,v
retrieving revision 1.17
diff -p -u -r1.17 workspace.h
--- src/workspace.h	15 Aug 2003 22:09:55 -0000	1.17
+++ src/workspace.h	6 Sep 2004 15:49:52 -0000
@@ -77,11 +77,7 @@ void meta_workspace_get_work_area_for_xi
 void meta_workspace_get_work_area_all_xineramas (MetaWorkspace *workspace,
                                                  MetaRectangle *area);
 
-void meta_workspace_focus_mru_window     (MetaWorkspace *workspace,
-                                          MetaWindow    *not_this_one);
 void meta_workspace_focus_default_window (MetaWorkspace *workspace,
-                                          MetaWindow    *not_this_one);
-void meta_workspace_focus_top_window     (MetaWorkspace *workspace,
                                           MetaWindow    *not_this_one);
 
 MetaWorkspace* meta_workspace_get_neighbor (MetaWorkspace      *workspace,
