summaryrefslogtreecommitdiff
path: root/daemon
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2009-03-23 17:08:08 +0000
committerRay Strode <halfline@src.gnome.org>2009-03-23 17:08:08 +0000
commitc3c89af407aecfd56cde95c21bb1dd08de8b88df (patch)
tree6d1842be37fcddbd21033adec0b8e27948212651 /daemon
parent511061eb54aa3162d8da9d2c19b4b3cf6d409067 (diff)
downloadgdm-c3c89af407aecfd56cde95c21bb1dd08de8b88df.tar.gz
Bug 573461 - Load user's settings through "other entry"
2009-03-23 Ray Strode <rstrode@redhat.com> Bug 573461 - Load user's settings through "other entry" * daemon/gdm-session-worker.c (gdm_session_worker_update_username): Don't try to load new user settings until after updating username state. This allows saved settings to load when choosing "Other" instead of the associated name from the chooser. Based on Patch by Mingxi Wu svn path=/trunk/; revision=6794
Diffstat (limited to 'daemon')
-rw-r--r--daemon/gdm-session-worker.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
index 6761736b..ea4b8bde 100644
--- a/daemon/gdm-session-worker.c
+++ b/daemon/gdm-session-worker.c
@@ -637,16 +637,6 @@ gdm_session_worker_update_username (GdmSessionWorker *worker)
gdm_session_auditor_set_username (worker->priv->auditor, worker->priv->username);
- /* We have a new username to try. If we haven't been able to
- * read user settings up until now, then give it a go now
- * (see the comment in do_setup for rationale on why it's useful
- * to keep trying to read settings)
- */
- if (username != NULL &&
- !gdm_session_settings_is_loaded (worker->priv->user_settings)) {
- attempt_to_load_user_settings (worker, username);
- }
-
if ((worker->priv->username == username) ||
((worker->priv->username != NULL) && (username != NULL) &&
(strcmp (worker->priv->username, username) == 0)))
@@ -661,6 +651,16 @@ gdm_session_worker_update_username (GdmSessionWorker *worker)
send_dbus_string_method (worker->priv->connection,
"UsernameChanged",
worker->priv->username);
+
+ /* We have a new username to try. If we haven't been able to
+ * read user settings up until now, then give it a go now
+ * (see the comment in do_setup for rationale on why it's useful
+ * to keep trying to read settings)
+ */
+ if (worker->priv->username != NULL &&
+ !gdm_session_settings_is_loaded (worker->priv->user_settings)) {
+ attempt_to_load_user_settings (worker, worker->priv->username);
+ }
}
out: