Merge lp:~unity-team/unity/unity.fix-604505-2 into lp:unity

[Mirco Müller]

For the case when a program with insensitive menus is started... upon initial focus insensitive menus were reactive still. With this patch this is no longer the case. Initial insensitive menus are neither accessable with the mouse nor with the keyboard-navigation.Tested with gnome-dictionary and empathy. Fixes LP: #604505

[Gord Allott (gordallott)]

Approved

review: Approve

=== modified file 'unity-private/panel/panel-indicator-object-entry-view.vala'
--- unity-private/panel/panel-indicator-object-entry-view.vala	2010-09-17 15:31:25 +0000
+++ unity-private/panel/panel-indicator-object-entry-view.vala	2010-09-21 14:41:12 +0000
@@ -43,6 +43,34 @@
               spacing:3,
               homogeneous:false,
               reactive:true);
+
+      if (entry.label != null)
+        {
+          if ((entry.label.get_flags () & Gtk.WidgetFlags.SENSITIVE) != 0)
+            {
+              this.reactive = true;
+              this.skip = false;
+            }
+          else
+            {
+              this.reactive = false;
+              this.skip = true;
+            }
+        }
+
+      if (entry.image != null)
+        {
+          if ((entry.image.get_flags () & Gtk.WidgetFlags.SENSITIVE) != 0)
+            {
+              this.reactive = true;
+              this.skip = false;
+            }
+          else
+            {
+              this.reactive = false;
+              this.skip = true;
+            }
+        }
     }
 
     ~IndicatorObjectEntryView ()