Commit d4107702 authored by Ray Strode's avatar Ray Strode

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).
parent 614bb626
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment