gdm r5975 - in trunk: . gui/simple-greeter

[halfline svn gnome org]

Author: halfline
Date: Sun Mar  9 21:51:31 2008
New Revision: 5975
URL: http://svn.gnome.org/viewvc/gdm?rev=5975&view=rev

Log:
2008-03-09  Ray Strode  <rstrode redhat com>

	* gui/simple-greeter/gdm-greeter-login-window.c
	(gdm_greeter_login_window_request_timed_login),
	(do_cancel), (on_user_chosen):
	Keep timed_login_enabled in sync with state of
	automatic login user selection


Modified:
   trunk/ChangeLog
   trunk/gui/simple-greeter/gdm-greeter-login-window.c

Modified: trunk/gui/simple-greeter/gdm-greeter-login-window.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-login-window.c	(original)
+++ trunk/gui/simple-greeter/gdm-greeter-login-window.c	Sun Mar  9 21:51:31 2008
@@ -516,6 +516,7 @@
 {
         gdm_chooser_widget_set_item_timer (GDM_CHOOSER_WIDGET (login_window->priv->user_chooser),
                                            GDM_USER_CHOOSER_USER_AUTO, 0);
+        login_window->priv->timed_login_enabled = FALSE;
         gdm_user_chooser_widget_set_chosen_user_name (GDM_USER_CHOOSER_WIDGET (login_window->priv->user_chooser), NULL);
 
         switch_mode (login_window, MODE_SELECTION);
@@ -628,7 +629,6 @@
 
         g_debug ("GdmGreeterLoginWindow: requested automatic login for user '%s' in %d seconds", username, delay);
 
-        login_window->priv->timed_login_enabled = TRUE;
         login_window->priv->timed_login_username = g_strdup (username);
         login_window->priv->timed_login_delay = delay;
 
@@ -1038,6 +1038,8 @@
         } else if (strcmp (user_name, GDM_USER_CHOOSER_USER_AUTO) == 0) {
                 g_signal_emit (login_window, signals[BEGIN_AUTO_LOGIN], 0,
                                login_window->priv->timed_login_username);
+
+                login_window->priv->timed_login_enabled = TRUE;
                 restart_timed_login_timeout (login_window);
 
                 /* just wait for the user to select language and stuff */