diff options
| author | Ray Strode <rstrode@redhat.com> | 2014-07-21 10:40:58 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2014-07-21 10:40:58 -0400 |
| commit | 48601848287008ba0544ff5fa7214df5fad60747 (patch) | |
| tree | 2f56b6193b57938e44aaf2f8e24a226f9ed409c8 | |
| parent | d41077021959ec7416a708972bb85a1e2ae7c0ff (diff) | |
| download | accountsservice-48601848287008ba0544ff5fa7214df5fad60747.tar.gz | |
lib: rename get_all_call to get_all_cancellable
It's a little strange to call a cancellable object a call.
| -rw-r--r-- | src/libaccountsservice/act-user.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/libaccountsservice/act-user.c b/src/libaccountsservice/act-user.c index 7e358e2..456261b 100644 --- a/src/libaccountsservice/act-user.c +++ b/src/libaccountsservice/act-user.c @@ -109,7 +109,7 @@ struct _ActUser { GDBusConnection *connection; AccountsUser *accounts_proxy; GDBusProxy *object_proxy; - GCancellable *get_all_call; + GCancellable *get_all_cancellable; char *object_path; uid_t uid; @@ -592,8 +592,8 @@ act_user_finalize (GObject *object) g_object_unref (user->object_proxy); } - if (user->get_all_call != NULL) { - g_object_unref (user->get_all_call); + if (user->get_all_cancellable != NULL) { + g_object_unref (user->get_all_cancellable); } if (user->connection != NULL) { @@ -1316,7 +1316,7 @@ on_get_all_finished (GObject *object, error = NULL; res = g_dbus_proxy_call_finish (proxy, result, &error); - g_clear_object (&user->get_all_call); + g_clear_object (&user->get_all_cancellable); if (! res) { g_debug ("Error calling GetAll() when retrieving properties for %s: %s", @@ -1350,18 +1350,18 @@ update_info (ActUser *user) { g_assert (G_IS_DBUS_PROXY (user->object_proxy)); - if (user->get_all_call != NULL) { - g_cancellable_cancel (user->get_all_call); - g_clear_object (&user->get_all_call); + if (user->get_all_cancellable != NULL) { + g_cancellable_cancel (user->get_all_cancellable); + g_clear_object (&user->get_all_cancellable); } - user->get_all_call = g_cancellable_new (); + user->get_all_cancellable = g_cancellable_new (); g_dbus_proxy_call (user->object_proxy, "GetAll", g_variant_new ("(s)", ACCOUNTS_USER_INTERFACE), G_DBUS_CALL_FLAGS_NONE, -1, - user->get_all_call, + user->get_all_cancellable, on_get_all_finished, user); } |