Merge lp:~robert-ancell/indicator-bluetooth/bluez5 into lp:indicator-bluetooth/15.04

[Robert Ancell]

Support Bluez 5

When enabling/disabling and setting discoverability we now do this for all
adapters.

This requires us to remove the "Set Up New Device" item since gnome-bluetooth no
longer has a bluetooth wizard stand alone application. Instead we rely on the
unity-control-center panel for device setup.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:88
http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-ci/38/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-vivid-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-vivid-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-bluetooth-ci/38/rebuild

review: Approve (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

Code looks good to me. I would prefer another review though (like from Mathieu) as my bluetooth is quite flaky and it only worked once (but it was already the case with bluez4).

Maybe you can as well package it and push to the ppa as ~ppa1 so that we can get broader testing?
Thanks!

review: Approve

[Mathieu Trudel-Lapierre (cyphermox)]

Looks good to me; but I agree it would be best to package it and make it available in the transitions PPA for further testing.

review: Approve

[Robert Ancell (robert-ancell)]

This is already in the transitions PPA as indicator-bluetooth 0.0.6+14.10.20141006-0ubuntu1+bluezfive

[Charles Kerr (charlesk)]

The code changes look reasonable and the transitions build of indicator-bluetooth works for me when I test it on a fresh installation of the March 6 Vivid iso. In that setup, both the on/off and visible/invisible toggles work as advertised.

Some problems:

* On desktop, "Set Up New Device..." is a feature specified in https://wiki.ubuntu.com/Bluetooth#Indicator_and_menu but is removed here. Can it be salvaged?

* After installing [bluez, indicator-bluetooth, libbluetooth3] on mako running vivid r136. The indicator's bluetooth on/off toggle had no effect. (This might be user error; I don't know if this PPA is supposed to work on the phone...)

* The transitions repository doesn't have unity-control-center in it, so I don't know how far we are for landing this in Vivid?

* The visible/invisible toggle in gnome-control-center didn't show the same state as the indicator. The indicator seemed to hold the correct state.

[Amr Ibrahim (amribrahim1987)]

Any news for packaging this for wily? I think bluez 5 needs broad testing in 15.10 before 16.04 LTS.

[lp:~robert-ancell/indicator-bluetooth/bluez5]

89. By Robert Ancell on 2015-08-07

Remove unused argument in DBus interface

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:89
http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-15.04-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-15.04-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-15.04-vivid-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/indicator-bluetooth-15.04-vivid-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-bluetooth-15.04-ci/1/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-01-14 04:39:09 +0000
+++ debian/control	2015-08-07 02:52:49 +0000
@@ -21,7 +21,7 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         bluez (>= 4.36),
+         bluez (>= 5),
          unity-control-center | gnome-control-center | ubuntu-system-settings,
          gnome-bluetooth | ubuntu-system-settings,
 Replaces: gnome-bluetooth (<< 3.6.1-0ubuntu2)
 
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2013-10-01 11:06:27 +0000
+++ po/POTFILES.in	2015-08-07 02:52:49 +0000
@@ -8,7 +8,6 @@
 src/device.vala
 src/killswitch.vala
 src/main.vala
-src/org-bluez.vala
 src/phone.vala
 src/profile.vala
 src/service.vala
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-09-25 20:06:30 +0000
+++ src/Makefile.am	2015-08-07 02:52:49 +0000
@@ -1,7 +1,6 @@
 pkglibexec_PROGRAMS = indicator-bluetooth-service
 
 indicator_bluetooth_service_SOURCES = \
-	org-bluez.vala \
 	bluetooth.vala \
 	bluez.vala \
 	desktop.vala \
 
