Switching DBus service to an Upstart Job.

Approved by Iain Lane, PS Jenkins bot, Ted Gould.

5 files changed, 65 insertions, 12 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index fc9beee..9784451 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,23 +1,53 @@
+BUILT_SOURCES =
+EXTRA_DIST =
+CLEANFILES =
 
 # the indicator bus file
 indicatorsdir = $(datadir)/unity/indicators
 dist_indicators_DATA = com.canonical.indicator.bluetooth
 
-# the dbus service file
-dbus_servicesdir = $(datadir)/dbus-1/services
-dbus_services_DATA = indicator-bluetooth.service
+# the upstart job file
+upstart_jobsdir = $(datadir)/upstart/sessions
+upstart_jobs_DATA = indicator-bluetooth.conf
+upstart_jobs_in = $(upstart_jobs_DATA:.conf=.conf.in)
+$(upstart_jobs_DATA): $(upstart_jobs_in)
+	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+BUILT_SOURCES += $(upstart_jobs_DATA)
+EXTRA_DIST += $(upstart_jobs_in)
+CLEANFILES += $(upstart_jobs_DATA)
 
-%.service: %.service.in
-	sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+# the upstart version of the xdg autostart job file
+# see https://code.launchpad.net/~charlesk/indicator-bluetooth/upstart-job/+merge/198100
+upstart_xdg_autostartdir = $(datadir)/upstart/xdg/autostart
+upstart_xdg_autostart_DATA = indicator-bluetooth.desktop
+upstart_xdg_autostart_in = indicator-bluetooth.upstart.desktop.in
+$(upstart_xdg_autostart_DATA): $(upstart_xdg_autostart_in)
+	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+BUILT_SOURCES += $(upstart_xdg_autostart_DATA)
+EXTRA_DIST += $(upstart_xdg_autostart_in)
+CLEANFILES += $(upstart_xdg_autostart_DATA)
 
+# the xdg autostart job file
+xdg_autostartdir = /etc/xdg/autostart
+xdg_autostart_DATA = indicator-bluetooth.desktop
+xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in)
+$(xdg_autostart_DATA): $(xdg_autostart_in)
+	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+BUILT_SOURCES += $(xdg_autostart_DATA)
+EXTRA_DIST += $(xdg_autostart_in)
+CLEANFILES += $(xdg_autostart_DATA)
+
+# the gsettings schema
 gsettings_SCHEMAS = com.canonical.indicator.bluetooth.gschema.xml
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
-EXTRA_DIST = \
-  indicator-bluetooth.service.in \
-  com.canonical.indicator.bluetooth.gschema.xml.in
+EXTRA_DIST += \
+  com.canonical.indicator.bluetooth.gschema.xml.in \
+  indicator-bluetooth.conf.in \
+  indicator-bluetooth.desktop.in \
+  indicator-bluetooth.upstart.desktop.in
 
-CLEANFILES = \
+CLEANFILES += \
   $(dbus_services_DATA) \
   $(gsettings_SCHEMAS)
diff --git a/data/indicator-bluetooth.conf.in b/data/indicator-bluetooth.conf.in
new file mode 100644
index 0000000..c23665c
--- /dev/null
+++ b/data/indicator-bluetooth.conf.in
@@ -0,0 +1,11 @@
+description "Indicator Bluetooth Backend"
+
+# Want to move to indicator-services-[start|end], but that's not all
+# there yet. Use the signals that exist today for now.
+
+start on indicators-loaded or indicator-services-start
+stop on desktop-end or indicator-services-end
+
+respawn
+
+exec @pkglibexecdir@/indicator-bluetooth-service
diff --git a/data/indicator-bluetooth.desktop.in b/data/indicator-bluetooth.desktop.in
new file mode 100644
index 0000000..dc9fd1b
--- /dev/null
+++ b/data/indicator-bluetooth.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Bluetooth
+Exec=@pkglibexecdir@/indicator-bluetooth-service
+NoDisplay=true
+StartupNotify=false
+Terminal=false
diff --git a/data/indicator-bluetooth.service.in b/data/indicator-bluetooth.service.in
deleted file mode 100644
index 4d1c445..0000000
--- a/data/indicator-bluetooth.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.indicator.bluetooth
-Exec=@pkglibexecdir@/indicator-bluetooth-service
diff --git a/data/indicator-bluetooth.upstart.desktop.in b/data/indicator-bluetooth.upstart.desktop.in
new file mode 100644
index 0000000..5c9dcaf
--- /dev/null
+++ b/data/indicator-bluetooth.upstart.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Bluetooth
+Exec=@pkglibexecdir@/indicator-bluetooth-service
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+Hidden=true