[gnome-initial-setup/wip/pwithnall/misc-fixes: 65/70] account: Use g_autoptr() through more of UmRealmManager
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup/wip/pwithnall/misc-fixes: 65/70] account: Use g_autoptr() through more of UmRealmManager
- Date: Fri, 11 Sep 2020 13:29:15 +0000 (UTC)
commit 7bacaa9ceb31e25d048bb0470a28a6238e8c520c
Author: Philip Withnall <withnall endlessm com>
Date: Fri Sep 11 12:13:00 2020 +0100
account: Use g_autoptr() through more of UmRealmManager
This should clarify some more of the object ownership transfers through
the initialisation process.
This introduces no functional changes.
Signed-off-by: Philip Withnall <withnall endlessm com>
.../pages/account/um-realm-manager.c | 24 +++++++++++-----------
1 file changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/gnome-initial-setup/pages/account/um-realm-manager.c
b/gnome-initial-setup/pages/account/um-realm-manager.c
index ba8444e8..11945fc8 100644
--- a/gnome-initial-setup/pages/account/um-realm-manager.c
+++ b/gnome-initial-setup/pages/account/um-realm-manager.c
@@ -146,16 +146,16 @@ on_provider_new (GObject *source,
{
g_autoptr(GTask) task = G_TASK (user_data);
UmRealmManager *manager = g_task_get_task_data (task);
- GError *error = NULL;
- UmRealmProvider *provider;
+ g_autoptr(GError) local_error = NULL;
+ g_autoptr(UmRealmProvider) provider = NULL;
- provider = um_realm_provider_proxy_new_finish (result, &error);
- if (error != NULL) {
- g_task_return_error (task, error);
+ provider = um_realm_provider_proxy_new_finish (result, &local_error);
+ if (local_error != NULL) {
+ g_task_return_error (task, g_steal_pointer (&local_error));
return;
}
- manager->provider = provider;
+ manager->provider = g_steal_pointer (&provider);
g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (manager->provider), -1);
g_debug ("Created realm manager");
g_task_return_pointer (task, g_object_ref (manager), g_object_unref);
@@ -168,17 +168,17 @@ on_manager_new (GObject *source,
{
g_autoptr(GTask) task = G_TASK (user_data);
GDBusConnection *connection;
- GError *error = NULL;
- GObject *object;
+ g_autoptr(GError) local_error = NULL;
+ g_autoptr(GObject) object = NULL;
- object = g_async_initable_new_finish (G_ASYNC_INITABLE (source), result, &error);
- if (error != NULL) {
- g_task_return_error (task, error);
+ object = g_async_initable_new_finish (G_ASYNC_INITABLE (source), result, &local_error);
+ if (local_error != NULL) {
+ g_task_return_error (task, g_steal_pointer (&local_error));
return;
}
- g_task_set_task_data (task, object, g_object_unref);
connection = g_dbus_object_manager_client_get_connection (G_DBUS_OBJECT_MANAGER_CLIENT (object));
+ g_task_set_task_data (task, g_steal_pointer (&object), g_object_unref);
g_debug ("Connected to realmd");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]