Merge lp:~elementary-os/indicator-session/onlyshowin-add-pantheon into lp:indicator-session/14.04

Proposed by Sergey "Shnatsel" Davidoff
Status: Merged
Approved by: Charles Kerr
Approved revision: 445
Merged at revision: 447
Proposed branch: lp:~elementary-os/indicator-session/onlyshowin-add-pantheon
Merge into: lp:indicator-session/14.04
Diff against target: 12 lines (+1/-1)
1 file modified
data/indicator-session.desktop.in (+1/-1)
To merge this branch: bzr merge lp:~elementary-os/indicator-session/onlyshowin-add-pantheon
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Review via email: mp+214224@code.launchpad.net

Commit message

Allow Pantheon as a valid show-in target.

Description of the change

Show the Session Menu in Pantheon, the desktop environment of elementary Project, in addition to GNOME and Unity (bug #1301699).
This will allow installing Pantheon on Ubuntu without requiring patching indicator packages to circumvent the current restrictive OnlyShowIn.

The indicator is not yet fully functional in Pantheon because of inaccurate check for availability of Unity in https://bazaar.launchpad.net/~indicator-applet-developers/indicator-session/trunk.14.04/view/head:/src/backend-dbus/actions.c#L94
The fix for that should come in a subsequent merge request.

To post a comment you must log in.
Revision history for this message
Charles Kerr (charlesk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/indicator-session.desktop.in'
2--- data/indicator-session.desktop.in 2014-02-26 16:40:36 +0000
3+++ data/indicator-session.desktop.in 2014-04-04 12:26:38 +0000
4@@ -2,7 +2,7 @@
5 Type=Application
6 Name=Indicator Session
7 Exec=@pkglibexecdir@/indicator-session-service
8-OnlyShowIn=Unity;GNOME;
9+OnlyShowIn=Unity;GNOME;Pantheon;
10 NoDisplay=true
11 StartupNotify=false
12 Terminal=false

Subscribers

People subscribed via source and target branches