aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/Makefile.am8
-rw-r--r--data/indicator-sound.conf.in14
-rw-r--r--data/indicator-sound.service.in3
3 files changed, 18 insertions, 7 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 7647d73..2b4a921 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,10 +2,10 @@ gsettings_SCHEMAS = \
com.canonical.indicator.sound.gschema.xml
@GSETTINGS_RULES@
-dbus_servicesdir = $(datadir)/dbus-1/services
-dbus_services_DATA = indicator-sound.service
+upstart_jobsdir = $(datadir)/upstart/services
+upstart_jobs_DATA = indicator-sound.conf
-%.service: %.service.in
+%.conf: %.conf.in
sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
indicatordir = $(INDICATOR_DIR)
@@ -13,7 +13,7 @@ dist_indicator_DATA = com.canonical.indicator.sound
EXTRA_DIST = \
$(gsettings_SCHEMAS) \
- indicator-sound.service.in
+ indicator-sound.conf.in
CLEANFILES = \
$(dbus_services_DATA)
diff --git a/data/indicator-sound.conf.in b/data/indicator-sound.conf.in
new file mode 100644
index 0000000..73d2a7d
--- /dev/null
+++ b/data/indicator-sound.conf.in
@@ -0,0 +1,14 @@
+description "Indicator Sound Backend"
+
+# Want to move to indicator-services-[start|end], but that's not all
+# there yet. Use the signals that exist today for now.
+
+start on indicators-loaded or indicator-services-start
+stop on desktop-end or indicator-services-end
+
+env G_MESSAGES_DEBUG=all
+export G_MESSAGES_DEBUG
+
+respawn
+
+exec @pkglibexecdir@/indicator-sound-service
diff --git a/data/indicator-sound.service.in b/data/indicator-sound.service.in
deleted file mode 100644
index e8b77c6..0000000
--- a/data/indicator-sound.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.indicator.sound
-Exec=@pkglibexecdir@/indicator-sound-service