[gnome-bluetooth/wip/hadess/function-removal: 4/5] settings-widget: Use g_auto* for gtk_tree_model_get() out args
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-bluetooth/wip/hadess/function-removal: 4/5] settings-widget: Use g_auto* for gtk_tree_model_get() out args
- Date: Thu, 18 Nov 2021 17:02:34 +0000 (UTC)
commit 381d8c953a3c2ca62d623044b63bc246a2b4b2b9
Author: Bastien Nocera <hadess hadess net>
Date: Thu Nov 18 17:37:07 2021 +0100
settings-widget: Use g_auto* for gtk_tree_model_get() out args
lib/bluetooth-settings-widget.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/lib/bluetooth-settings-widget.c b/lib/bluetooth-settings-widget.c
index ff350802..7e9f5ff0 100644
--- a/lib/bluetooth-settings-widget.c
+++ b/lib/bluetooth-settings-widget.c
@@ -1095,7 +1095,9 @@ update_properties (BluetoothSettingsWidget *self,
gboolean ret;
BluetoothType type;
gboolean connected, paired;
- char **uuids, *bdaddr, *alias, *icon;
+ g_auto(GStrv) uuids = NULL;
+ char *bdaddr, *alias;
+ g_autofree char *icon = NULL;
guint i;
model = bluetooth_client_get_model (self->client);
@@ -1214,9 +1216,6 @@ update_properties (BluetoothSettingsWidget *self,
g_free (self->selected_bdaddr);
self->selected_bdaddr = bdaddr;
-
- g_free (icon);
- g_strfreev (uuids);
}
static void
@@ -1675,18 +1674,17 @@ row_changed_cb (GtkTreeModel *tree_model,
gpointer user_data)
{
BluetoothSettingsWidget *self = user_data;
- GDBusProxy *proxy;
+ g_autoptr(GDBusProxy) proxy = NULL;
GtkWidget *child;
const char *object_path;
if (is_interesting_device (tree_model, iter) == FALSE) {
- char *name;
+ g_autofree char *name = NULL;
gtk_tree_model_get (tree_model, iter,
BLUETOOTH_COLUMN_NAME, &name,
-1);
g_debug ("Not interested in device '%s'", name);
- g_free (name);
return;
}
@@ -1741,7 +1739,6 @@ row_changed_cb (GtkTreeModel *tree_model,
break;
}
}
- g_object_unref (proxy);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]