Merge lp:~xnox/indicator-sound/unbreak-ubiquity into lp:indicator-sound/14.04

Proposed by Dimitri John Ledkov
Status: Rejected
Rejected by: Dimitri John Ledkov
Proposed branch: lp:~xnox/indicator-sound/unbreak-ubiquity
Merge into: lp:indicator-sound/14.04
Diff against target: 69 lines (+18/-7)
4 files modified
.bzrignore (+1/-0)
data/CMakeLists.txt (+7/-7)
data/indicator-sound.service.in (+3/-0)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~xnox/indicator-sound/unbreak-ubiquity
Reviewer Review Type Date Requested Status
Ted Gould (community) Needs Fixing
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+198170@code.launchpad.net

Commit message

* Resolve broken indicator under ubiquity (LP: #1258863):
  - Reintroduce dbus activation file.

Description of the change

* Resolve broken indicator under ubiquity (LP: #1258863):
  - Reintroduce dbus activation file.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:407
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~xnox/indicator-sound/unbreak-ubiquity/+merge/198170/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/80/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/19/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Ted Gould (ted) wrote :

I don't think we need the DBus activation. If it is started by the XDG Autostart or Upstart, it seems that should cover all cases.

Also, we should drop the NoShowIn in the XDG Autostart file for Unity as it would get picked up by the override.

review: Needs Fixing
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Yes, we don't need all three. Looking into it more, I think we actually want: upstart & dbus activation.

XDG Autostart was not used in any of the previous releases, and neither lightdm nor ubiquity spawns gnome-session/upstart-user-session to autostart them. So I think upstart jobs + dbus activation should cover all cases, without imposing upstart to use the indicators. (but upstart is used where possible, which all Ubuntu standard flavours).

I'll priorities to get dbus-upstart activation done rather sooner than later, to close the gap between dbus-activation & upstart job.

Are you ok to reintroduce dbus activation? (that service file will be needed to integrate with dbus-activation as well, it will simply gain additional UpstartJob=indicator-sound)

W.r.t. upstart-job itself, I would have expected indicators to start on "started indicator-service" and stop on "stopped indicator-service", why is there an artificial sync point "indiator-services-start|end" ? is it reliably emitted when indicator-service dies?

406. By Dimitri John Ledkov on 2013-12-08

* Resolve broken indicator under ubiquity (LP: #1258863):
  - Reintroduce dbus activation file.

Unmerged revisions

406. By Dimitri John Ledkov on 2013-12-08

* Resolve broken indicator under ubiquity (LP: #1258863):
  - Reintroduce dbus activation file.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2013-08-27 15:58:07 +0000
3+++ .bzrignore 2013-12-08 20:13:30 +0000
4@@ -2,6 +2,7 @@
5 /po/stamp-it
6
7 /data/indicator-sound.conf
8+/data/indicator-sound.service
9
10 /src/indicator-sound-service
11 /src/indicator_sound_service_vala.stamp
12
13=== modified file 'data/CMakeLists.txt'
14--- data/CMakeLists.txt 2013-10-29 00:54:09 +0000
15+++ data/CMakeLists.txt 2013-12-08 20:13:30 +0000
16@@ -37,23 +37,23 @@
17 )
18
19 ###########################
20-# XDG Autostart
21+# Dbus Service
22 ###########################
23
24 set(
25- INDICATOR_SOUND_XDG_AUTOSTART
26- "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.desktop"
27+ INDICATOR_SOUND_SERVICE
28+ "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.service"
29 )
30
31 configure_file(
32- "indicator-sound.desktop.in"
33- ${INDICATOR_SOUND_XDG_AUTOSTART}
34+ "indicator-sound.service.in"
35+ ${INDICATOR_SOUND_SERVICE}
36 @ONLY
37 )
38
39 install(
40- FILES "${INDICATOR_SOUND_XDG_AUTOSTART}"
41- DESTINATION "/etc/xdg/autostart"
42+ FILES "${INDICATOR_SOUND_SERVICE}"
43+ DESTINATION "${CMAKE_INSTALL_DATADIR}/dbus-1/services/"
44 )
45
46 ###########################
47
48=== added file 'data/indicator-sound.service.in'
49--- data/indicator-sound.service.in 1970-01-01 00:00:00 +0000
50+++ data/indicator-sound.service.in 2013-12-08 20:13:30 +0000
51@@ -0,0 +1,3 @@
52+[D-BUS Service]
53+Name=com.canonical.indicator.sound
54+Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
55
56=== modified file 'debian/changelog'
57--- debian/changelog 2013-11-25 03:56:15 +0000
58+++ debian/changelog 2013-12-08 20:13:30 +0000
59@@ -1,3 +1,10 @@
60+indicator-sound (12.10.2+14.04.20131125-0ubuntu2) UNRELEASED; urgency=low
61+
62+ * Resolve broken indicator under ubiquity (LP: #1258863):
63+ - Reintroduce dbus activation file.
64+
65+ -- Dmitrijs Ledkovs <xnox@ubuntu.com> Sun, 08 Dec 2013 04:08:48 +0000
66+
67 indicator-sound (12.10.2+14.04.20131125-0ubuntu1) trusty; urgency=low
68
69 [ Ted Gould ]

Subscribers

People subscribed via source and target branches