Merge lp:~chrisccoulson/unity/ffox-fixes into lp:unity

Proposed by David Barth
Status: Merged
Merged at revision: 717
Proposed branch: lp:~chrisccoulson/unity/ffox-fixes
Merge into: lp:unity
Diff against target: 19 lines (+2/-0)
1 file modified
services/panel-service.c (+2/-0)
To merge this branch: bzr merge lp:~chrisccoulson/unity/ffox-fixes
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Review via email: mp+43808@code.launchpad.net

Description of the change

See the change description in Chris's bug report at https://bugs.launchpad.net/ubuntu/+source/libdbusmenu/+bug/690447

To post a comment you must log in.
Revision history for this message
Neil J. Patel (njpatel) wrote :

Approved and merged, thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'services/panel-service.c'
2--- services/panel-service.c 2010-12-09 17:53:04 +0000
3+++ services/panel-service.c 2010-12-15 19:05:21 +0000
4@@ -955,6 +955,7 @@
5 {
6 PanelServicePrivate *priv = self->priv;
7 IndicatorObjectEntry *entry = g_hash_table_lookup (priv->id2entry_hash, entry_id);
8+ IndicatorObject *object = g_hash_table_lookup (priv->entry2indicator_hash, entry);
9
10 if (priv->last_entry == entry)
11 return;
12@@ -987,6 +988,7 @@
13 priv->last_menu_move_id = g_signal_connect_after (priv->last_menu, "move-current",
14 G_CALLBACK (on_active_menu_move_current), self);
15
16+ indicator_object_entry_activate (object, entry, CurrentTime);
17 gtk_menu_popup (priv->last_menu, NULL, NULL, positon_menu, self, 0, CurrentTime);
18
19 g_signal_emit (self, _service_signals[ENTRY_ACTIVATED], 0, entry_id);