From c1aa03eb4b744d4a2872a577cdf3ca8ce86960dd Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 19 Feb 2014 21:38:12 -0600
Subject: Clean up the upstart config

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

(limited to 'data')

diff --git a/data/indicator-datetime.conf.in b/data/indicator-datetime.conf.in
index ab9cfd6..9b43b96 100644
--- a/data/indicator-datetime.conf.in
+++ b/data/indicator-datetime.conf.in
@@ -1,8 +1,9 @@
 description "Indicator Date & Time Backend"
 
-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-datetime-service
-- 
cgit v1.2.3


From 516866f37dac108ccf91a28e9fa3fe058277bdf1 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 19 Feb 2014 21:38:45 -0600
Subject: Fix that we're starting up under Unity

---
 data/indicator-datetime.desktop.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'data')

diff --git a/data/indicator-datetime.desktop.in b/data/indicator-datetime.desktop.in
index 5362af9..772111d 100644
--- a/data/indicator-datetime.desktop.in
+++ b/data/indicator-datetime.desktop.in
@@ -2,8 +2,7 @@
 Type=Application
 Name=Indicator Date & Time
 Exec=@pkglibexecdir@/indicator-datetime-service
-NotShowIn=Unity;
+OnlyShowIn=Unity;
 NoDisplay=true
 StartupNotify=false
 Terminal=false
-
-- 
cgit v1.2.3


From e7842cdb9183ca29fd679fb614f861fbe729282f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 19 Feb 2014 22:04:20 -0600
Subject: Build an upstart override

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

(limited to 'data')

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index c45e1f9..5d9e545 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -48,6 +48,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-datetime.upstart.desktop.in b/data/indicator-datetime.upstart.desktop.in
new file mode 100644
index 0000000..076d373
--- /dev/null
+++ b/data/indicator-datetime.upstart.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Date & Time
+Exec=@pkglibexecdir@/indicator-datetime-service
+OnlyShowIn=Unity;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+Hidden=true
-- 
cgit v1.2.3


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

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

(limited to 'data')

diff --git a/data/indicator-datetime.desktop.in b/data/indicator-datetime.desktop.in
index 772111d..4e56947 100644
--- a/data/indicator-datetime.desktop.in
+++ b/data/indicator-datetime.desktop.in
@@ -2,7 +2,8 @@
 Type=Application
 Name=Indicator Date & Time
 Exec=@pkglibexecdir@/indicator-datetime-service
-OnlyShowIn=Unity;
+OnlyShowIn=Unity;GNOME;
 NoDisplay=true
 StartupNotify=false
 Terminal=false
+AutostartCondition=GNOME3 unless-session gnome
-- 
cgit v1.2.3