Merge lp:~seb128/unity-control-center/bluetooth-hide-indicator into lp:unity-control-center

[Sebastien Bacher]

bluetooth: let hide the bluetooth indicator, thanks Charles Kerr

bluetooth: let hide the bluetooth indicator, thanks Charles Kerr

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:12721
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/37/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-amd64-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-armhf-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-i386-ci/38

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/37/rebuild

review: Approve (continuous-integration)

[Iain Lane (laney)]

Good

review: Approve

=== modified file 'panels/bluetooth/bluetooth.ui'
--- panels/bluetooth/bluetooth.ui	2014-02-19 23:36:18 +0000
+++ panels/bluetooth/bluetooth.ui	2014-02-20 23:00:28 +0000
@@ -671,6 +671,26 @@
           </packing>
         </child>
         <child>
+          <object class="GtkCheckButton" id="menubar_visibility_toggle">
+            <property name="label" translatable="yes">_Show Bluetooth status in the menu bar</property>
+            <property name="use_action_appearance">False</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="margin_top">6</property>
+            <property name="use_action_appearance">False</property>
+            <property name="use_underline">True</property>
+            <property name="xalign">0</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
+            <property name="width">2</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
           <object class="GtkBox" id="box_vis">
             <property name="visible">True</property>
             <property name="can_focus">False</property>

=== modified file 'panels/bluetooth/cc-bluetooth-panel.c'
--- panels/bluetooth/cc-bluetooth-panel.c	2014-02-19 23:36:18 +0000
+++ panels/bluetooth/cc-bluetooth-panel.c	2014-02-20 23:00:28 +0000
@@ -57,6 +57,7 @@
 	gboolean             debug;
 	GHashTable          *connecting_devices;
 	GCancellable        *cancellable;
+	GSettings           *indicator_settings;
 };
 
 static void cc_bluetooth_panel_finalize (GObject *object);
@@ -108,6 +109,7 @@
 	g_clear_object (&self->priv->builder);
 	g_clear_object (&self->priv->killswitch);
 	g_clear_object (&self->priv->client);
+	g_clear_object (&self->priv->indicator_settings);
 
 	g_clear_pointer (&self->priv->connecting_devices, g_hash_table_destroy);
 	g_clear_pointer (&self->priv->selected_bdaddr, g_free);
@@ -908,6 +910,12 @@
 			  G_CALLBACK (killswitch_changed), self);
 	cc_bluetooth_panel_update_power (self);
 
+	/* Set up the menubar visibility toggle */
+	self->priv->indicator_settings = g_settings_new ("com.canonical.indicator.bluetooth");
+	g_settings_bind (self->priv->indicator_settings, "visible",
+	                 WID("menubar_visibility_toggle"), "active",
+	                 G_SETTINGS_BIND_DEFAULT);
+
 	gtk_widget_show_all (GTK_WIDGET (self));
 }