[gnome-shell/f19] Include upstream fix for child menu regression

[Florian Müllner]

commit 2f7aeb4781044a467f7a2f7fc483929fce62d971
Author: Florian Müllner <fmuellner at gnome.org>
Date:   Tue May 14 19:14:10 2013 +0200

    Include upstream fix for child menu regression

 0001-PopupMenuManager-Fix-child-menus.patch |   32 +++++++++++++++++++++++++++
 gnome-shell.spec                            |    9 ++++++-
 2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/0001-PopupMenuManager-Fix-child-menus.patch b/0001-PopupMenuManager-Fix-child-menus.patch
new file mode 100644
index 0000000..2ad3ffd
--- /dev/null
+++ b/0001-PopupMenuManager-Fix-child-menus.patch
@@ -0,0 +1,32 @@
+From dd8ca024254341258a9e54c253c080f25be6f9cd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner at gnome.org>
+Date: Tue, 14 May 2013 18:55:08 +0200
+Subject: [PATCH] PopupMenuManager: Fix child menus
+
+Since commit c84dc6254d2d65c, popup menus are closed automatically
+when another menu opens (to catch the case where a menu is opened
+by keyboard shortcut, which wasn't handled before). However in the
+case of child menus, both child and parent are expected to be visible,
+so handle this case explicitly.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=699678
+---
+ js/ui/popupMenu.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
+index fc37dd8..ab6c795 100644
+--- a/js/ui/popupMenu.js
++++ b/js/ui/popupMenu.js
+@@ -2124,7 +2124,7 @@ const PopupMenuManager = new Lang.Class({
+ 
+     _onMenuOpenState: function(menu, open) {
+         if (open) {
+-            if (this.activeMenu)
++            if (this.activeMenu && !this.activeMenu.isChildMenu(menu))
+                 this.activeMenu.close(BoxPointer.PopupAnimation.FADE);
+             this._grabHelper.grab({ actor: menu.actor, modal: true, focus: menu.sourceActor,
+                                     onUngrab: Lang.bind(this, this._closeMenu, menu) });
+-- 
+1.8.2.1
+
diff --git a/gnome-shell.spec b/gnome-shell.spec
index 37dcba4..5603341 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -1,6 +1,6 @@
 Name:           gnome-shell
 Version:        3.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -13,6 +13,9 @@ Source0:        http://download.gnome.org/sources/gnome-shell/3.8/%{name}-%{vers
 # Replace Epiphany with Firefox in the default favourite apps list
 Patch1: gnome-shell-favourite-apps-firefox.patch
 
+# Temporarily include upstream patch
+Patch5: 0001-PopupMenuManager-Fix-child-menus.patch
+
 %define clutter_version 1.13.4
 %define gnome_bluetooth_version 3.5.5
 %define gobject_introspection_version 0.10.1
@@ -115,6 +118,7 @@ easy to use experience.
 %prep
 %setup -q
 %patch1 -p1 -b .firefox
+%patch5 -p1 -b .child-menus
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
@@ -180,6 +184,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null
 %exclude %{_datadir}/gtk-doc
 
 %changelog
+* Tue May 14 2013 Florian Müllner <fmuellner at redhat.com> - 3.8.2-2
+- Include upstream fix for bug #962876
+
 * Mon May 13 2013 Florian Müllner <fmuellner at redhat.com> - 3.8.2-1
 - Update to 3.8.2 and drop upstreamed patches