[cinnamon/f17] update to 1.5.2 release

[leigh123linux]

commit d4faa1b44d6d771b8f79dc478fd121edcfa64515
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Jul 27 19:22:13 2012 +0100

    update to 1.5.2 release
    
    - patch systray applet

 cinnamon-1.4.1_systray.patch |   22 -
 cinnamon-menu.patch          | 3410 ------------------------------------------
 cinnamon.spec                |   16 +-
 sources                      |    2 +-
 systray.patch                |   30 +
 5 files changed, 39 insertions(+), 3441 deletions(-)
---
diff --git a/cinnamon.spec b/cinnamon.spec
index 264d0c6..56210d2 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,4 +1,4 @@
-%global        _internal_version  719889b
+%global        _internal_version  9e88200
 
 %{?filter_setup:
 %filter_from_provides /^libcinnamon.so/d;
@@ -7,7 +7,7 @@
 }
 
 Name:           cinnamon
-Version:        1.5.1
+Version:        1.5.2
 Release:        1%{?dist}
 Summary:        Window management and application launching for GNOME
 
@@ -30,12 +30,8 @@ Patch1:         cinnamon-1.5.0_datetime_setting.patch
 # Replace mint favorites with fedora gnome-shell defaults
 Patch2:         cinnamon-1.4.1_f17_favourite-apps-firefox.patch
 
-
 # upstream patches and pending pulls
-# https://github.com/linuxmint/Cinnamon/pull/851
-Patch10:         cinnamon-1.4.1_systray.patch
-# https://github.com/linuxmint/Cinnamon/pull/929
-Patch11:         cinnamon-menu.patch
+Patch11:        systray.patch
 
 
 %global clutter_version 1.7.5
@@ -119,8 +115,8 @@ The emphasis is put on making users feel at home and providing
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+
 # upstream patches and pending pulls
-%patch10 -p1
 %patch11 -p1
 
 
@@ -229,6 +225,10 @@ fi
 
 
 %changelog
+* Fri Jul 27 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.2-1
+- update to 1.5.2 release
+- patch systray applet
+
 * Thu Jul 26 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.1-1
 - Update to 1.5.1 release
 - Remove buildrequires telepathy-glib-devel, telepathy-logger-devel and folks-devel
diff --git a/sources b/sources
index dc832bf..e723498 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9b6111d402a6f0313676814da298a95d  cinnamon-1.5.1.tar.gz
+7314b9cf730830c1fa3f9926f7c4272a  cinnamon-1.5.2.tar.gz
diff --git a/systray.patch b/systray.patch
new file mode 100644
index 0000000..158776f
--- /dev/null
+++ b/systray.patch
@@ -0,0 +1,30 @@
+--- a/js/ui/layout.js
++++ b/js/ui/layout.js
+@@ -1138,7 +1138,15 @@ Chrome.prototype = {
+             struts.push(strut);
+         }
+ 
+-        if (global.top_window_group.get_children().length == 0)
++        let enable_stage = true;
++        let top_windows = global.top_window_group.get_children();
++        for (var i in top_windows){
++            if (top_windows[i]._windowType != Meta.WindowType.TOOLTIP){
++                enable_stage = false;
++                break;
++            }
++        }
++        if (enable_stage)
+             global.set_stage_input_region(rects);
+         else
+             global.set_stage_input_region([]);
+--- a/files/usr/share/cinnamon/applets/systray at cinnamon.org/applet.js
++++ b/files/usr/share/cinnamon/applets/systray at cinnamon.org/applet.js
+@@ -61,7 +61,7 @@ MyApplet.prototype = {
+                 height = themeNode.get_length('height');                        
+             }
+             
+-            if (buggyIcons.indexOf(role) != -1) {
++            if (icon.get_width() == 1 || icon.get_height() == 1 || buggyIcons.indexOf(role) != -1) {
+                 icon.set_height(height);
+             }
+             else {