--- xfwm4-4.4.2/src/client.c	2007-11-17 13:32:13.000000000 -0600
+++ xfwm4-mod/src/client.c	2008-12-03 15:02:41.000000000 -0600
@@ -2638,7 +2638,10 @@
         }
         clientShow (c, TRUE);
         clientClearAllShowDesktop (screen_info);
-        clientSetFocus (screen_info, c, timestamp, NO_FOCUS_FLAG);
+        if (screen_info->params->click_to_focus)
+        {
+            clientSetFocus (screen_info, c, timestamp, NO_FOCUS_FLAG);
+        }
         clientRaise (c, None);
     }
     else