summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Vollmer <mvollmer@redhat.com>2013-06-11 15:31:13 +0300
committerMatthias Clasen <mclasen@redhat.com>2013-06-30 14:24:51 -0400
commit8fc6d65c79a484ef556bb8abad93599e12d93678 (patch)
tree66ca6d82b42d3d4dc6cdb3b3fc85736f3efdc436
parentbfcf510816d3574a887cd0ff606266e4140404e8 (diff)
downloadaccountsservice-8fc6d65c79a484ef556bb8abad93599e12d93678.tar.gz
Don't set "is-loaded" prematurely.
https://bugs.freedesktop.org/show_bug.cgi?id=65649
-rw-r--r--src/libaccountsservice/act-user-manager.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libaccountsservice/act-user-manager.c b/src/libaccountsservice/act-user-manager.c
index 613174b..8e2d349 100644
--- a/src/libaccountsservice/act-user-manager.c
+++ b/src/libaccountsservice/act-user-manager.c
@@ -2536,9 +2536,13 @@ load_seat_incrementally (ActUserManager *manager)
static gboolean
load_idle (ActUserManager *manager)
{
+ /* The order below is important: load_seat_incrementally might
+ set "is-loaded" immediately and we thus need to call
+ load_users before it.
+ */
+ load_users (manager);
manager->priv->seat.state = ACT_USER_MANAGER_SEAT_STATE_UNLOADED + 1;
load_seat_incrementally (manager);
- load_users (manager);
manager->priv->load_id = 0;
return FALSE;