From 5205b9539beea821b666fce19c16b082bad5f645 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 Feb 2014 10:26:09 -0600
Subject: Add a respawn limit and cleanup the job

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

(limited to 'data')

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


From 1900dc381fecd415390471971ef4b433dbc6dc31 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 Feb 2014 10:27:05 -0600
Subject: Flip the show in variable

---
 data/indicator-sound.desktop.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/indicator-sound.desktop.in b/data/indicator-sound.desktop.in
index aeb6440..9c2a1ce 100644
--- a/data/indicator-sound.desktop.in
+++ b/data/indicator-sound.desktop.in
@@ -2,7 +2,7 @@
 Type=Application
 Name=Indicator Sound
 Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
-NotShowIn=Unity;
+OnlyShowIn=Unity;
 NoDisplay=true
 StartupNotify=false
 Terminal=false
-- 
cgit v1.2.3


From 363d3454908ca4081ff778e1cabfd38d68bc31ec Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 Feb 2014 10:29:58 -0600
Subject: Add in the Upstart override

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

(limited to 'data')

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 565e652..80046f7 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -56,6 +56,27 @@ install(
   DESTINATION "/etc/xdg/autostart"
 )
 
+###########################
+# 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.upstart.desktop.in b/data/indicator-sound.upstart.desktop.in
new file mode 100644
index 0000000..991f304
--- /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;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+Hidden=true
-- 
cgit v1.2.3


From 4a9a79e4ef0f66f4672eb574f6da1286d5a2b784 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 Feb 2014 11:02:02 -0600
Subject: Add to XFCE

---
 data/indicator-sound.desktop.in         | 2 +-
 data/indicator-sound.upstart.desktop.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'data')

diff --git a/data/indicator-sound.desktop.in b/data/indicator-sound.desktop.in
index 9c2a1ce..acd6eff 100644
--- a/data/indicator-sound.desktop.in
+++ b/data/indicator-sound.desktop.in
@@ -2,7 +2,7 @@
 Type=Application
 Name=Indicator Sound
 Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
-OnlyShowIn=Unity;
+OnlyShowIn=Unity;XFCE;
 NoDisplay=true
 StartupNotify=false
 Terminal=false
diff --git a/data/indicator-sound.upstart.desktop.in b/data/indicator-sound.upstart.desktop.in
index 991f304..37dfc7d 100644
--- a/data/indicator-sound.upstart.desktop.in
+++ b/data/indicator-sound.upstart.desktop.in
@@ -2,7 +2,7 @@
 Type=Application
 Name=Indicator Sound
 Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
-OnlyShowIn=Unity;
+OnlyShowIn=Unity;XFCE;
 NoDisplay=true
 StartupNotify=false
 Terminal=false
-- 
cgit v1.2.3


From e7df1393fb23d3478f4dfd29a8244b3d8d873e91 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 26 Feb 2014 10:41:16 -0600
Subject: Update for gnome-fallback

---
 data/indicator-sound.desktop.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'data')

diff --git a/data/indicator-sound.desktop.in b/data/indicator-sound.desktop.in
index acd6eff..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
-OnlyShowIn=Unity;XFCE;
+OnlyShowIn=Unity;XFCE;GNOME;
 NoDisplay=true
 StartupNotify=false
 Terminal=false
-
+AutostartCondition=GNOME3 unless-session gnome
-- 
cgit v1.2.3