Merge lp:~charlesk/indicator-bluetooth/lp-1233628 into lp:indicator-bluetooth/13.10

[Charles Kerr]

add an action whose state shows whether or not bluetooth is supported by the hardware, used by ubuntu-system-settings.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:68
http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-saucy-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-saucy-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-saucy-armhf-ci/19/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-bluetooth-ci/20/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'src/bluetooth.vala'
--- src/bluetooth.vala	2013-08-05 21:48:17 +0000
+++ src/bluetooth.vala	2013-10-10 20:02:22 +0000
@@ -23,6 +23,10 @@
  */
 public interface Bluetooth: Object
 {
+  /* True if there are any bluetooth adapters on this system.
+     This work as a proxy for "does this hardware support bluetooth?" */
+  public abstract bool supported { get; protected set; }
+
   /* True if there are any bluetooth adapters powered up on the system.
      In short, whether or not this system's bluetooth is "on". */
   public abstract bool powered { get; protected set; }
@@ -68,6 +72,7 @@
     killswitch.notify["blocked"].connect (() => blocked = killswitch.blocked );
   }
 
+  public bool supported { get; protected set; default = false; }
   public bool powered { get; protected set; default = false; }
   public bool discoverable { get; protected set; default = false; }
   public bool blocked { get; protected set; default = true; }

=== modified file 'src/bluez.vala'
--- src/bluez.vala	2013-08-06 20:33:26 +0000
+++ src/bluez.vala	2013-10-10 20:02:22 +0000
@@ -70,6 +70,8 @@
 
   private void on_default_adapter_changed (string? object_path)
   {
+    supported = object_path != null;
+
     if (object_path != null) try
       {
         debug (@"using default adapter at $object_path");

=== modified file 'src/desktop.vala'
--- src/desktop.vala	2013-08-22 16:25:21 +0000
+++ src/desktop.vala	2013-10-10 20:02:22 +0000
@@ -52,6 +52,7 @@
     // build the static actions
     Action[] actions = {};
     actions += root_action;
+    actions += create_supported_action (bluetooth);
     actions += create_enabled_action (bluetooth);
     actions += create_discoverable_action (bluetooth);
     actions += create_wizard_action ();

=== modified file 'src/phone.vala'
--- src/phone.vala	2013-10-03 20:49:23 +0000
+++ src/phone.vala	2013-10-10 20:02:22 +0000
@@ -32,6 +32,7 @@
     // build the static actions
     Action[] actions = {};
     actions += root_action;
+    actions += create_supported_action (bluetooth);
     actions += create_enabled_action (bluetooth);
     actions += create_settings_action ();
     foreach (var a in actions)

=== modified file 'src/profile.vala'
--- src/profile.vala	2013-09-23 15:22:08 +0000
+++ src/profile.vala	2013-10-10 20:02:22 +0000
@@ -107,6 +107,18 @@
   ///  Actions
   ///
 
+  protected Action create_supported_action (Bluetooth bluetooth)
+  {
+    var action = new SimpleAction.stateful ("bluetooth-supported",
+                                            null,
+                                            bluetooth.supported);
+
+    bluetooth.notify["supported"].connect (()
+        => action.set_state (bluetooth.supported));
+
+    return action;
+  }
+
   protected Action create_enabled_action (Bluetooth bluetooth)
   {
     var action = new SimpleAction.stateful ("bluetooth-enabled",