From d0e78b38c6de07d0d544537b72dfdafb7b2edbe3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 26 Feb 2014 09:56:44 -0600 Subject: Switch to not being ubuntu-touch for other desktops --- data/indicator-application.conf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/indicator-application.conf.in b/data/indicator-application.conf.in index d3a103d..c06c705 100644 --- a/data/indicator-application.conf.in +++ b/data/indicator-application.conf.in @@ -3,7 +3,7 @@ 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 and xsession SESSION!=ubuntu-touch stop on desktop-end or indicator-services-end emits appindicators-start appindicators-end -- cgit v1.2.3 From 02d23629f24c3ffbd835be37d9f54a31084aba36 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 26 Feb 2014 10:32:16 -0600 Subject: Update for gnome-fallback --- data/indicator-application.desktop.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3 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(-) 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 From 6f1a0f7c99ac679b9f3626c9c27331c649687c19 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 7 Apr 2014 08:27:30 -0500 Subject: Switching to single equals --- data/indicator-application.conf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/indicator-application.conf.in b/data/indicator-application.conf.in index 74ef5eb..07a7d05 100644 --- a/data/indicator-application.conf.in +++ b/data/indicator-application.conf.in @@ -12,7 +12,7 @@ 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 + if [ "x$DESKTOP_SESSION" = "xubuntu-touch" ] ; then stop; exit 0 fi end script -- cgit v1.2.3