diff options
author | Ted Gould <ted@gould.cx> | 2013-10-31 17:57:31 +0000 |
---|---|---|
committer | Tarmac <Unknown> | 2013-10-31 17:57:31 +0000 |
commit | f2ce0ee87fb8191e4fc07766f23d10badd2ec775 (patch) | |
tree | 76335695257cf5128fcfdd2a86543c657a8c1a84 /data | |
parent | da34f0cbe9eb05dcaf25fc0a502b4ae15d40ae27 (diff) | |
parent | 96efd3b86974e72d1c23a328e6892cacefc79e8c (diff) | |
download | ayatana-indicator-application-f2ce0ee87fb8191e4fc07766f23d10badd2ec775.tar.gz ayatana-indicator-application-f2ce0ee87fb8191e4fc07766f23d10badd2ec775.tar.bz2 ayatana-indicator-application-f2ce0ee87fb8191e4fc07766f23d10badd2ec775.zip |
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. Fixes: https://bugs.launchpad.net/bugs/1185565.
Approved by PS Jenkins bot, Charles Kerr.
Diffstat (limited to 'data')
-rw-r--r-- | data/Makefile.am | 17 | ||||
-rw-r--r-- | data/indicator-application.conf.in | 15 | ||||
-rw-r--r-- | data/indicator-application.desktop.in | 9 | ||||
-rw-r--r-- | data/indicator-application.service.in | 3 |
4 files changed, 36 insertions, 8 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index c142c4e..77ec71d 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,17 +1,24 @@ -dbus_servicesdir = $(DBUSSERVICEDIR) -dbus_services_DATA = indicator-application.service +upstart_jobsdir = $(datadir)/upstart/sessions/ +upstart_jobs_DATA = indicator-application.conf -%.service: %.service.in +%.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 diff --git a/data/indicator-application.conf.in b/data/indicator-application.conf.in new file mode 100644 index 0000000..ddc803c --- /dev/null +++ b/data/indicator-application.conf.in @@ -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 diff --git a/data/indicator-application.desktop.in b/data/indicator-application.desktop.in new file mode 100644 index 0000000..61d3c4d --- /dev/null +++ b/data/indicator-application.desktop.in @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Indicator Application +Exec=@libexecdir@/indicator-application-service +NotShowIn=Unity; +NoDisplay=true +StartupNotify=false +Terminal=false + diff --git a/data/indicator-application.service.in b/data/indicator-application.service.in deleted file mode 100644 index f6ceee3..0000000 --- a/data/indicator-application.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=com.canonical.indicator.application -Exec=@libexecdir@/indicator-application-service |