Merge lp:~binli/ubuntu/trusty/unity-control-center/unity-control-center.lp1248720-block-power-callback-unless-its-triggered-by-user into lp:unity-control-center/14.04

[Bin Li]

Cheery pick from lp:unity-control-center.

[Bin Li (binli)]

revno: 12815 [merge]
author: Yu Ning <email address hidden>
committer: CI Train Bot <email address hidden>
branch nick: unity-control-center
timestamp: Fri 2015-04-10 14:09:34 +0000
message:
  Block power callback unless it's triggered by the user. Fixes: #1248720
  Approved by: Sebastien Bacher, Lars Uebernickel

[Sebastien Bacher (seb128)]

thanks

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-27 16:23:21 +0000
+++ debian/changelog	2015-09-14 05:56:00 +0000
@@ -1,3 +1,10 @@
+unity-control-center (14.04.3+14.04.20140922-0ubuntu1.2) UNRELEASED; urgency=medium
+
+  [ Ning Yu ]
+  * Block power callback unless it's triggered by the user.(LP: #1248720)
+
+ -- Bin Li <[e-mail]>  Mon, 14 Sep 2015 12:13:16 +0800
+
 unity-control-center (14.04.3+14.04.20140922-0ubuntu1.1) trusty; urgency=medium
 
   [ Jian-Ding Chen (timchen119) ]

=== modified file 'panels/bluetooth/cc-bluetooth-panel.c'
--- panels/bluetooth/cc-bluetooth-panel.c	2014-02-20 22:57:03 +0000
+++ panels/bluetooth/cc-bluetooth-panel.c	2015-09-14 05:56:00 +0000
@@ -58,6 +58,8 @@
 	GHashTable          *connecting_devices;
 	GCancellable        *cancellable;
 	GSettings           *indicator_settings;
+
+	gulong               power_callback_handler_id;
 };
 
 static void cc_bluetooth_panel_finalize (GObject *object);
@@ -420,8 +422,12 @@
 
 	state = gtk_switch_get_active (GTK_SWITCH (WID ("switch_bluetooth")));
 	g_debug ("Power switched to %s", state ? "on" : "off");
+	g_signal_handler_block (G_OBJECT (WID ("switch_bluetooth")),
+				self->priv->power_callback_handler_id);
 	bluetooth_killswitch_set_state (self->priv->killswitch,
 					state ? BLUETOOTH_KILLSWITCH_STATE_UNBLOCKED : BLUETOOTH_KILLSWITCH_STATE_SOFT_BLOCKED);
+	g_signal_handler_unblock (G_OBJECT (WID ("switch_bluetooth")),
+				  self->priv->power_callback_handler_id);
 }
 
 static void
@@ -776,7 +782,11 @@
 			       CcBluetoothPanel *self)
 {
 	g_debug ("Default adapter power changed");
+	g_signal_handler_block (G_OBJECT (WID ("switch_bluetooth")),
+				self->priv->power_callback_handler_id);
 	cc_bluetooth_panel_update_powered_state (self);
+	g_signal_handler_unblock (G_OBJECT (WID ("switch_bluetooth")),
+				  self->priv->power_callback_handler_id);
 }
 
 static void
@@ -785,9 +795,13 @@
 			 CcBluetoothPanel *self)
 {
 	g_debug ("Default adapter changed");
+	g_signal_handler_block (G_OBJECT (WID ("switch_bluetooth")),
+				self->priv->power_callback_handler_id);
 	cc_bluetooth_panel_update_state (self);
 	cc_bluetooth_panel_update_power (self);
 	cc_bluetooth_panel_update_powered_state (self);
+	g_signal_handler_unblock (G_OBJECT (WID ("switch_bluetooth")),
+				  self->priv->power_callback_handler_id);
 }
 
 static void
@@ -796,8 +810,12 @@
 		    CcBluetoothPanel         *self)
 {
 	g_debug ("Killswitch changed to state '%s' (%d)", bluetooth_killswitch_state_to_string (state) , state);
+	g_signal_handler_block (G_OBJECT (WID ("switch_bluetooth")),
+				self->priv->power_callback_handler_id);
 	cc_bluetooth_panel_update_state (self);
 	cc_bluetooth_panel_update_power (self);
+	g_signal_handler_unblock (G_OBJECT (WID ("switch_bluetooth")),
+				  self->priv->power_callback_handler_id);
 }
 
 static void
@@ -904,6 +922,7 @@
 			  G_CALLBACK (switch_connected_active_changed), self);
 
 	/* Set the initial state of power */
+	self->priv->power_callback_handler_id =
 	g_signal_connect (G_OBJECT (WID ("switch_bluetooth")), "notify::active",
 			  G_CALLBACK (power_callback), self);
 	g_signal_connect (G_OBJECT (self->priv->killswitch), "state-changed",