Merge lp://qastaging/~3v1n0/indicator-appmenu/lim-mode-trusty into lp://qastaging/indicator-appmenu/14.04

Proposed by Marco Trevisan (Treviño)
Status: Approved
Approved by: Christopher Townsend
Approved revision: 267
Proposed branch: lp://qastaging/~3v1n0/indicator-appmenu/lim-mode-trusty
Merge into: lp://qastaging/indicator-appmenu/14.04
Diff against target: 1281 lines (+328/-278)
9 files modified
configure.ac (+1/-2)
debian/changelog (+6/-0)
debian/control (+1/-2)
m4/gcov.m4 (+1/-1)
src/indicator-appmenu.c (+294/-215)
src/window-menu-dbusmenu.c (+9/-14)
src/window-menu-model.c (+13/-37)
src/window-menu.c (+2/-2)
tools/current-menu-dump.in (+1/-5)
To merge this branch: bzr merge lp://qastaging/~3v1n0/indicator-appmenu/lim-mode-trusty
Reviewer Review Type Date Requested Status
Christopher Townsend (community) Approve
Review via email: mp+264843@code.qastaging.launchpad.net

Commit message

IndicatorAppmenu: add modes support and implement unity-all-menus mode

When this mode is enabled, we export all the menus to the indicator, it will be up
to unity to filter them out based on their parent xid.

Description of the change

Backported relevant branches for LIM

To post a comment you must log in.
267. By Marco Trevisan (Treviño)

debian/changelog: fix version

Revision history for this message
Christopher Townsend (townsend) wrote :

Good as far as I can tell.

review: Approve

Unmerged revisions

267. By Marco Trevisan (Treviño)

debian/changelog: fix version

266. By Marco Trevisan (Treviño)

IndicatorAppmenu: make sure we call window_menu_entry_activate also in AllMenus mode

265. By Marco Trevisan (Treviño)

IndicatorAppmenu: ensure we emit entry-added/removed signals after/before creating/destroying WindowMenu

264. By Marco Trevisan (Treviño)

IndicatorAppmenu: add modes support and implement unity-all-menus mode

When this mode is enabled, we export all the menus to the indicator, it will be up
to unity to filter them out based on their parent xid. Fixes: #1309778

263. By Dmitry Shachnev

Look for dbusmenu-dumper in correct location

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches