Application Menu Indicator

Merge lp:~desrt/indicator-appmenu/hud-awareness-menubar-fix into lp:indicator-appmenu/13.04

  1. hud-awareness-menubar-fix
  2. Merge into trunk.13.04
Proposed by Allison Karlitskaya
Status: Merged
Approved by: Lars Karlitski
Approved revision: 216
Merge reported by: Lars Karlitski
Merged at revision: not available
Proposed branch: lp:~desrt/indicator-appmenu/hud-awareness-menubar-fix
Merge into: lp:indicator-appmenu/13.04
Diff against target: 21 lines (+2/-2)
1 file modified
src/hudmenumodelcollector.c (+2/-2)
To merge this branch: bzr merge lp:~desrt/indicator-appmenu/hud-awareness-menubar-fix
Reviewer Review Type Date Requested Status
Lars Karlitski (community) Approve
Review via email: mp+130469@code.launchpad.net

Description of the change

hud-awareness: fix a pair of silly copy/paste errors

The HUD awareness protocol was working properly for app menus but not menubars
due to a pair of rather silly copy/paste errors. This corrects that.

To post a comment you must log in.
Revision history for this message
Allison Karlitskaya (desrt) wrote :

Would be nice to get this SRU'd as well.... it is needed for libreoffice to work properly with the HUD.

Revision history for this message
Lars Karlitski (larsu) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/hudmenumodelcollector.c'
2--- src/hudmenumodelcollector.c 2012-10-04 06:24:40 +0000
3+++ src/hudmenumodelcollector.c 2012-10-19 02:34:19 +0000
4@@ -483,7 +483,7 @@
5 NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL, NULL);
6
7 if (collector->menubar_is_hud_aware)
8- g_dbus_connection_call (collector->session, collector->unique_bus_name, collector->app_menu_object_path,
9+ g_dbus_connection_call (collector->session, collector->unique_bus_name, collector->menubar_object_path,
10 "com.canonical.hud.Awareness", "HudActiveChanged", g_variant_new ("(b)", active),
11 NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL, NULL);
12 }
13@@ -676,7 +676,7 @@
14 {
15 collector->menubar = g_dbus_menu_model_get (session, unique_bus_name, collector->menubar_object_path);
16 hud_menu_model_collector_add_model (collector, G_MENU_MODEL (collector->menubar), NULL, NULL, NULL);
17- g_dbus_connection_call (session, unique_bus_name, collector->app_menu_object_path,
18+ g_dbus_connection_call (session, unique_bus_name, collector->menubar_object_path,
19 "com.canonical.hud.Awareness", "CheckAwareness",
20 NULL, G_VARIANT_TYPE_UNIT, G_DBUS_CALL_FLAGS_NONE, -1, collector->cancellable,
21 hud_menu_model_collector_hud_awareness_cb, &collector->menubar_is_hud_aware);

Subscribers

People subscribed via source and target branches