applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bluetooth: Use g_auto for variables

Browse source
This commit is contained in:
Robert Ancell 2018-11-09 11:38:17 +13:00 • committed by Bastien Nocera
parent 14f20f3784
commit 631e83ec0e
1 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
panels/bluetooth/cc-bluetooth-panel.c
View file

@ -170,23 +170,22 @@ cc_bluetooth_panel_update_power (CcBluetoothPanel *self)
static void static void
airplane_mode_changed (CcBluetoothPanel *self) airplane_mode_changed (CcBluetoothPanel *self)
{ {
GVariant *v; g_autoptr(GVariant) airplane_mode = NULL;
g_autoptr(GVariant) bluetooth_airplane_mode = NULL;
g_autoptr(GVariant) bluetooth_hardware_airplane_mode = NULL;
g_autoptr(GVariant) bluetooth_has_airplane_mode = NULL;
v = g_dbus_proxy_get_cached_property (self->rfkill, "AirplaneMode"); airplane_mode = g_dbus_proxy_get_cached_property (self->rfkill, "AirplaneMode");
self->airplane_mode = g_variant_get_boolean (v); self->airplane_mode = g_variant_get_boolean (airplane_mode);
g_variant_unref (v);
v = g_dbus_proxy_get_cached_property (self->rfkill, "BluetoothAirplaneMode"); bluetooth_airplane_mode = g_dbus_proxy_get_cached_property (self->rfkill, "BluetoothAirplaneMode");
self->bt_airplane_mode = g_variant_get_boolean (v); self->bt_airplane_mode = g_variant_get_boolean (bluetooth_airplane_mode);
g_variant_unref (v);
v = g_dbus_proxy_get_cached_property (self->rfkill, "BluetoothHardwareAirplaneMode"); bluetooth_hardware_airplane_mode = g_dbus_proxy_get_cached_property (self->rfkill, "BluetoothHardwareAirplaneMode");
self->hardware_airplane_mode = g_variant_get_boolean (v); self->hardware_airplane_mode = g_variant_get_boolean (bluetooth_hardware_airplane_mode);
g_variant_unref (v);
v = g_dbus_proxy_get_cached_property (self->rfkill, "BluetoothHasAirplaneMode"); bluetooth_has_airplane_mode = g_dbus_proxy_get_cached_property (self->rfkill, "BluetoothHasAirplaneMode");
self->has_airplane_mode = g_variant_get_boolean (v); self->has_airplane_mode = g_variant_get_boolean (bluetooth_has_airplane_mode);
g_variant_unref (v);
cc_bluetooth_panel_update_power (self); cc_bluetooth_panel_update_power (self);
} }
@ -249,13 +248,11 @@ panel_changed (CcBluetoothPanel *self,
const char *panel) const char *panel)
{ {
CcShell *shell; CcShell *shell;
GError *error = NULL; g_autoptr(GError) error = NULL;
shell = cc_panel_get_shell (CC_PANEL (self)); shell = cc_panel_get_shell (CC_PANEL (self));
if (cc_shell_set_active_panel_from_id (shell, panel, NULL, &error) == FALSE) { if (cc_shell_set_active_panel_from_id (shell, panel, NULL, &error) == FALSE)
g_warning ("Failed to activate '%s' panel: %s", panel, error->message); g_warning ("Failed to activate '%s' panel: %s", panel, error->message);
g_error_free (error);
}
} }
static void static void