[merge] Support new libindicator API

(bzr r543)

2 files changed, 11 insertions, 0 deletions

diff --git a/unity-private/panel/panel-indicator-object-entry-view.vala b/unity-private/panel/panel-indicator-object-entry-view.vala
index c1d2e05d4..2829ef4fe 100644
--- a/unity-private/panel/panel-indicator-object-entry-view.vala
+++ b/unity-private/panel/panel-indicator-object-entry-view.vala
@@ -23,6 +23,7 @@ namespace Unity.Panel.Indicators
 {
 public unowned Indicator.ObjectEntry entry { get; construct; }
 public signal void menu_moved (Gtk.MenuDirectionType type);
+ public signal void entry_shown ();
 
 private Clutter.CairoTexture bg;
 public Ctk.Image image;
@@ -469,6 +470,8 @@ namespace Unity.Panel.Indicators
 entry.menu.move_current.connect (menu_key_moved);
 entry.menu.notify["visible"].connect (menu_vis_changed);
 bg.opacity = 255;
+
+ entry_shown ();
 }
 }
 
diff --git a/unity-private/panel/panel-indicator-object-view.vala b/unity-private/panel/panel-indicator-object-view.vala
index 0816efc89..c102bb248 100644
--- a/unity-private/panel/panel-indicator-object-view.vala
+++ b/unity-private/panel/panel-indicator-object-view.vala
@@ -68,6 +68,7 @@ namespace Unity.Panel.Indicators
 IndicatorObjectEntryView object_entry_view = new IndicatorObjectEntryView (indicator_object_entry);
 
 object_entry_view.menu_moved.connect (this.on_menu_moved);
+ object_entry_view.entry_shown.connect (on_entry_shown);
 
 this.indicator_entry_array.add (object_entry_view);
 this.add_actor (object_entry_view);
@@ -167,12 +168,19 @@ namespace Unity.Panel.Indicators
 IndicatorObjectEntryView object_entry_view = new IndicatorObjectEntryView (indicator_object_entry);
 
 object_entry_view.menu_moved.connect (this.on_menu_moved);
+ object_entry_view.entry_shown.connect (on_entry_shown);
 
 this.indicator_entry_array.add (object_entry_view);
 this.add_actor (object_entry_view);
 
 }
 
+ private void on_entry_shown (IndicatorObjectEntryView view)
+ {
+ indicator_object.entry_activate (view.entry,
+ global_shell.get_current_time ());
+ }
+
 private void remove_entry (Indicator.ObjectEntry entry)
 {
 for (int i = 0; i < indicator_entry_array.size; i++)