Merge lp:~ted/indicator-application/upstart-job into lp:indicator-application/13.10

[Ted Gould]

Upstart job configuration and signal emission.

Switch indicator application over to having an upstart job for managing the service. Also make it emit it's own event for when application indicators should be started so we can clean up the boot sequence.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:249
http://jenkins.qa.ubuntu.com/job/indicator-application-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-application-saucy-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-application-saucy-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/indicator-application-saucy-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-application-ci/7/rebuild

review: Approve (continuous-integration)

[lp:~ted/indicator-application/upstart-job]

250. By Ted Gould on 2013-08-27

Dropping debugging for system-wide support

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:250
http://jenkins.qa.ubuntu.com/job/indicator-application-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-application-saucy-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-application-saucy-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/indicator-application-saucy-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-application-ci/8/rebuild

review: Approve (continuous-integration)

[lp:~ted/indicator-application/upstart-job]

251. By Ted Gould on 2013-10-28

Merge trunk

252. By Ted Gould on 2013-10-29

Adding an XDG Autostart file

Unmerged revisions

252. By Ted Gould on 2013-10-29

Adding an XDG Autostart file

251. By Ted Gould on 2013-10-28

Merge trunk

250. By Ted Gould on 2013-08-27

Dropping debugging for system-wide support

249. By Ted Gould on 2013-07-12

Add the indicator-services-end condition

248. By Ted Gould on 2013-07-12

Add the indicator-services-start condition

247. By Ted Gould on 2013-07-12

Make sure to have proper syntax

246. By Ted Gould on 2013-05-29

Dropping service from extra dist and clean

245. By Ted Gould on 2013-05-29

Limiting to only the ubuntu session

244. By Ted Gould on 2013-05-29

A comment, because comments rock.

243. By Ted Gould on 2013-05-29

When we get our name, then start app indicators

=== modified file '.bzrignore'
--- .bzrignore	2012-12-18 19:08:50 +0000
+++ .bzrignore	2013-10-29 00:02:40 +0000
@@ -110,3 +110,5 @@
 bindings/mono/policy.0.0.appindicator-sharp.dll
 src/libapplication_la-generate-id.lo
 src/libappindicator_la-generate-id.lo
+indicator-application.conf
+indicator-application.desktop

=== modified file 'configure.ac'
--- configure.ac	2013-01-22 20:32:18 +0000
+++ configure.ac	2013-10-29 00:02:40 +0000
@@ -89,17 +89,6 @@
 AC_SUBST(INDICATORICONSDIR)
 
 ###########################
-# DBus Service Info
-###########################
-
-if test "x$with_localinstall" = "xyes"; then
-	DBUSSERVICEDIR="${datadir}/dbus-1/services/"
-else
-	DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
-fi
-AC_SUBST(DBUSSERVICEDIR)
-
-###########################
 # Files
 ###########################
 

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2010-08-10 21:31:39 +0000
+++ data/Makefile.am	2013-10-29 00:02:40 +0000
@@ -1,17 +1,24 @@
 
-dbus_servicesdir = $(DBUSSERVICEDIR)
-dbus_services_DATA = indicator-application.service
-
-%.service: %.service.in
+upstart_jobsdir = $(datadir)/upstart/sessions/
+upstart_jobs_DATA = indicator-application.conf
+
+%.conf: %.conf.in
+	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+
+xdg_autostartdir = /etc/xdg/autostart
+xdg_autostart_DATA = indicator-application.desktop
+
+%.desktop: %.desktop.in
 	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
 overridedir = $(pkgdatadir)
 override_DATA = ordering-override.keyfile
 
 EXTRA_DIST = \
-	indicator-application.service.in \
+	indicator-application.desktop.in \
+	indicator-application.conf.in \
 	ordering-override.keyfile
 
 CLEANFILES = \
-	indicator-application.service
+	indicator-application.conf
 

=== added file 'data/indicator-application.conf.in'
--- data/indicator-application.conf.in	1970-01-01 00:00:00 +0000
+++ data/indicator-application.conf.in	2013-10-29 00:02:40 +0000
@@ -0,0 +1,15 @@
+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 (indicators-loaded or indicator-services-start) and xsession SESSION=ubuntu
+stop on desktop-end or indicator-services-end
+
+emits appindicators-start appindicators-end
+
+respawn
+
+exec @libexecdir@/indicator-application-service
+
+pre-stop exec initctl emit appindicators-end

=== added file 'data/indicator-application.desktop.in'
--- data/indicator-application.desktop.in	1970-01-01 00:00:00 +0000
+++ data/indicator-application.desktop.in	2013-10-29 00:02:40 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Application
+Exec=@libexecdir@/indicator-application-service
+NotShowIn=Unity;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+

=== removed file 'data/indicator-application.service.in'
--- data/indicator-application.service.in	2011-01-14 02:10:12 +0000
+++ data/indicator-application.service.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.indicator.application
-Exec=@libexecdir@/indicator-application-service

=== modified file 'src/application-service-watcher.c'
--- src/application-service-watcher.c	2012-12-18 19:08:50 +0000
+++ src/application-service-watcher.c	2013-10-29 00:02:40 +0000
@@ -24,6 +24,7 @@
 #include "config.h"
 #endif
 
+#include <stdlib.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <dbus/dbus-glib-bindings.h>
@@ -158,8 +159,9 @@
 	GError * error = NULL;
 	DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
 	if (error != NULL) {
-		g_error("Unable to get session bus: %s", error->message);
+		g_warning("Unable to get session bus: %s", error->message);
 		g_error_free(error);
+		exit(0);
 		return;
 	}
 
@@ -286,5 +288,36 @@
 		return;
 	}
 
+	/* After we've got the name we can request upstart to trigger
+	   the jobs of any application indicators that need to start
+	   at desktop init time. */
+
+	GError * spawn_error = NULL;
+	gchar * argv[] = {
+	          "initctl",
+	          "--session",
+	          "--user",
+	          "emit",
+	          "--no-wait",
+	          "appindicators-start",
+	          NULL,
+	          };
+
+	g_spawn_async(NULL, /* Working Directory */
+	              argv,
+	              NULL, /* environment */
+	              G_SPAWN_SEARCH_PATH,
+	              NULL, NULL, /* child setup function */
+	              NULL, /* Pid */
+	              &spawn_error);
+
+	if (spawn_error != NULL) {
+		/* NOTE: When we get to the point where we can start
+		   assuming upstart user sessions this can be escillated
+		   to a warning or higher */
+		g_debug("Unable to signal appindicators-start to upstart: %s", spawn_error->message);
+		g_error_free(spawn_error);
+	}
+
 	return;
 }