=== modified file 'src/bluez.vala'
--- src/bluez.vala	2014-09-22 13:54:50 +0000
+++ src/bluez.vala	2015-08-07 02:52:49 +0000
@@ -25,8 +25,7 @@
 public class Bluez: Bluetooth, Object
 {
   uint next_device_id = 1;
-  org.bluez.Manager manager;
-  org.bluez.Adapter default_adapter;
+  ObjectManager manager;
 
   private bool _powered = false;
 
@@ -37,21 +36,22 @@
 
   private KillSwitch killswitch = new RfKillSwitch ();
 
-  private string adapter_path = null;
-
   private DBusConnection bus = null;
 
-  /* maps an org.bluez.Device's object_path to the org.bluez.Device proxy */
-  HashTable<string,org.bluez.Device> path_to_proxy;
-
-  /* maps an org.bluez.Device's object_path to our arbitrary unique id */
-  HashTable<string,uint> path_to_id;
+  /* maps an org.bluez.Adapter1's object_path to the BluezAdapter proxy */
+  private HashTable<ObjectPath,BluezAdapter> path_to_adapter_proxy;
+
+  /* maps an org.bluez.Device1's object_path to the BluezDevice proxy */
+  private HashTable<ObjectPath,BluezDevice> path_to_device_proxy;
+
+  /* maps an org.bluez.Device1's object_path to our arbitrary unique id */
+  private HashTable<ObjectPath,uint> path_to_id;
 
   /* maps our arbitrary unique id to an org.bluez.Device's object path */
-  HashTable<uint,string> id_to_path;
+  private HashTable<uint,ObjectPath> id_to_path;
 
   /* maps our arbitrary unique id to a Bluetooth.Device struct for public consumption */
-  HashTable<uint,Device> id_to_device;
+  private HashTable<uint,Device> id_to_device;
 
   public Bluez (KillSwitch? killswitch)
   {
@@ -71,121 +71,116 @@
         update_enabled ();
       }
 
-    id_to_path    = new HashTable<uint,string> (direct_hash, direct_equal);
-    id_to_device  = new HashTable<uint,Device> (direct_hash, direct_equal);
-    path_to_id    = new HashTable<string,uint> (str_hash, str_equal);
-    path_to_proxy = new HashTable<string,org.bluez.Device> (str_hash, str_equal);
-
     reset_manager ();
   }
 
   private void reset_manager ()
   {
-    string new_adapter_path = null;
+    id_to_path = new HashTable<uint,ObjectPath> (direct_hash, direct_equal);
+    id_to_device = new HashTable<uint,Device> (direct_hash, direct_equal);
+    path_to_id = new HashTable<ObjectPath,uint> (str_hash, str_equal);
+    path_to_adapter_proxy = new HashTable<ObjectPath,BluezAdapter> (str_hash, str_equal);
+    path_to_device_proxy = new HashTable<ObjectPath,BluezDevice> (str_hash, str_equal);
+
     try
       {
         manager = bus.get_proxy_sync ("org.bluez", "/");
 
-        // if the default adapter changes, update our connections
-        manager.default_adapter_changed.connect ((object_path)
-            => on_default_adapter_changed (object_path));
-
-        // if the current adapter disappears, call clear_adapter()
-        manager.adapter_removed.connect ((object_path) => { 
-            if (object_path == adapter_path)
-              clear_adapter ();
-        });
-
-        // get the current default adapter & watch for future default adapters
-        new_adapter_path = manager.default_adapter ();
+        // Find the adapters and watch for changes
+        manager.interfaces_added.connect ((object_path, interfaces_and_properties) => {
+          var iter = HashTableIter<string, HashTable<string, Variant>> (interfaces_and_properties);
+          string name;
+          while (iter.next (out name, null))
+            {
+              if (name == "org.bluez.Adapter1")
+                update_adapter (object_path);
+              if (name == "org.bluez.Device1")
+                update_device (object_path);
+            }
+        });
+        manager.interfaces_removed.connect ((object_path, interfaces) => {
+            foreach (var interface in interfaces) {
+              if (interface == "org.bluez.Adapter1")
+                adapter_removed (object_path);
+              if (interface == "org.bluez.Device1")
+                device_removed (object_path);
+            }
+        });
+        var objects = manager.get_managed_objects ();
+        var object_iter = HashTableIter<ObjectPath, HashTable<string, HashTable<string, Variant>>> (objects);
+        ObjectPath object_path;
+        HashTable<string, HashTable<string, Variant>> interfaces_and_properties;
+        while (object_iter.next (out object_path, out interfaces_and_properties))
+          {
+            var iter = HashTableIter<string, HashTable<string, Variant>> (interfaces_and_properties);
+            string name;
+            while (iter.next (out name, null)) {
+              if (name == "org.bluez.Adapter1")
+                update_adapter (object_path);
+              if (name == "org.bluez.Device1")
+                update_device (object_path);
+            }
+          }
       }
     catch (Error e)
       {
         critical (@"$(e.message)");
       }
-
-    on_default_adapter_changed (new_adapter_path);
-  }
-
-  private void clear_adapter ()
-  {
-    if (adapter_path != null)
-      debug (@"clearing adapter; was using $adapter_path");
-
-    path_to_proxy.remove_all ();
-    path_to_id.remove_all ();
-    id_to_path.remove_all ();
-    id_to_device.remove_all ();
-
-    default_adapter = null;
-    adapter_path = null;
-
-    discoverable = false;
-    powered = false;
-  }
-
-  void on_default_adapter_changed (string? object_path)
-  {
-    clear_adapter ();
-
-    if (object_path != null) try
-      {
-        adapter_path = object_path;
-        default_adapter = Bus.get_proxy_sync (BusType.SYSTEM,
-                                              "org.bluez",
-                                              adapter_path);
-
-        default_adapter.property_changed.connect (()
-            => on_default_adapter_properties_changed ());
-
-        default_adapter.device_removed.connect ((adapter, path) => {
-          var id = path_to_id.lookup (path);
-          path_to_id.remove (path);
-          id_to_path.remove (id);
-          id_to_device.remove (id);
-          devices_changed ();
-        });
-
-        default_adapter.device_created.connect ((adapter, path)
-            => add_device (path));
-
-        foreach (var device_path in default_adapter.list_devices ())
-          add_device (device_path);
-      }
-    catch (Error e)
-     {
-       critical (@"$(e.message)");
-     }
-
-    supported = object_path != null;
-
-    on_default_adapter_properties_changed ();
-  }
-
-  /* When the default adapter's properties change,
-     update our own properties "powered" and "discoverable" */
-  private void on_default_adapter_properties_changed ()
-  {
-    bool is_discoverable = false;
-    bool is_powered = false;
-
-    if (default_adapter != null) try
-      {
-        var properties = default_adapter.get_properties ();
-
-        var v = properties.lookup ("Discoverable");
-        is_discoverable = (v != null) && v.get_boolean ();
-
-        v = properties.lookup ("Powered");
-        is_powered = (v != null) && v.get_boolean ();
-      }
-    catch (Error e) 
-     {
-       critical (@"$(e.message)");
-     }
-
+  }
+
+  ////
+  ////  Adapter Upkeep
+  ////
+
+  private void update_adapter (ObjectPath object_path)
+  {
+    // Create a proxy if we don't have one
+    var adapter_proxy = path_to_adapter_proxy.lookup (object_path);
+    if (adapter_proxy == null)
+      {
+        try {
+          adapter_proxy = bus.get_proxy_sync ("org.bluez", object_path);
+        } catch (Error e) {
+          critical (@"$(e.message)");
+          return;
+        }
+        path_to_adapter_proxy.insert (object_path, adapter_proxy);
+        adapter_proxy.g_properties_changed.connect(() => update_adapter (object_path));
+      }
+
+    update_combined_adapter_state ();
+  }
+
+  private void adapter_removed (ObjectPath object_path)
+  {
+    path_to_adapter_proxy.remove (object_path);
+    update_combined_adapter_state ();
+  }
+
+  private void update_combined_adapter_state ()
+  {
+    var is_discoverable = false;
+    var is_powered = false;
+    var is_supported = false;
+
+    var iter = HashTableIter<ObjectPath,BluezAdapter> (path_to_adapter_proxy);
+    BluezAdapter adapter_proxy;
+    while (iter.next (null, out adapter_proxy))
+      {
+        var v = adapter_proxy.get_cached_property ("Discoverable");
+        if (!is_discoverable)
+          is_discoverable = (v != null) && v.get_boolean ();
+
+        v = adapter_proxy.get_cached_property ("Powered");
+        if (!is_powered)
+          is_powered = (v != null) && v.get_boolean ();
+
+        is_supported = true;
+      }
+
+    discoverable = is_discoverable;
     powered = is_powered;
-    discoverable = is_discoverable;
+    supported = is_supported;
   }
 
   ////
