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

Proposed by Sergey "Shnatsel" Davidoff
Status: Superseded
Proposed branch: lp:~elementary-os/indicator-sound/onlyshowin-add-pantheon
Merge into: lp:indicator-sound/14.04
Diff against target: 25 lines (+2/-2)
2 files modified
data/indicator-sound.desktop.in (+1/-1)
data/indicator-sound.upstart.desktop.in (+1/-1)
To merge this branch: bzr merge lp:~elementary-os/indicator-sound/onlyshowin-add-pantheon
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Review via email: mp+214235@code.launchpad.net

This proposal has been superseded by a proposal from 2014-06-11.

Description of the change

Add Pantheon, the desktop environment of elementary Project, to OnlyShowIn lists in .desktop files.

Pantheon currently relies on Ayatana indicators; this change will allow installing Pantheon in Ubuntu without requiring elementary-patched indicator packages (bug #1301699).

This indicator shows up and appears to be fully functional in Pantheon after this change.

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

LGTM. Thanks for the patch, Sergey :)

review: Approve
Revision history for this message
Sergey "Shnatsel" Davidoff (shnatsel) wrote :

Thanks for the review! :)

Any word on when this is going to be actually merged?

Unmerged revisions

442. By Sergey "Shnatsel" Davidoff

Add Pantheon to OnlyShowIn list in the .desktop files

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/indicator-sound.desktop.in'
2--- data/indicator-sound.desktop.in 2014-02-26 16:41:16 +0000
3+++ data/indicator-sound.desktop.in 2014-04-04 13:13:15 +0000
4@@ -2,7 +2,7 @@
5 Type=Application
6 Name=Indicator Sound
7 Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
8-OnlyShowIn=Unity;XFCE;GNOME;
9+OnlyShowIn=Unity;XFCE;GNOME;Pantheon;
10 NoDisplay=true
11 StartupNotify=false
12 Terminal=false
13
14=== modified file 'data/indicator-sound.upstart.desktop.in'
15--- data/indicator-sound.upstart.desktop.in 2014-02-20 17:02:02 +0000
16+++ data/indicator-sound.upstart.desktop.in 2014-04-04 13:13:15 +0000
17@@ -2,7 +2,7 @@
18 Type=Application
19 Name=Indicator Sound
20 Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
21-OnlyShowIn=Unity;XFCE;
22+OnlyShowIn=Unity;XFCE;Pantheon;
23 NoDisplay=true
24 StartupNotify=false
25 Terminal=false

Subscribers

People subscribed via source and target branches