Merge lp:~robert-ancell/indicator-bluetooth/only-show-when-adapter-present into lp:indicator-bluetooth/13.10

[Robert Ancell]

Only show indicator if Bluetooth adapter present

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:48
http://s-jenkins:8080/job/indicator-bluetooth-ci/5/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/indicator-bluetooth-ci/./build=pbuilder,distribution=raring,flavor=amd64/5/console
    SUCCESS: http://s-jenkins:8080/job/indicator-bluetooth-ci/./build=pbuilder,distribution=raring,flavor=armhf/5/console
    SUCCESS: http://s-jenkins:8080/job/indicator-bluetooth-ci/./build=pbuilder,distribution=raring,flavor=i386/5/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-bluetooth-ci/5//rebuild/?

review: Approve (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Approve. Hopefully jenkins will understand how to merge this once r. 47 is merged.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified in the merge proposal; hit 'Add commit message' on the merge proposal web page and approve the merge proposal again yourself to rerun.

review: Needs Fixing (continuous-integration)

[Martin Pitt (pitti)]

Please note that this caused a regression: bug 1126108

=== modified file 'NEWS'
--- NEWS	2013-01-31 19:54:53 +0000
+++ NEWS	2013-02-07 22:40:26 +0000
@@ -1,3 +1,8 @@
+Overview of changes in indicator-bluetooth 0.0.6
+
+    * Add "Set Up New Device" menu item
+    * Only show indicator if Bluetooth adapter present
+
 Overview of changes in indicator-bluetooth 0.0.5
 
     * Add license file
 
=== modified file 'src/indicator-bluetooth-service.vala'
--- src/indicator-bluetooth-service.vala	2013-02-06 03:16:55 +0000
+++ src/indicator-bluetooth-service.vala	2013-02-07 22:40:26 +0000
@@ -22,7 +22,6 @@
     private bool updating_visible = false;
     private Dbusmenu.Menuitem devices_separator;
     private List<BluetoothMenuItem> device_items;
-    private Dbusmenu.Menuitem settings_item;
     private Dbusmenu.Menuitem menu;
 
     public BluetoothIndicator () throws Error
@@ -106,12 +105,21 @@
         sep.property_set (Dbusmenu.MENUITEM_PROP_TYPE, Dbusmenu.CLIENT_TYPES_SEPARATOR);
         menu.child_append (sep);
 
-        settings_item = new Dbusmenu.Menuitem ();
-        settings_item.property_set (Dbusmenu.MENUITEM_PROP_LABEL, _("Bluetooth Settings…"));
-        settings_item.item_activated.connect (() => { show_control_center ("bluetooth"); });
-        menu.child_append (settings_item);
+        var item = new Dbusmenu.Menuitem ();
+        item.property_set (Dbusmenu.MENUITEM_PROP_LABEL, _("Set Up New Device…"));
+        item.item_activated.connect (() => { set_up_new_device (); });
+        menu.child_append (item);
+
+        item = new Dbusmenu.Menuitem ();
+        item.property_set (Dbusmenu.MENUITEM_PROP_LABEL, _("Bluetooth Settings…"));
+        item.item_activated.connect (() => { show_control_center ("bluetooth"); });
+        menu.child_append (item);
 
         killswitch_state_changed_cb (killswitch.state);
+
+        client.adapter_model.row_inserted.connect (adapters_changed_cb);
+        client.adapter_model.row_deleted.connect (adapters_changed_cb);
+        adapters_changed_cb ();
     }
 
     private BluetoothMenuItem? find_menu_item (string address)
@@ -168,6 +176,26 @@
         item.update (type, proxy, alias, icon, connected, services, uuids);
     }
 
+    private void adapters_changed_cb ()
+    {
+        bluetooth_service._visible = client.adapter_model.iter_n_children (null) > 0;
+        var builder = new VariantBuilder (VariantType.ARRAY);
+        builder.add ("{sv}", "Visible", new Variant.boolean (bluetooth_service._visible));
+        try
+        {
+            var properties = new Variant ("(sa{sv}as)", "com.canonical.indicator.bluetooth.service", builder, null);
+            bus.emit_signal (null,
+                             "/com/canonical/indicator/bluetooth/service",
+                             "org.freedesktop.DBus.Properties",
+                             "PropertiesChanged",
+                             properties);
+        }
+        catch (Error e)
+        {
+            warning ("Failed to emit signal: %s", e.message);
+        }
+    }
+
     private void device_removed_cb (Gtk.TreePath path)
     {
         Gtk.TreeIter iter;
@@ -334,6 +362,18 @@
     }
 }
 
+private void set_up_new_device ()
+{
+    try
+    {
+        Process.spawn_command_line_async ("bluetooth-wizard");
+    }
+    catch (GLib.SpawnError e)
+    {
+        warning ("Failed to open bluetooth-wizard: %s", e.message);
+    }
+}
+
 private void show_control_center (string panel)
 {
     try
@@ -377,6 +417,11 @@
 [DBus (name = "com.canonical.indicator.bluetooth.service")]
 private class BluetoothService : Object
 {
+    internal bool _visible = false;
+    public bool visible
+    {
+        get { return _visible; }
+    }
     internal string _icon_name = "bluetooth-active";
     public string icon_name
     {
 
=== modified file 'src/indicator-bluetooth.vala'
--- src/indicator-bluetooth.vala	2013-02-06 03:16:55 +0000
+++ src/indicator-bluetooth.vala	2013-02-07 22:40:26 +0000
@@ -26,6 +26,9 @@
 
         var menu_client = menu.get_client ();
         menu_client.add_type_handler_full ("x-canonical-switch", new_switch_cb);
+
+        /* Hide until ready */
+        set_visible (false);
     }
 
     private bool new_switch_cb (Dbusmenu.Menuitem newitem, Dbusmenu.Menuitem parent, Dbusmenu.Client client)
@@ -80,6 +83,7 @@
 
     private void server_properties_changed_cb ()
     {
+        set_visible (proxy.visible);
         Indicator.image_helper_update (image, proxy.icon_name);
         accessible_description = proxy.accessible_description;
     }
@@ -122,6 +126,7 @@
 [DBus (name = "com.canonical.indicator.bluetooth.service")]
 public interface BluetoothService : DBusProxy
 {
+    public abstract bool visible { owned get; }
     public abstract string icon_name { owned get; }
     public abstract string accessible_description { owned get; }
 }