Index: src/display.c
===================================================================
RCS file: /cvs/gnome/metacity/src/display.c,v
retrieving revision 1.205
diff -p -u -r1.205 display.c
--- src/display.c	24 Nov 2003 23:05:04 -0000	1.205
+++ src/display.c	27 Nov 2003 12:08:10 -0000
@@ -1376,7 +1376,7 @@ event_callback (XEvent   *event,
                    * in click to focus mode? The debate rages.
                    * Feel free to change TRUE to FALSE
                    */
-                  if (TRUE /* meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK */) 
+                  if (FALSE /* meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK */) 
                     {
                       meta_window_raise (window);
                       
Index: src/window.c
===================================================================
RCS file: /cvs/gnome/metacity/src/window.c,v
retrieving revision 1.314
diff -p -u -r1.314 window.c
--- src/window.c	24 Nov 2003 23:05:04 -0000	1.314
+++ src/window.c	27 Nov 2003 12:08:17 -0000
@@ -4063,6 +4063,8 @@ meta_window_notify_focus (MetaWindow *wi
 
       if (window != window->display->focus_window)
         {
+          if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK)
+            meta_window_raise (window);
           meta_topic (META_DEBUG_FOCUS,
                       "* Focus --> %s\n", window->desc);
           window->display->focus_window = window;
