[cinnamon] add upstream menu applet commits

leigh123linux leigh123linux at fedoraproject.org
Sat Oct 13 12:49:44 UTC 2012


commit 3a3606c4f8a04589aaf7b13a3aa27c882ae38bd3
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sat Oct 13 13:48:17 2012 +0100

    add upstream menu applet commits

 cinnamon.spec           |    2 ++
 menu_applet_fixes.patch |   19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 0 deletions(-)
---
diff --git a/cinnamon.spec b/cinnamon.spec
index 41eafe5..1a3c807 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -35,6 +35,7 @@ Patch4:         bluetooth_applet.patch
 Patch5:         cinnamon.css.patch
 
 # upstream patches and pending pulls
+Patch20:        menu_applet_fixes.patch
 
 
 %global clutter_version 1.10.1
@@ -131,6 +132,7 @@ The emphasis is put on making users feel at home and providing
 
 
 # upstream patches and pending pulls
+%patch20 -p1
 
 
 # remove gschema
diff --git a/menu_applet_fixes.patch b/menu_applet_fixes.patch
new file mode 100644
index 0000000..8d537cb
--- /dev/null
+++ b/menu_applet_fixes.patch
@@ -0,0 +1,19 @@
+--- a/files/usr/share/cinnamon/applets/menu at cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/menu at cinnamon.org/applet.js
+@@ -144,7 +144,6 @@ ApplicationContextMenuItem.prototype = {
+                 AppFavorites.getAppFavorites().removeFavorite(this._appButton.app.get_id());
+                 break;
+         }
+-        this._appButton.actor.grab_key_focus();
+         this._appButton.toggleMenu();
+         return false;
+     }
+@@ -1296,7 +1295,7 @@ MyApplet.prototype = {
+                     }
+                 }
+             } else if (nextType == GMenu.TreeItemType.DIRECTORY) {
+-                subdir = iter.get_directory();
++                let subdir = iter.get_directory();
+                 this.applicationsByCategory[subdir.get_menu_id()] = new Array();
+                 this._loadCategory(subdir, top_dir);
+             }


More information about the scm-commits mailing list