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

[Ted Gould]

Synchronize process management across indicators

This merge goes along with all of the other "startup-cleanup" merges to create a consistent startup for all indicators.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:409
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/115/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-trusty-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-trusty-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/indicator-messages-trusty-armhf-ci/10/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-messages-ci/115/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

I built debs for all the startup-cleanup branches and tested them out; WfM

review: Approve

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

410. By Ted Gould on 2014-02-26

Update for gnome-fallback

=== modified file 'configure.ac'
--- configure.ac	2013-08-27 02:46:33 +0000
+++ configure.ac	2014-02-26 16:37:52 +0000
@@ -169,6 +169,7 @@
 data/icons/scalable/Makefile
 data/icons/scalable/status/Makefile
 data/icons/scalable/categories/Makefile
+data/upstart/Makefile
 po/Makefile.in
 test/Makefile
 libmessaging-menu/Makefile

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2013-09-06 10:54:47 +0000
+++ data/Makefile.am	2014-02-26 16:37:52 +0000
@@ -1,10 +1,16 @@
-SUBDIRS = icons
-
-dbus_servicesdir = $(datadir)/dbus-1/services
-dbus_services_DATA = indicator-messages.service
-
-%.service: %.service.in
-	sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+SUBDIRS = icons upstart
+
+xdg_autostartdir = /etc/xdg/autostart
+xdg_autostart_DATA = indicator-messages.desktop
+
+%.desktop: %.desktop.in
+	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+
+upstart_jobsdir = $(datadir)/upstart/sessions/
+upstart_jobs_DATA = indicator-messages.conf
+
+%.conf: %.conf.in
+	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
 gsettings_SCHEMAS = com.canonical.indicator.messages.gschema.xml
 @GSETTINGS_RULES@
@@ -13,7 +19,10 @@
 dist_indicator_DATA = com.canonical.indicator.messages
 
 EXTRA_DIST = \
-	$(gsettings_SCHEMAS) \
-	indicator-messages.service.in
+	indicator-messages.desktop.in \
+	indicator-messages.conf.in \
+	$(gsettings_SCHEMAS)
 
-CLEANFILES = indicator-messages.service
+CLEANFILES = \
+	$(xdg_autostart_DATA) \
+	$(upstart_jobs_DATA)

=== added file 'data/indicator-messages.conf.in'
--- data/indicator-messages.conf.in	1970-01-01 00:00:00 +0000
+++ data/indicator-messages.conf.in	2014-02-26 16:37:52 +0000
@@ -0,0 +1,10 @@
+description "Indicator Messages Service"
+
+start on indicator-services-start
+stop on desktop-end or indicator-services-end
+
+respawn
+respawn limit 2 10
+
+exec @pkglibexecdir@/indicator-messages-service
+

=== added file 'data/indicator-messages.desktop.in'
--- data/indicator-messages.desktop.in	1970-01-01 00:00:00 +0000
+++ data/indicator-messages.desktop.in	2014-02-26 16:37:52 +0000
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Messages
+Exec=@pkglibexecdir@/indicator-messages-service
+StartupNotify=false
+Terminal=false
+OnlyShowIn=Unity;GNOME;
+AutostartCondition=GNOME3 unless-session gnome

=== removed file 'data/indicator-messages.service.in'
--- data/indicator-messages.service.in	2013-09-06 10:54:47 +0000
+++ data/indicator-messages.service.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.indicator.messages
-Exec=@pkglibexecdir@/indicator-messages-service

=== added directory 'data/upstart'
=== added file 'data/upstart/Makefile.am'
--- data/upstart/Makefile.am	1970-01-01 00:00:00 +0000
+++ data/upstart/Makefile.am	2014-02-26 16:37:52 +0000
@@ -0,0 +1,12 @@
+
+xdg_autostartdir = $(datadir)/upstart/xdg/autostart
+xdg_autostart_DATA = indicator-messages.desktop
+
+%.desktop: %.desktop.in
+	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+
+EXTRA_DIST = \
+	indicator-messages.desktop.in
+
+CLEANFILES = \
+	$(xdg_autostart_DATA)

=== added file 'data/upstart/indicator-messages.desktop.in'
--- data/upstart/indicator-messages.desktop.in	1970-01-01 00:00:00 +0000
+++ data/upstart/indicator-messages.desktop.in	2014-02-26 16:37:52 +0000
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Messages
+Exec=@pkglibexecdir@/indicator-messages-service
+StartupNotify=false
+Terminal=false
+OnlyShowIn=Unity;
+Hidden=true

=== modified file 'debian/indicator-messages.install'
--- debian/indicator-messages.install	2013-09-06 12:00:13 +0000
+++ debian/indicator-messages.install	2014-02-26 16:37:52 +0000
@@ -1,5 +1,6 @@
 usr/lib/*/indicator-messages/indicator-messages-service
-usr/share/dbus-1
+usr/share/upstart
 usr/share/glib-2.0
 usr/share/icons
 usr/share/unity/indicators
+etc/xdg/autostart