From 100c0987258a0166f4fffe8956671101fe069d47 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 Feb 2014 10:16:48 -0600
Subject: Converting to an OnlyShowIn

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

(limited to 'data')

diff --git a/data/indicator-session.desktop.in b/data/indicator-session.desktop.in
index b6d289d..609e648 100644
--- a/data/indicator-session.desktop.in
+++ b/data/indicator-session.desktop.in
@@ -2,7 +2,7 @@
 Type=Application
 Name=Indicator Session
 Exec=@pkglibexecdir@/indicator-session-service
-NotShowIn=Unity;
+OnlyShowIn=Unity;
 NoDisplay=true
 StartupNotify=false
 Terminal=false
-- 
cgit v1.2.3


From f8e72e14de0a4267ba80d15fcec446c964068e39 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 Feb 2014 10:17:12 -0600
Subject: Update with a respawn limit

---
 data/indicator-session.conf.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/indicator-session.conf.in b/data/indicator-session.conf.in
index 6bd93a2..c7530e3 100644
--- a/data/indicator-session.conf.in
+++ b/data/indicator-session.conf.in
@@ -1,8 +1,9 @@
 description "Indicator Session Service"
 
-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 @pkglibexecdir@/indicator-session-service
-- 
cgit v1.2.3


From 38ac3972053682719c31d65654ef6a493256885c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 Feb 2014 10:19:05 -0600
Subject: Adding in an Upstart override

---
 data/CMakeLists.txt                       | 20 ++++++++++++++++++++
 data/indicator-session.upstart.desktop.in |  9 +++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 data/indicator-session.upstart.desktop.in

(limited to 'data')

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 163e2cd..a6a2e9f 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -57,6 +57,26 @@ configure_file ("${XDG_AUTOSTART_FILE_IN}" "${XDG_AUTOSTART_FILE}")
 install (FILES "${XDG_AUTOSTART_FILE}"
          DESTINATION "${XDG_AUTOSTART_DIR}")
 
+##
+##  Upstart XDG Autostart Override
+##
+
+# where to install
+set (UPSTART_XDG_AUTOSTART_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/upstart/xdg/autostart")
+message (STATUS "${UPSTART_XDG_AUTOSTART_DIR} is the Upstart XDG autostart override dir")
+
+set (UPSTART_XDG_AUTOSTART_NAME "${CMAKE_PROJECT_NAME}.upstart.desktop")
+set (UPSTART_XDG_AUTOSTART_FILE "${CMAKE_CURRENT_BINARY_DIR}/${UPSTART_XDG_AUTOSTART_NAME}")
+set (UPSTART_XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${UPSTART_XDG_AUTOSTART_NAME}.in")
+
+# build it
+set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
+configure_file ("${UPSTART_XDG_AUTOSTART_FILE_IN}" "${UPSTART_XDG_AUTOSTART_FILE}")
+
+# install it
+install (FILES "${UPSTART_XDG_AUTOSTART_FILE}"
+         DESTINATION "${UPSTART_XDG_AUTOSTART_DIR}"
+         RENAME "${XDG_AUTOSTART_NAME}")
 
 ##
 ##  Unity Indicator File
diff --git a/data/indicator-session.upstart.desktop.in b/data/indicator-session.upstart.desktop.in
new file mode 100644
index 0000000..f4970f6
--- /dev/null
+++ b/data/indicator-session.upstart.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Session
+Exec=@pkglibexecdir@/indicator-session-service
+OnlyShowIn=Unity;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+Hidden=true
-- 
cgit v1.2.3


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

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

(limited to 'data')

diff --git a/data/indicator-session.desktop.in b/data/indicator-session.desktop.in
index 609e648..10dcadd 100644
--- a/data/indicator-session.desktop.in
+++ b/data/indicator-session.desktop.in
@@ -2,8 +2,8 @@
 Type=Application
 Name=Indicator Session
 Exec=@pkglibexecdir@/indicator-session-service
-OnlyShowIn=Unity;
+OnlyShowIn=Unity;GNOME;
 NoDisplay=true
 StartupNotify=false
 Terminal=false
-
+AutostartCondition=GNOME3 unless-session gnome
-- 
cgit v1.2.3