From c884831f9473df332be1197d9d36ad3c0229ccfb Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 12 Jul 2013 10:16:34 -0500
Subject: Switch from being dbus activated to being an upstart job

---
 data/Makefile.am                |  8 ++++----
 data/indicator-sound.conf.in    | 14 ++++++++++++++
 data/indicator-sound.service.in |  3 ---
 3 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 data/indicator-sound.conf.in
 delete mode 100644 data/indicator-sound.service.in

(limited to 'data')

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
-- 
cgit v1.2.3


From f21921053ac8cf50438ff418539cf22d9a86c8bb Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 12 Jul 2013 10:20:03 -0500
Subject: Fixing directory

---
 data/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 2b4a921..d71a585 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,7 +2,7 @@ gsettings_SCHEMAS = \
   com.canonical.indicator.sound.gschema.xml
 @GSETTINGS_RULES@
 
-upstart_jobsdir = $(datadir)/upstart/services
+upstart_jobsdir = $(datadir)/upstart/sessions
 upstart_jobs_DATA = indicator-sound.conf
 
 %.conf: %.conf.in
-- 
cgit v1.2.3


From fd5fc9ed4aca0753779432de3ccc60cce6499af3 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 27 Aug 2013 15:11:49 -0500
Subject: Dropping debugging for system-wide support

---
 data/indicator-sound.conf.in | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'data')

diff --git a/data/indicator-sound.conf.in b/data/indicator-sound.conf.in
index 6d5c870..a5f4b4d 100644
--- a/data/indicator-sound.conf.in
+++ b/data/indicator-sound.conf.in
@@ -6,9 +6,6 @@ description "Indicator Sound Backend"
 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 @CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
-- 
cgit v1.2.3


From 6a2a81ed1b6f4ef820f96b3249dc062e68e480f9 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 28 Oct 2013 17:52:03 -0700
Subject: Adding an XDG Autostart file

---
 data/CMakeLists.txt             | 22 +++++++++++++++++++++-
 data/indicator-sound.desktop.in |  9 +++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 data/indicator-sound.desktop.in

(limited to 'data')

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index e71051e..ec27376 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -17,7 +17,7 @@ install(
 )
 
 ###########################
-# Dbus Service
+# Upstart Job
 ###########################
 
 set(
@@ -36,6 +36,26 @@ install(
   DESTINATION "${CMAKE_INSTALL_DATADIR}/upstart/sessions/"
 )
 
+###########################
+# XDG Autostart
+###########################
+
+set(
+  INDICATOR_SOUND_XDG_AUTOSTART
+  "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.desktop"
+)
+
+configure_file(
+  "indicator-sound.desktop.in"
+  ${INDICATOR_SOUND_CONF}
+  @ONLY
+)
+
+install(
+  FILES "${INDICATOR_SOUND_XDG_AUTOSTART}"
+  DESTINATION "/etc/xdg/autostart"
+)
+
 ###########################
 # GSettings
 ###########################
diff --git a/data/indicator-sound.desktop.in b/data/indicator-sound.desktop.in
new file mode 100644
index 0000000..aeb6440
--- /dev/null
+++ b/data/indicator-sound.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Sound
+Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
+NotShowIn=Unity;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+
-- 
cgit v1.2.3


From 2f30a8e4a8fa730133c70033e09680b56c2e74b5 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 28 Oct 2013 17:54:09 -0700
Subject: Forgot a var

---
 data/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index ec27376..565e652 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -47,7 +47,7 @@ set(
 
 configure_file(
   "indicator-sound.desktop.in"
-  ${INDICATOR_SOUND_CONF}
+  ${INDICATOR_SOUND_XDG_AUTOSTART}
   @ONLY
 )
 
-- 
cgit v1.2.3