[mutter/f21] Backport fix for raise-on-click regression

[Florian Müllner]

commit 0bc22a3e2f7dac828192041046d28f87232d1f78
Author: Florian Müllner <fmuellner at gnome.org>
Date:   Tue Oct 21 19:01:25 2014 +0200

    Backport fix for raise-on-click regression
    
    Resolves: rhbz#1151918

 ...lay-Fix-accidental-inversion-from-2f9c601.patch |   29 ++++++++++++++++++++
 mutter.spec                                        |    8 +++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/0001-display-Fix-accidental-inversion-from-2f9c601.patch b/0001-display-Fix-accidental-inversion-from-2f9c601.patch
new file mode 100644
index 0000000..4475ac1
--- /dev/null
+++ b/0001-display-Fix-accidental-inversion-from-2f9c601.patch
@@ -0,0 +1,29 @@
+From bb79a20fac05b1412eb4225e780d3dbcf45ebb6d Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre at mecheye.net>
+Date: Tue, 14 Oct 2014 22:19:57 -0700
+Subject: [PATCH] display: Fix accidental inversion from 2f9c601
+
+Commit 2f9c601 accidentally changed the logic here, changing the grab
+behavior when not using raise-on-click. Fix this.
+
+Spotted-by: Adam Goode <adam at spicenitz.org>
+---
+ src/core/display.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/display.c b/src/core/display.c
+index 4669593..185452b 100644
+--- a/src/core/display.c
++++ b/src/core/display.c
+@@ -1965,7 +1965,7 @@ meta_display_end_grab_op (MetaDisplay *display,
+        * beginning of the grab_op.
+        */
+       if (!meta_prefs_get_raise_on_click () &&
+-          display->grab_threshold_movement_reached)
++          !display->grab_threshold_movement_reached)
+         meta_window_raise (display->grab_window);
+ 
+       meta_window_grab_op_ended (grab_window, grab_op);
+-- 
+2.1.0
+
diff --git a/mutter.spec b/mutter.spec
index aa05d7b..f92bb8d 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -2,7 +2,7 @@
 
 Name:          mutter
 Version:       3.14.1
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Window and compositing manager based on Clutter
 
 Group:         User Interface/Desktops
@@ -11,6 +11,8 @@ License:       GPLv2+
 URL:           http://www.gnome.org
 Source0:       http://download.gnome.org/sources/%{name}/3.14/%{name}-%{version}.tar.xz
 
+Patch0: 0001-display-Fix-accidental-inversion-from-2f9c601.patch
+
 BuildRequires: clutter-devel >= %{clutter_version}
 BuildRequires: pango-devel
 BuildRequires: startup-notification-devel
@@ -75,6 +77,7 @@ utilities for testing Metacity/Mutter themes.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-raise-on-click-regression
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
@@ -139,6 +142,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %exclude %{_datadir}/gtk-doc
 
 %changelog
+* Tue Oct 21 2014 Florian Müllner <fmuellner at redhat.com> - 3.14.1-2
+- Fix regression in handling raise-on-click option (rhbz#1151918)
+
 * Tue Oct 14 2014 Florian Müllner <fmuellner at redhat.com> - 3.14.1-1
 - Update to 3.14.1