Merge lp:~ted/indicator-application/startup-cleanup into lp:indicator-application/14.04

[Ted Gould]

Fix the upstart job and desktop config for GNOME2

Think we missed a couple revisions and a fix for greeter.

[Sebastien Bacher (seb128)]

looks good, thanks

review: Approve

[Colin Watson (cjwatson)]

[ "x$DESKTOP_SESSION" == "xubuntu-touch" ] is a bashism and fails in our default /bin/sh:

  sh: 2: [: xubuntu: unexpected operator

Please use the = operator instead of ==; there's no benefit to using == here.

review: Needs Fixing

[lp:~ted/indicator-application/startup-cleanup]

258. By Ted Gould on 2014-04-07

Switching to single equals

=== modified file 'data/indicator-application.conf.in'
--- data/indicator-application.conf.in	2014-02-20 03:31:05 +0000
+++ data/indicator-application.conf.in	2014-04-07 13:34:07 +0000
@@ -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 @@
 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

=== modified file 'data/indicator-application.desktop.in'
--- data/indicator-application.desktop.in	2014-02-20 03:31:05 +0000
+++ data/indicator-application.desktop.in	2014-04-07 13:34:07 +0000
@@ -4,4 +4,5 @@
 Exec=@pkglibexecdir@/indicator-application-service
 StartupNotify=false
 Terminal=false
-OnlyShowIn=Unity;XFCE;
+OnlyShowIn=Unity;XFCE;GNOME;
+AutostartCondition=GNOME3 unless-session gnome