@@ -226,138 +221,34 @@
   }
 
   ////
-  ////  Connectable Interfaces
-  ////
-
-  /* Headsets, Audio Sinks, and Input devices are connectable.
-   *
-   * This continues the behavior of the old gnome-bluetooth indicator.
-   * But are there other interfaces we care about? */
-  private DBusInterfaceInfo[] get_connectable_interfaces (DBusProxy device)
-  {
-    DBusInterfaceInfo[] connectable_interfaces = {};
-
-    try
-      {
-        var iname = "org.freedesktop.DBus.Introspectable.Introspect";
-        var intro = device.call_sync (iname, null, DBusCallFlags.NONE, -1);
-
-        if ((intro != null) && (intro.n_children() > 0))
-          {
-            var xml = intro.get_child_value(0).get_string();
-            var info = new DBusNodeInfo.for_xml (xml);
-            if (info != null)
-              {
-                foreach (var i in info.interfaces)
-                  {
-                    if ((i.name == "org.bluez.AudioSink") ||
-                        (i.name == "org.bluez.Headset") ||
-                        (i.name == "org.bluez.Input"))
-                      {
-                        connectable_interfaces += i;
-                      }
-                  }
-              }
-          }
-      }
-    catch (Error e)
-      {
-       critical (@"$(e.message)");
-      }
-
-    return connectable_interfaces;
-  }
-
-  private bool device_is_connectable (DBusProxy device)
-  {
-    return get_connectable_interfaces (device).length > 0;
-  }
-
-  // call "Connect" on the specified interface
-  private void device_connect_on_interface (DBusProxy proxy,
-                                            string interface_name)
-  {
-    var object_path = proxy.get_object_path ();
-
-    debug (@"trying to connect to $object_path: $(interface_name)");
-
-    try
-      {
-        bus.call_sync ("org.bluez", object_path, interface_name,
-                       "Connect", null, null, DBusCallFlags.NONE, -1);
-      }
-    catch (Error e)
-      {
-        debug (@"$object_path $interface_name.Connect() failed: $(e.message)");
-      }
-  }
-
-  private void device_connect (org.bluez.Device device)
-  {
-    DBusProxy proxy = device as DBusProxy;
-
-    // call "Connect" on all the interfaces that support it
-    foreach (var i in get_connectable_interfaces (proxy))
-      device_connect_on_interface (proxy, i.name);
-  }
-
-  private void device_disconnect (org.bluez.Device device)
-  {
-    try
-      {
-        device.disconnect ();
-      }
-    catch (Error e)
-      {
-        var object_path = (device as DBusProxy).get_object_path ();
-        critical (@"Unable to disconnect $object_path: $(e.message)");
-      }
-  }
-
-  ////
   ////  Device Upkeep
   ////
 
