gdm r6794 - in trunk: . daemon

[halfline svn gnome org]

Author: halfline
Date: Mon Mar 23 17:08:08 2009
New Revision: 6794
URL: http://svn.gnome.org/viewvc/gdm?rev=6794&view=rev

Log:
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


Modified:
   trunk/ChangeLog
   trunk/daemon/gdm-session-worker.c

Modified: trunk/daemon/gdm-session-worker.c
==============================================================================
--- trunk/daemon/gdm-session-worker.c	(original)
+++ trunk/daemon/gdm-session-worker.c	Mon Mar 23 17:08:08 2009
@@ -637,16 +637,6 @@
 
                 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 @@
                 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: