diff options
| author | Bastien Nocera <hadess@hadess.net> | 2020-12-09 15:22:47 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2020-12-10 21:07:43 +0100 |
| commit | ea85c5c6699044b1d98f885fe970eb2814010d07 (patch) | |
| tree | 19da43083c7e5c2c951c22eb384c482014e3039e | |
| parent | e536ef067205e0596664e3e1e76516a35270ed6d (diff) | |
| download | gnome-bluetooth-ea85c5c6699044b1d98f885fe970eb2814010d07.tar.gz | |
settings-widget: Simplify row_inserted_cb() by using g_auto
| -rw-r--r-- | lib/bluetooth-settings-widget.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/bluetooth-settings-widget.c b/lib/bluetooth-settings-widget.c index 6d224114..60f75b9d 100644 --- a/lib/bluetooth-settings-widget.c +++ b/lib/bluetooth-settings-widget.c @@ -1624,8 +1624,9 @@ row_inserted_cb (GtkTreeModel *tree_model, { BluetoothSettingsWidget *self = user_data; BluetoothSettingsWidgetPrivate *priv = BLUETOOTH_SETTINGS_WIDGET_GET_PRIVATE (user_data); - GDBusProxy *proxy; - char *name, *bdaddr; + g_autoptr(GDBusProxy) proxy = NULL; + g_autofree char *name = NULL; + g_autofree char *bdaddr = NULL; BluetoothType type; gboolean paired, trusted, connected, legacy_pairing; GtkWidget *row; @@ -1635,7 +1636,6 @@ row_inserted_cb (GtkTreeModel *tree_model, BLUETOOTH_COLUMN_NAME, &name, -1); g_debug ("Not adding device '%s'", name); - g_free (name); return; } @@ -1669,10 +1669,6 @@ row_inserted_cb (GtkTreeModel *tree_model, gtk_container_add (GTK_CONTAINER (priv->device_list), row); gtk_size_group_add_widget (priv->row_sizegroup, row); - g_object_unref (proxy); - g_free (name); - g_free (bdaddr); - gtk_stack_set_transition_type (GTK_STACK (priv->device_stack), GTK_STACK_TRANSITION_TYPE_SLIDE_DOWN); gtk_container_child_set (GTK_CONTAINER (WID ("vbox_bluetooth")), |