-  private void add_device (string object_path)
-  {
-    if (!path_to_proxy.contains (object_path))
-      {
-        try
-          {
-            org.bluez.Device device = Bus.get_proxy_sync (BusType.SYSTEM,
-                                                          "org.bluez",
-                                                          object_path);
-            path_to_proxy.insert (object_path, device);
-            device.property_changed.connect(() => update_device (device)); 
-            update_device (device);
-          }
-        catch (Error e)
-          {
-            critical (@"$(e.message)");
-          }
-      }
-  }
-
   /* Update our public Device struct from the org.bluez.Device's properties.
    *
    * This is called when we first walk through bluez' Devices on startup,
    * when the org.bluez.Adapter gets a new device,
    * and when a device's properties change s.t. we need to rebuild the proxy.
    */
-  private void update_device (org.bluez.Device device_proxy)
+  private void update_device (ObjectPath object_path)
   {
-    HashTable<string, GLib.Variant> properties;
+    // Create a proxy if we don't have one
+    var device_proxy = path_to_device_proxy.lookup (object_path);
+    if (device_proxy == null)
+      {
+        try {
+          device_proxy = bus.get_proxy_sync ("org.bluez", object_path);
+        } catch (Error e) {
+          critical (@"$(e.message)");
+          return;
+        }
 
-    try {
-      properties = device_proxy.get_properties ();
-    } catch (Error e) {
-      critical (@"$(e.message)");
-      return;
-    }
+        path_to_device_proxy.insert (object_path, device_proxy);
+        device_proxy.g_properties_changed.connect(() => update_device (object_path));
+      }
 
     // look up our id for this device.
     // if we don't have one yet, create one.
-    var object_path = (device_proxy as DBusProxy).get_object_path();
     var id = path_to_id.lookup (object_path);
     if (id == 0)
       {
@@ -368,35 +259,32 @@
 
     // look up the device's type
     Device.Type type;
-    var v = properties.lookup ("Class");
+    var v = device_proxy.get_cached_property ("Class");
     if (v == null)
       type = Device.Type.OTHER;
     else 
       type = Device.class_to_device_type (v.get_uint32());
 
     // look up the device's human-readable name
-    v = properties.lookup ("Alias");
+    v = device_proxy.get_cached_property ("Alias");
     if (v == null)
-      v = properties.lookup ("Name");
+      v = device_proxy.get_cached_property ("Name");
     var name = v == null ? _("Unknown") : v.get_string ();
 
     // look up the device's bus address
-    v = properties.lookup ("Address");
+    v = device_proxy.get_cached_property ("Address");
     var address = v.get_string ();
 
     // look up the device's bus address
-    v = properties.lookup ("Icon");
+    v = device_proxy.get_cached_property ("Icon");
     var icon = new ThemedIcon (v != null ? v.get_string() : "unknown");
 
-    // derive a Connectable flag for this device
-    var is_connectable = device_is_connectable (device_proxy as DBusProxy);
-
     // look up the device's Connected flag
-    v = properties.lookup ("Connected");
+    v = device_proxy.get_cached_property ("Connected");
     var is_connected = (v != null) && v.get_boolean ();
 
     // derive the uuid-related attributes we care about
-    v = properties.lookup ("UUIDs");
+    v = device_proxy.get_cached_property ("UUIDs");
     string[] uuid_strings = v.dup_strv ();
     uint16[] uuids = {};
     foreach (var s in uuid_strings)
@@ -404,13 +292,12 @@
     var supports_browsing = device_supports_browsing (uuids);
     var supports_file_transfer = device_supports_file_transfer (uuids);
 
-    // update our lookup table with these new attributes
     id_to_device.insert (id, new Device (id,
                                          type,
                                          name,
                                          address,
                                          icon,
-                                         is_connectable,
+                                         true,
                                          is_connected,
                                          supports_browsing,
                                          supports_file_transfer));
@@ -419,6 +306,16 @@
     update_connected ();
   }
 
+  private void device_removed (ObjectPath path)
+  {
+    var id = path_to_id.lookup (path);
+    path_to_id.remove (path);
+    id_to_path.remove (id);
+    id_to_device.remove (id);
+
+    devices_changed ();
+  }
+
   /* update the 'enabled' property by looking at the killswitch state
      and the 'powered' property state */
   void update_enabled ()
@@ -452,16 +349,22 @@
   {
     var device = id_to_device.lookup (id);
     var path = id_to_path.lookup (id);
-    var proxy = (path != null) ? path_to_proxy.lookup (path) : null;
+    var proxy = (path != null) ? path_to_device_proxy.lookup (path) : null;
 
-    if ((proxy != null)
-        && (device != null)
+    if ((device != null)
         && (device.is_connected != connected))
       {
-        if (connected)
-          device_connect (proxy);
-        else
-          device_disconnect (proxy);
+        try
+          {
+            if (connected)
+              proxy.connect_ ();
+            else
+              proxy.disconnect_ ();
+          }
+        catch (Error e)
+          {
+            debug (@"$path org.bluez.Device1 connect/disconnect failed: $(e.message)");
+          }
 
         update_connected ();
       }
@@ -471,7 +374,13 @@
   {
     if (discoverable != b)
       {
-        default_adapter.set_property.begin ("Discoverable", new Variant.boolean (b));
+        var iter = HashTableIter<ObjectPath,BluezAdapter> (path_to_adapter_proxy);
+        ObjectPath object_path;
+        BluezAdapter adapter_proxy;
+        while (iter.next (out object_path, out adapter_proxy))
+          adapter_proxy.call.begin ("org.freedesktop.DBus.Properties.Set",
+                                    new Variant ("(ssv)", "org.bluez.Adapter1", "Discoverable", new Variant.boolean (b)),
+                                    DBusCallFlags.NONE, -1);
       }
   }
 
@@ -492,11 +401,40 @@
         debug (@"setting killswitch blocked to $(!b)");
         killswitch.try_set_blocked (!b);
       }
-    else if (default_adapter != null)
+    else
       {
-        debug (@"setting bluez Adapter's Powered property to $b");
-        default_adapter.set_property.begin ("Powered", new Variant.boolean (b));
-        powered = b;
+        var iter = HashTableIter<ObjectPath,BluezAdapter> (path_to_adapter_proxy);
+        ObjectPath object_path;
+        BluezAdapter adapter_proxy;
+        while (iter.next (out object_path, out adapter_proxy))
+          adapter_proxy.call.begin ("org.freedesktop.DBus.Properties.Set",
+                                    new Variant ("(ssv)", "org.bluez.Adapter1", "Powered", new Variant.boolean (b)),
+                                    DBusCallFlags.NONE, -1);
       }
   }
 }
