Index: src/display.c
===================================================================
RCS file: /cvs/gnome/metacity/src/display.c,v
retrieving revision 1.213
diff -p -u -r1.213 display.c
--- src/display.c	10 Jan 2004 17:16:05 -0000	1.213
+++ src/display.c	25 Jan 2004 21:54:32 -0000
@@ -1380,7 +1380,7 @@ event_callback (XEvent   *event,
                    * in click to focus mode? The debate rages.
                    * Feel free to change TRUE to FALSE or vice versa
                    */
-                  if (TRUE /* meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK */) 
+                  if (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.322
diff -p -u -r1.322 window.c
--- src/window.c	17 Jan 2004 18:57:26 -0000	1.322
+++ src/window.c	25 Jan 2004 21:54:39 -0000
@@ -4121,6 +4121,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;
