diff options
| author | Ray Strode <rstrode@redhat.com> | 2014-07-21 09:38:17 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2014-07-21 09:47:53 -0400 |
| commit | d41077021959ec7416a708972bb85a1e2ae7c0ff (patch) | |
| tree | 3d93ebbce88476d448ddf7adf0e46466d7e447db | |
| parent | 614bb626795926537e0d739c98566cbf9034ae14 (diff) | |
| download | accountsservice-d41077021959ec7416a708972bb85a1e2ae7c0ff.tar.gz | |
lib: clear the cancellable unconditionally in on_get_all_finished
This means we don't have to rely on the cancellable getting cleaned
up from the caller when failing (which might not happen depending on the
reason it finishes prematurely).
| -rw-r--r-- | src/libaccountsservice/act-user.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libaccountsservice/act-user.c b/src/libaccountsservice/act-user.c index fe7d8e9..7e358e2 100644 --- a/src/libaccountsservice/act-user.c +++ b/src/libaccountsservice/act-user.c @@ -1316,6 +1316,8 @@ on_get_all_finished (GObject *object, error = NULL; res = g_dbus_proxy_call_finish (proxy, result, &error); + g_clear_object (&user->get_all_call); + if (! res) { g_debug ("Error calling GetAll() when retrieving properties for %s: %s", user->object_path, error->message); @@ -1327,8 +1329,6 @@ on_get_all_finished (GObject *object, return; } - g_clear_object (&user->get_all_call); - g_variant_get (res, "(a{sv})", &iter); while (g_variant_iter_next (iter, "{sv}", &key, &value)) { collect_props (key, value, user); |