Synchronize process management across indicators Fixes: 1232828

Approved by: Charles Kerr, PS Jenkins bot

8 files changed, 40 insertions, 18 deletions

diff --git a/configure.ac b/configure.ac
index 00f2d09..221ddc9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,7 @@ dnl ###########################################################################
 AC_OUTPUT([
 Makefile
 data/Makefile
+data/upstart/Makefile
 po/Makefile.in
 src/Makefile
 ])
diff --git a/data/Makefile.am b/data/Makefile.am
index 9784451..81f4d5e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,6 +2,8 @@ BUILT_SOURCES =
 EXTRA_DIST =
 CLEANFILES =
 
+SUBDIRS = upstart
+
 # the indicator bus file
 indicatorsdir = $(datadir)/unity/indicators
 dist_indicators_DATA = com.canonical.indicator.bluetooth
@@ -16,17 +18,6 @@ BUILT_SOURCES += $(upstart_jobs_DATA)
 EXTRA_DIST += $(upstart_jobs_in)
 CLEANFILES += $(upstart_jobs_DATA)
 
-# 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
@@ -45,8 +36,7 @@ gsettings_SCHEMAS = com.canonical.indicator.bluetooth.gschema.xml
 EXTRA_DIST += \
   com.canonical.indicator.bluetooth.gschema.xml.in \
   indicator-bluetooth.conf.in \
-  indicator-bluetooth.desktop.in \
-  indicator-bluetooth.upstart.desktop.in
+  indicator-bluetooth.desktop.in
 
 CLEANFILES += \
   $(dbus_services_DATA) \
diff --git a/data/indicator-bluetooth.conf.in b/data/indicator-bluetooth.conf.in
index c23665c..5262391 100644
--- a/data/indicator-bluetooth.conf.in
+++ b/data/indicator-bluetooth.conf.in
@@ -1,11 +1,9 @@
 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
+start on indicator-services-start
 stop on desktop-end or indicator-services-end
 
 respawn
+respawn limit 2 10
 
 exec @pkglibexecdir@/indicator-bluetooth-service
diff --git a/data/indicator-bluetooth.desktop.in b/data/indicator-bluetooth.desktop.in
index dc9fd1b..6048c3c 100644
--- a/data/indicator-bluetooth.desktop.in
+++ b/data/indicator-bluetooth.desktop.in
@@ -5,3 +5,5 @@ Exec=@pkglibexecdir@/indicator-bluetooth-service
 NoDisplay=true
 StartupNotify=false
 Terminal=false
+OnlyShowIn=Unity;GNOME;
+AutostartCondition=GNOME3 unless-session gnome
diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am
new file mode 100644
index 0000000..2012021
--- /dev/null
+++ b/data/upstart/Makefile.am
@@ -0,0 +1,17 @@
+BUILT_SOURCES =
+EXTRA_DIST =
+CLEANFILES =
+
+# 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.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)
+
+EXTRA_DIST += \
+  indicator-bluetooth.upstart.desktop.in
diff --git a/data/indicator-bluetooth.upstart.desktop.in b/data/upstart/indicator-bluetooth.desktop.in
index 5c9dcaf..523cfa0 100644
--- a/data/indicator-bluetooth.upstart.desktop.in
+++ b/data/upstart/indicator-bluetooth.desktop.in
@@ -5,4 +5,5 @@ Exec=@pkglibexecdir@/indicator-bluetooth-service
 NoDisplay=true
 StartupNotify=false
 Terminal=false
+OnlyShowIn=Unity;
 Hidden=true
diff --git a/debian/changelog b/debian/changelog
index ed3488d..ce7fc6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+indicator-bluetooth (0.0.6+14.04.20140207-0ubuntu3) UNRELEASED; urgency=medium
+
+  * Synchronize process management across indicators
+
+ -- Ted Gould <ted@ubuntu.com>  Mon, 22 Sep 2014 09:00:47 -0500
+
+indicator-bluetooth (0.0.6+14.04.20140207-0ubuntu2) trusty; urgency=medium
+
+  * Toggle rfkill again so that we have a chance of persisting the bluetooth
+    state across reboots. (LP: #1232828)
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Thu, 10 Apr 2014 15:38:13 -0400
+
 indicator-bluetooth (0.0.6+14.04.20140207-0ubuntu1) trusty; urgency=low
 
   [ Ted Gould ]
diff --git a/src/bluez.vala b/src/bluez.vala
index a189a16..323674c 100644
--- a/src/bluez.vala
+++ b/src/bluez.vala
@@ -35,7 +35,7 @@ public class Bluez: Bluetooth, Object
     set { _powered = value; update_enabled(); }
   }
 
-  private KillSwitch killswitch = null;
+  private KillSwitch killswitch = new RfKillSwitch ();
 
   private string adapter_path = null;