+
+[DBus (name = "org.freedesktop.DBus.ObjectManager")]
+private interface ObjectManager : Object {
+  [DBus (name = "GetManagedObjects")]
+  public abstract HashTable<ObjectPath, HashTable<string, HashTable<string, Variant>>> get_managed_objects() throws DBusError, IOError;
+
+  [DBus (name = "InterfacesAdded")]
+  public signal void interfaces_added(ObjectPath object_path, HashTable<string, HashTable<string, Variant>> interfaces_and_properties);
+
+  [DBus (name = "InterfacesRemoved")]
+  public signal void interfaces_removed(ObjectPath object_path, string[] interfaces);
+}
+
+[DBus (name = "org.bluez.Adapter1")]
+private interface BluezAdapter : DBusProxy {
+}
+
+[DBus (name = "org.bluez.Device1")]
+private interface BluezDevice : DBusProxy {
+  [DBus (name = "Connect")]
+  public abstract void connect_() throws DBusError, IOError;
+
+  [DBus (name = "Disconnect")]
+  public abstract void disconnect_() throws DBusError, IOError;
+}
 
=== modified file 'src/desktop.vala'
--- src/desktop.vala	2014-01-21 21:29:37 +0000
+++ src/desktop.vala	2015-08-07 02:52:49 +0000
@@ -55,7 +55,6 @@
     actions += create_supported_action (bluetooth);
     actions += create_enabled_action (bluetooth);
     actions += create_discoverable_action (bluetooth);
