aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2014-04-07 13:39:36 +0000
committerCI bot <ps-jenkins@lists.canonical.com>2014-04-07 13:39:36 +0000
commit72e124270a80082aec71d7ff316969022e68395f (patch)
treeea5c69100b02387990e1978b27ab757e86d956c7
parentb3b0fc8e6fe7c2e9753d1a78b395bd6e7ff8d470 (diff)
parent6f1a0f7c99ac679b9f3626c9c27331c649687c19 (diff)
downloadayatana-indicator-application-72e124270a80082aec71d7ff316969022e68395f.tar.gz
ayatana-indicator-application-72e124270a80082aec71d7ff316969022e68395f.tar.bz2
ayatana-indicator-application-72e124270a80082aec71d7ff316969022e68395f.zip
Fix the upstart job and desktop config for GNOME2 Fixes: 1302123
-rw-r--r--data/indicator-application.conf.in14
-rw-r--r--data/indicator-application.desktop.in3
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