Merge lp:~ubuntu-mate-dev/indicator-session/mate-integration into lp:indicator-session
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Iain Lane | ||||
Approved revision: | 507 | ||||
Merged at revision: | 494 | ||||
Proposed branch: | lp:~ubuntu-mate-dev/indicator-session/mate-integration | ||||
Merge into: | lp:indicator-session | ||||
Diff against target: |
175 lines (+65/-11) 3 files modified
debian/changelog (+6/-0) debian/control (+1/-1) src/backend-dbus/actions.c (+58/-10) |
||||
To merge this branch: | bzr merge lp:~ubuntu-mate-dev/indicator-session/mate-integration | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Iain Lane | Approve | ||
Ubuntu Sponsors | Pending | ||
Review via email: mp+325600@code.launchpad.net |
Description of the change
This merge proposal adds the remaining support for MATE Desktop. When MATE is the desktop session:
* "About This Computer" launches `mate-system-
* "Ubuntu Help..." launches the MATE User Guide.
* "System Settings..." launches `mate-control-
* "Lock/Switch Account..." invokes `mate-screensav
`mate-system-
`mate-user-guide` is added to debian/control Suggests: to provide the hint it is required for MATE. It is installed by default in Ubuntu MATE.
`have_mate_
Some small refactoring then looks good.