-    actions += create_wizard_action ();
     actions += create_browse_files_action ();
     actions += create_send_file_action ();
     actions += create_show_settings_action ();
@@ -198,8 +197,6 @@
 
     // settings section
     section = new Menu ();
-    section.append (_("Set Up New Device…"),
-                    "indicator.desktop-wizard");
     section.append (_("Bluetooth Settings…"),
                     "indicator.desktop-show-settings::bluetooth");
     menu.append_section (null, section);
@@ -235,15 +232,6 @@
     return action;
   }
 
-  Action create_wizard_action ()
-  {
-    var action = new SimpleAction ("desktop-wizard", null);
-
-    action.activate.connect (()
-        => spawn_command_line_async ("bluetooth-wizard"));
-    return action;
-  }
-
   Action create_browse_files_action ()
   {
     var action = new SimpleAction ("desktop-browse-files", VariantType.STRING);
 
=== removed file 'src/org-bluez.vala'
--- src/org-bluez.vala	2013-10-14 23:33:59 +0000
+++ src/org-bluez.vala	1970-01-01 00:00:00 +0000
@@ -1,293 +0,0 @@
-/* Generated by vala-dbus-binding-tool 0.4.0. Do not modify! */
-/* Generated with: vala-dbus-binding-tool --gdbus --directory=. */
-using GLib;
-
-namespace org {
-
-	namespace bluez {
-
-		[DBus (name = "org.bluez.Manager", timeout = 120000)]
-		public interface Manager : GLib.Object {
-
-			[DBus (name = "GetProperties")]
-			public abstract GLib.HashTable<string, GLib.Variant> get_properties() throws DBusError, IOError;
-
-			[DBus (name = "DefaultAdapter")]
-			public abstract GLib.ObjectPath default_adapter() throws DBusError, IOError;
-
-			[DBus (name = "FindAdapter")]
-			public abstract GLib.ObjectPath find_adapter(string pattern) throws DBusError, IOError;
-
-			[DBus (name = "ListAdapters")]
-			public abstract GLib.ObjectPath[] list_adapters() throws DBusError, IOError;
-
-			[DBus (name = "PropertyChanged")]
-			public signal void property_changed(string name, GLib.Variant value);
-
-			[DBus (name = "AdapterAdded")]
-			public signal void adapter_added(GLib.ObjectPath adapter);
-
-			[DBus (name = "AdapterRemoved")]
-			public signal void adapter_removed(GLib.ObjectPath adapter);
-
-			[DBus (name = "DefaultAdapterChanged")]
-			public signal void default_adapter_changed(GLib.ObjectPath adapter);
-		}
-
-		[DBus (name = "org.bluez.Manager", timeout = 120000)]
-		public interface ManagerSync : GLib.Object {
-
-			[DBus (name = "GetProperties")]
-			public abstract GLib.HashTable<string, GLib.Variant> get_properties() throws DBusError, IOError;
-
-			[DBus (name = "DefaultAdapter")]
-			public abstract GLib.ObjectPath default_adapter() throws DBusError, IOError;
-
-			[DBus (name = "FindAdapter")]
-			public abstract GLib.ObjectPath find_adapter(string pattern) throws DBusError, IOError;
-
-			[DBus (name = "ListAdapters")]
-			public abstract GLib.ObjectPath[] list_adapters() throws DBusError, IOError;
-
-			[DBus (name = "PropertyChanged")]
-			public signal void property_changed(string name, GLib.Variant value);
-
-			[DBus (name = "AdapterAdded")]
-			public signal void adapter_added(GLib.ObjectPath adapter);
-
-			[DBus (name = "AdapterRemoved")]
-			public signal void adapter_removed(GLib.ObjectPath adapter);
-
-			[DBus (name = "DefaultAdapterChanged")]
-			public signal void default_adapter_changed(GLib.ObjectPath adapter);
-		}
-
-		[DBus (name = "org.bluez.Adapter", timeout = 120000)]
-		public interface Adapter : GLib.Object {
-
-			[DBus (name = "GetProperties")]
-			public abstract GLib.HashTable<string, GLib.Variant> get_properties() throws DBusError, IOError;
-
-			[DBus (name = "SetProperty")]
-			public abstract async void set_property(string name, GLib.Variant value) throws DBusError, IOError;
-
-			[DBus (name = "RequestSession")]
-			public abstract void request_session() throws DBusError, IOError;
-
-			[DBus (name = "ReleaseSession")]
-			public abstract void release_session() throws DBusError, IOError;
-
-			[DBus (name = "StartDiscovery")]
-			public abstract void start_discovery() throws DBusError, IOError;
-
-			[DBus (name = "StopDiscovery")]
-			public abstract void stop_discovery() throws DBusError, IOError;
-
-			[DBus (name = "ListDevices")]
-			public abstract GLib.ObjectPath[] list_devices() throws DBusError, IOError;
-
-			[DBus (name = "CreateDevice")]
-			public abstract GLib.ObjectPath create_device(string address) throws DBusError, IOError;
-
-			[DBus (name = "CreatePairedDevice")]
-			public abstract GLib.ObjectPath create_paired_device(string address, GLib.ObjectPath agent, string capability) throws DBusError, IOError;
-
-			[DBus (name = "CancelDeviceCreation")]
-			public abstract void cancel_device_creation(string address) throws DBusError, IOError;
-
-			[DBus (name = "RemoveDevice")]
-			public abstract void remove_device(GLib.ObjectPath device) throws DBusError, IOError;
-
-			[DBus (name = "FindDevice")]
-			public abstract GLib.ObjectPath find_device(string address) throws DBusError, IOError;
-
-			[DBus (name = "RegisterAgent")]
-			public abstract void register_agent(GLib.ObjectPath agent, string capability) throws DBusError, IOError;
-
-			[DBus (name = "UnregisterAgent")]
-			public abstract void unregister_agent(GLib.ObjectPath agent) throws DBusError, IOError;
-
-			[DBus (name = "PropertyChanged")]
-			public signal void property_changed(string name, GLib.Variant value);
-
-			[DBus (name = "DeviceCreated")]
-			public signal void device_created(GLib.ObjectPath device);
-
-			[DBus (name = "DeviceRemoved")]
-			public signal void device_removed(GLib.ObjectPath device);
-
-			[DBus (name = "DeviceFound")]
-			public signal void device_found(string address, GLib.HashTable<string, GLib.Variant> values);
-
-			[DBus (name = "DeviceDisappeared")]
-			public signal void device_disappeared(string address);
-		}
-
-		[DBus (name = "org.bluez.Adapter", timeout = 120000)]
-		public interface AdapterSync : GLib.Object {
-
-			[DBus (name = "GetProperties")]
-			public abstract GLib.HashTable<string, GLib.Variant> get_properties() throws DBusError, IOError;
-
-			[DBus (name = "SetProperty")]
-			public abstract void set_property(string name, GLib.Variant value) throws DBusError, IOError;
-
-			[DBus (name = "RequestSession")]
-			public abstract void request_session() throws DBusError, IOError;
-
-			[DBus (name = "ReleaseSession")]
-			public abstract void release_session() throws DBusError, IOError;
-
-			[DBus (name = "StartDiscovery")]
-			public abstract void start_discovery() throws DBusError, IOError;
-
-			[DBus (name = "StopDiscovery")]
-			public abstract void stop_discovery() throws DBusError, IOError;
-
-			[DBus (name = "ListDevices")]
-			public abstract GLib.ObjectPath[] list_devices() throws DBusError, IOError;
-
-			[DBus (name = "CreateDevice")]
-			public abstract GLib.ObjectPath create_device(string address) throws DBusError, IOError;
-
-			[DBus (name = "CreatePairedDevice")]
-			public abstract GLib.ObjectPath create_paired_device(string address, GLib.ObjectPath agent, string capability) throws DBusError, IOError;
-
-			[DBus (name = "CancelDeviceCreation")]
-			public abstract void cancel_device_creation(string address) throws DBusError, IOError;
-
-			[DBus (name = "RemoveDevice")]
-			public abstract void remove_device(GLib.ObjectPath device) throws DBusError, IOError;
-
-			[DBus (name = "FindDevice")]
-			public abstract GLib.ObjectPath find_device(string address) throws DBusError, IOError;
-
-			[DBus (name = "RegisterAgent")]
-			public abstract void register_agent(GLib.ObjectPath agent, string capability) throws DBusError, IOError;
-
-			[DBus (name = "UnregisterAgent")]
-			public abstract void unregister_agent(GLib.ObjectPath agent) throws DBusError, IOError;
-
-			[DBus (name = "PropertyChanged")]
-			public signal void property_changed(string name, GLib.Variant value);
-
-			[DBus (name = "DeviceCreated")]
-			public signal void device_created(GLib.ObjectPath device);
-
-			[DBus (name = "DeviceRemoved")]
-			public signal void device_removed(GLib.ObjectPath device);
-
-			[DBus (name = "DeviceFound")]
-			public signal void device_found(string address, GLib.HashTable<string, GLib.Variant> values);
-
-			[DBus (name = "DeviceDisappeared")]
-			public signal void device_disappeared(string address);
-		}
-
-		[DBus (name = "org.bluez.Agent", timeout = 120000)]
-		public interface Agent : GLib.Object {
-
-			[DBus (name = "Authorize")]
-			public abstract void authorize(GLib.ObjectPath device, string uuid) throws DBusError, IOError;
-
-			[DBus (name = "RequestPinCode")]
-			public abstract string request_pin_code(GLib.ObjectPath device) throws DBusError, IOError;
-
-			[DBus (name = "DisplayPasskey")]
-			public abstract void display_passkey(GLib.ObjectPath device, uint passkey) throws DBusError, IOError;
-
-			[DBus (name = "Release")]
-			public abstract void release() throws DBusError, IOError;
-
-			[DBus (name = "Cancel")]
-			public abstract void cancel() throws DBusError, IOError;
-
-			[DBus (name = "RequestConfirmation")]
-			public abstract void request_confirmation(GLib.ObjectPath device, uint passkey) throws DBusError, IOError;
-
-			[DBus (name = "ConfirmModeChange")]
-			public abstract void confirm_mode_change(string mode) throws DBusError, IOError;
-
-			[DBus (name = "RequestPasskey")]
-			public abstract uint request_passkey(GLib.ObjectPath device) throws DBusError, IOError;
-		}
-
-		[DBus (name = "org.bluez.Agent", timeout = 120000)]
-		public interface AgentSync : GLib.Object {
-
-			[DBus (name = "Authorize")]
-			public abstract void authorize(GLib.ObjectPath device, string uuid) throws DBusError, IOError;
-
-			[DBus (name = "RequestPinCode")]
-			public abstract string request_pin_code(GLib.ObjectPath device) throws DBusError, IOError;
-
-			[DBus (name = "DisplayPasskey")]
-			public abstract void display_passkey(GLib.ObjectPath device, uint passkey) throws DBusError, IOError;
-
-			[DBus (name = "Release")]
-			public abstract void release() throws DBusError, IOError;
-
-			[DBus (name = "Cancel")]
-			public abstract void cancel() throws DBusError, IOError;
-
-			[DBus (name = "RequestConfirmation")]
-			public abstract void request_confirmation(GLib.ObjectPath device, uint passkey) throws DBusError, IOError;
-
-			[DBus (name = "ConfirmModeChange")]
-			public abstract void confirm_mode_change(string mode) throws DBusError, IOError;
-
-			[DBus (name = "RequestPasskey")]
-			public abstract uint request_passkey(GLib.ObjectPath device) throws DBusError, IOError;
-		}
-
-		[DBus (name = "org.bluez.Device", timeout = 120000)]
-		public interface Device : GLib.Object {
-
-			[DBus (name = "GetProperties")]
-			public abstract GLib.HashTable<string, GLib.Variant> get_properties() throws DBusError, IOError;
-
-			[DBus (name = "SetProperty")]
-			public abstract void set_property(string name, GLib.Variant value) throws DBusError, IOError;
-
-			[DBus (name = "DiscoverServices")]
-			public abstract GLib.HashTable<uint, string> discover_services(string pattern) throws DBusError, IOError;
-
-			[DBus (name = "CancelDiscovery")]
-			public abstract void cancel_discovery() throws DBusError, IOError;
-
-			[DBus (name = "Disconnect")]
-			public abstract void disconnect() throws DBusError, IOError;
-
-			[DBus (name = "PropertyChanged")]
-			public signal void property_changed(string name, GLib.Variant value);
-
-			[DBus (name = "DisconnectRequested")]
-			public signal void disconnect_requested();
-		}
-
-		[DBus (name = "org.bluez.Device", timeout = 120000)]
-		public interface DeviceSync : GLib.Object {
-
-			[DBus (name = "GetProperties")]
-			public abstract GLib.HashTable<string, GLib.Variant> get_properties() throws DBusError, IOError;
-
-			[DBus (name = "SetProperty")]
-			public abstract void set_property(string name, GLib.Variant value) throws DBusError, IOError;
-
-			[DBus (name = "DiscoverServices")]
-			public abstract GLib.HashTable<uint, string> discover_services(string pattern) throws DBusError, IOError;
-
-			[DBus (name = "CancelDiscovery")]
-			public abstract void cancel_discovery() throws DBusError, IOError;
-
-			[DBus (name = "Disconnect")]
-			public abstract void disconnect() throws DBusError, IOError;
-
-			[DBus (name = "PropertyChanged")]
-			public signal void property_changed(string name, GLib.Variant value);
-
-			[DBus (name = "DisconnectRequested")]
-			public signal void disconnect_requested();
-		}
-	}
-}