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

[Yu Ning]

Block power callback unless it's triggered by the user.

Block power callback unless it's triggered by the user.

[Sebastien Bacher (seb128)]

Thank you for your work, could you give some context/explain why you are doing that? Is that resolving an user visible issue?

review: Needs Information

[Yu Ning (yuningdodo)]

Oh sorry, forgot to mention that this patch is for bug #1248720.

[Sebastien Bacher (seb128)]

do you know if that's an issue impacting upstream as well and if it could be sent to GNOME for gnome-control-center?

[Mathieu Trudel-Lapierre (cyphermox)]

Looks fine to me. Avoiding to represent the bluetooth powered changes initiated by the app is logical. That said, I am not convinced it will indeed fix the issue completely, but the code changes seem correct.

Please address seb's concerns with upstreaming the code though.

review: Abstain

[Yu Ning (yuningdodo)]

Thanks for the review, let me install a gnome desktop and have a try. Will update later.

[Yu Ning (yuningdodo)]

I installed gnome desktop on ubuntu trusty, and can also reproduce the issue in gnome-control-center.

The package version is:
gnome-control-center 1:3.6.3-0ubuntu56.1

$ gnome-control-center --version
gnome-control-center 3.6.3

[Sebastien Bacher (seb128)]

@Yu, thanks, any chance you could try on something newer like vivid? 3.6 is really outdated and doesn't reflect current upstream state

[Yu Ning (yuningdodo)]

@Sebastien, more details are tested on bug #1248720.

[Sebastien Bacher (seb128)]

thanks, it's not the most elegant but it should work ;-)

review: Approve

[Lars Karlitski (larsu)]

Blocking signals is quite ugly. GtkSwitch differentiates between "state" and "active" for cases like this. I've fixed this in my bluez5 branch[1].

It'll work though. I'm fine with adding it for V and getting the proper fix next cycle. Thanks for working on this!

[1] http://bazaar.launchpad.net/~larsu/unity-control-center/bluez/revision/12812

review: Approve

=== 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-04-02 05:06:38 +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",