]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Don't load both dmrc and accounts service
authorRobert Ancell <robert.ancell@canonical.com>
Tue, 29 Oct 2013 22:49:53 +0000 (15:49 -0700)
committerRobert Ancell <robert.ancell@canonical.com>
Tue, 29 Oct 2013 22:49:53 +0000 (15:49 -0700)
liblightdm-gobject/user.c

index dd4e388054af6793cbd436ac6fe3b1af1aa452af..d9ebde7ac7f3cda47046a46a97c90012fe8f0bc1 100644 (file)
@@ -1111,8 +1111,10 @@ load_user_values (LightDMUser *user)
         return;
     priv->loaded_values = TRUE;
 
-    load_dmrc (user);
-    load_accounts_user (user); // overrides dmrc values
+    if (priv->path)
+        load_accounts_user (user);
+    else
+        load_dmrc (user);
 }
 
 /**