The Sound Menu

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

  1. onlyshowin-add-pantheon
  2. Merge into trunk.14.10
Proposed by Ted Gould
Status: Merged
Approved by: Ted Gould
Approved revision: 442
Merged at revision: 445
Proposed branch: lp:~elementary-os/indicator-sound/onlyshowin-add-pantheon
Merge into: lp:indicator-sound/14.10
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
Ted Gould (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Charles Kerr Pending
Review via email: mp+222813@code.launchpad.net

This proposal supersedes a proposal from 2014-04-04.

Commit message

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

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 : Posted in a previous version of this proposal

LGTM. Thanks for the patch, Sergey :)

review: Approve
Revision history for this message
Sergey "Shnatsel" Davidoff (shnatsel) wrote : Posted in a previous version of this proposal

Thanks for the review! :)

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

Revision history for this message
Ted Gould (ted) wrote :

Resubmit for 14.10 branch

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:442
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/134/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-utopic-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-utopic-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/134/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/indicator-sound.desktop.in'
--- data/indicator-sound.desktop.in 2014-02-26 16:41:16 +0000
+++ data/indicator-sound.desktop.in 2014-06-11 14:57:08 +0000
@@ -2,7 +2,7 @@
2Type=Application2Type=Application
3Name=Indicator Sound3Name=Indicator Sound
4Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service4Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
5OnlyShowIn=Unity;XFCE;GNOME;5OnlyShowIn=Unity;XFCE;GNOME;Pantheon;
6NoDisplay=true6NoDisplay=true
7StartupNotify=false7StartupNotify=false
8Terminal=false8Terminal=false
99
=== modified file 'data/indicator-sound.upstart.desktop.in'
--- data/indicator-sound.upstart.desktop.in 2014-02-20 17:02:02 +0000
+++ data/indicator-sound.upstart.desktop.in 2014-06-11 14:57:08 +0000
@@ -2,7 +2,7 @@
2Type=Application2Type=Application
3Name=Indicator Sound3Name=Indicator Sound
4Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service4Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
5OnlyShowIn=Unity;XFCE;5OnlyShowIn=Unity;XFCE;Pantheon;
6NoDisplay=true6NoDisplay=true
7StartupNotify=false7StartupNotify=false
8Terminal=false8Terminal=false

Subscribers

People subscribed via source and target branches