[metacity] Allow raise_on_click to be set independent of focus_mode

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 03e8e63d6accd26f47025ba23d295de910f9f989
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Sun Dec 28 22:36:27 2014 -0800

    Allow raise_on_click to be set independent of focus_mode
    
    Based on a patch by Thomas Jaeger <ThJaeger gmail com>

 src/core/core.c  |    3 +--
 src/core/prefs.c |    5 +----
 2 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/src/core/core.c b/src/core/core.c
index 5b56ab6..7153c1f 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -269,8 +269,7 @@ meta_core_user_lower_and_unfocus (Display *xdisplay,
 
   meta_window_lower (window);
 
-  if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK &&
-      meta_prefs_get_raise_on_click ())
+  if (meta_prefs_get_raise_on_click ())
     {
       /* Move window to the back of the focusing workspace's MRU list.
        * Do extra sanity checks to avoid possible race conditions.
diff --git a/src/core/prefs.c b/src/core/prefs.c
index 3820ba9..133f424 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -924,10 +924,7 @@ meta_prefs_get_attach_modal_dialogs (void)
 gboolean
 meta_prefs_get_raise_on_click (void)
 {
-  /* Force raise_on_click on for click-to-focus, as requested by Havoc
-   * in #326156.
-   */
-  return raise_on_click || focus_mode == G_DESKTOP_FOCUS_MODE_CLICK;
+  return raise_on_click;
 }
 
 const char*