aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2013-05-29 14:37:22 -0500
committerTed Gould <ted@gould.cx>2013-05-29 14:37:22 -0500
commit74b3c094874d5bd4becebe69eca9b06c5fc4e542 (patch)
tree76b99b96e9cdc4676fb26019b14641cdcc9be259
parentfb36d66d132f1f98a05607bd4d54e38771cb6976 (diff)
downloadayatana-indicator-session-74b3c094874d5bd4becebe69eca9b06c5fc4e542.tar.gz
ayatana-indicator-session-74b3c094874d5bd4becebe69eca9b06c5fc4e542.tar.bz2
ayatana-indicator-session-74b3c094874d5bd4becebe69eca9b06c5fc4e542.zip
Adding an upstart job config
-rw-r--r--.bzrignore1
-rw-r--r--data/Makefile.am11
-rw-r--r--data/indicator-session.conf.in15
3 files changed, 26 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore
index 992e18f..56f46ef 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -253,3 +253,4 @@ dbus-display-manager.h
dbus-user.c
dbus-user.h
tests/test-service
+indicator-session.conf
diff --git a/data/Makefile.am b/data/Makefile.am
index 27b5ea2..69ac65d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -9,6 +9,13 @@ dbus_services_DATA = $(service_in_files:.service.in=.service)
%.service: %.service.in
sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+upstart_jobsdir = $(datadir)/upstart/sessions/
+upstart_jobs_in_files = indicator-session.conf.in
+upstart_jobs_DATA = $(upstart_jobs_in_files:.conf.in=.conf)
+
+%.conf: %.conf.in
+ sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+
@INTLTOOL_SCHEMAS_RULE@
@INTLTOOL_XML_NOMERGE_RULE@
@@ -20,8 +27,10 @@ dist_convert_DATA = indicator-session.convert
EXTRA_DIST = \
$(service_in_files) \
+ $(upstart_jobs_in_files) \
$(gsettings_SCHEMAS:.xml=.xml.in)
CLEANFILES = \
- $(dbus_services_DATA) \
+ $(dbus_services_DATA) \
+ $(upstart_jobs_DATA) \
$(gsettings_SCHEMAS)
diff --git a/data/indicator-session.conf.in b/data/indicator-session.conf.in
new file mode 100644
index 0000000..3a512df
--- /dev/null
+++ b/data/indicator-session.conf.in
@@ -0,0 +1,15 @@
+description "Indicator Session Service"
+author "Ted Gould <ted@canonical.com>"
+
+# 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 and xsession SESSION=ubuntu
+stop on desktop-end
+
+env G_MESSAGES_DEBUG=all
+export G_MESSAGES_DEBUG
+
+respawn
+
+exec @libexecdir@/indicator-session-service