summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2011-05-10 14:36:02 -0400
committerRay Strode <rstrode@redhat.com>2011-05-18 23:39:12 -0400
commiteb4e639003aeef5cf17a153ee485c14dfa8431c9 (patch)
treebdd8c6572b77f909a866f04e6931d17f4dfc0d9f /src
parenta86a32fc5680612deeba9a6c56a8be2d00000a63 (diff)
lib: set is-loaded in failure path
We want to make sure that we always set is-loaded when things fail, so that we don't block indefinitely.
Diffstat (limited to 'src')
-rw-r--r--src/libaccountsservice/act-user-manager.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libaccountsservice/act-user-manager.c b/src/libaccountsservice/act-user-manager.c
index a4eb170..72a329e 100644
--- a/src/libaccountsservice/act-user-manager.c
+++ b/src/libaccountsservice/act-user-manager.c
@@ -572,10 +572,9 @@ on_get_seat_id_finished (DBusGProxy *proxy,
g_debug ("Failed to identify the seat of the "
"current session");
}
- unload_seat (manager);
- g_debug ("ActUserManager: GetSeatId call failed, so trying to set loaded property");
- maybe_set_is_loaded (manager);
+ g_debug ("ActUserManager: GetSeatId call failed, so unloading seat");
+ unload_seat (manager);
return;
}
@@ -924,8 +923,6 @@ on_get_current_session_finished (DBusGProxy *proxy,
g_debug ("Failed to identify the current session");
}
unload_seat (manager);
- g_debug ("ActUserManager: no current session, so trying to set loaded property");
- maybe_set_is_loaded (manager);
return;
}
@@ -1549,6 +1546,9 @@ unload_seat (ActUserManager *manager)
g_free (manager->priv->seat.session_id);
manager->priv->seat.session_id = NULL;
+
+ g_debug ("ActUserManager: seat unloaded, so trying to set loaded property");
+ maybe_set_is_loaded (manager);
}
static void