aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2014-03-25 16:24:30 -0500
committerTed Gould <ted@gould.cx>2014-03-25 16:24:30 -0500
commitd0042b5e3254c18d9ca46c790db6cfab38579ed3 (patch)
tree9e2590bcb7fbc33482bfe0ba0370faa7289c95ed /data
parent02d23629f24c3ffbd835be37d9f54a31084aba36 (diff)
downloadayatana-indicator-application-d0042b5e3254c18d9ca46c790db6cfab38579ed3.tar.gz
ayatana-indicator-application-d0042b5e3254c18d9ca46c790db6cfab38579ed3.tar.bz2
ayatana-indicator-application-d0042b5e3254c18d9ca46c790db6cfab38579ed3.zip
Switch session checking to be in pre-start
Diffstat (limited to 'data')
-rw-r--r--data/indicator-application.conf.in14
1 files changed, 10 insertions, 4 deletions
diff --git a/data/indicator-application.conf.in b/data/indicator-application.conf.in
index c06c705..74ef5eb 100644
--- a/data/indicator-application.conf.in
+++ b/data/indicator-application.conf.in
@@ -1,9 +1,6 @@
description "Indicator Application Service"
-# NOTE: Limiting only to Unity 7 right now as it's still using
-# dbusmenu. That can be lifted after it is ported to GMenu
-
-start on indicator-services-start and xsession SESSION!=ubuntu-touch
+start on indicator-services-start
stop on desktop-end or indicator-services-end
emits appindicators-start appindicators-end
@@ -11,6 +8,15 @@ emits appindicators-start appindicators-end
respawn
respawn limit 2 10
+pre-start script
+ # NOTE: Limiting only to Unity 7 right now as it's still using
+ # dbusmenu. That can be lifted after it is ported to GMenu
+
+ if [ "x$DESKTOP_SESSION" == "xubuntu-touch" ] ; then
+ stop; exit 0
+ fi
+end script
+
exec @pkglibexecdir@/indicator-application-service
pre-stop exec initctl emit appindicators-end