diff options
-rw-r--r-- | data/indicator-application.conf.in | 14 | ||||
-rw-r--r-- | data/indicator-application.desktop.in | 3 |
2 files changed, 12 insertions, 5 deletions
diff --git a/data/indicator-application.conf.in b/data/indicator-application.conf.in index d3a103d..07a7d05 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 +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 diff --git a/data/indicator-application.desktop.in b/data/indicator-application.desktop.in index c724a0f..9b044cc 100644 --- a/data/indicator-application.desktop.in +++ b/data/indicator-application.desktop.in @@ -4,4 +4,5 @@ Name=Indicator Application Exec=@pkglibexecdir@/indicator-application-service StartupNotify=false Terminal=false -OnlyShowIn=Unity;XFCE; +OnlyShowIn=Unity;XFCE;GNOME; +AutostartCondition=GNOME3 unless-session gnome |