4 files changed, 35 insertions, 7 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 9694a9e..955a4a4 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -57,6 +57,27 @@ install(
 )
 
 ###########################
+# Upstart XDG Autostart Override
+###########################
+
+set(
+  INDICATOR_SOUND_UPSTART_XDG_AUTOSTART
+  "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.upstart.desktop"
+)
+
+configure_file(
+  "indicator-sound.upstart.desktop.in"
+  ${INDICATOR_SOUND_UPSTART_XDG_AUTOSTART}
+  @ONLY
+)
+
+install(
+  FILES "${INDICATOR_SOUND_UPSTART_XDG_AUTOSTART}"
+  DESTINATION "${CMAKE_INSTALL_DATADIR}/upstart/xdg/autostart"
+  RENAME "indicator-sound.desktop"
+)
+
+###########################
 # GSettings
 ###########################
 
diff --git a/data/indicator-sound.conf.in b/data/indicator-sound.conf.in
index a5f4b4d..4912b61 100644
--- a/data/indicator-sound.conf.in
+++ b/data/indicator-sound.conf.in
@@ -1,11 +1,9 @@
-description "Indicator Sound Backend"
+description "Indicator Sound Service"
 
-# 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
+start on indicator-services-start
 stop on desktop-end or indicator-services-end
 
 respawn
+respawn limit 2 10
 
 exec @CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
diff --git a/data/indicator-sound.desktop.in b/data/indicator-sound.desktop.in
index aeb6440..b471893 100644
--- a/data/indicator-sound.desktop.in
+++ b/data/indicator-sound.desktop.in
@@ -2,8 +2,8 @@
 Type=Application
 Name=Indicator Sound
 Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
-NotShowIn=Unity;
+OnlyShowIn=Unity;XFCE;GNOME;
 NoDisplay=true
 StartupNotify=false
 Terminal=false
-
+AutostartCondition=GNOME3 unless-session gnome
diff --git a/data/indicator-sound.upstart.desktop.in b/data/indicator-sound.upstart.desktop.in
new file mode 100644
index 0000000..37dfc7d
--- /dev/null
+++ b/data/indicator-sound.upstart.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Sound
+Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
+OnlyShowIn=Unity;XFCE;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+Hidden=true