aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am10
-rw-r--r--data/indicator-application.conf.in15
-rw-r--r--data/indicator-application.service.in3
3 files changed, 20 insertions, 8 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index c142c4e..c6e82b2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,17 +1,17 @@
-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)|" $< > $@
overridedir = $(pkgdatadir)
override_DATA = ordering-override.keyfile
EXTRA_DIST = \
- indicator-application.service.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.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