From d0042b5e3254c18d9ca46c790db6cfab38579ed3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 25 Mar 2014 16:24:30 -0500 Subject: Switch session checking to be in pre-start --- data/indicator-application.conf.in | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'data') 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 -- cgit v1.2.3