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

[mccann svn gnome org]

Author: mccann
Date: Thu Feb 21 05:05:17 2008
New Revision: 5834
URL: http://svn.gnome.org/viewvc/gdm?rev=5834&view=rev

Log:
2008-02-21  William Jon McCann  <jmccann redhat com>

	* gui/simple-greeter/gdm-greeter-login-window.c:
	(remove_timed_login_timeout), (restart_timed_login_timeout),
	(switch_mode), (on_user_chosen):
	Pause timed login until selected user verification
	times out or is cancelled.



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	Thu Feb 21 05:05:17 2008
@@ -205,6 +205,7 @@
 remove_timed_login_timeout (GdmGreeterLoginWindow *login_window)
 {
         if (login_window->priv->timed_login_timeout_id > 0) {
+                g_debug ("GdmGreeterLoginWindow: removing timed login timer");
                 g_source_remove (login_window->priv->timed_login_timeout_id);
                 login_window->priv->timed_login_timeout_id = 0;
         }
@@ -229,6 +230,8 @@
         remove_timed_login_timeout (login_window);
 
         if (login_window->priv->timed_login_enabled) {
+                g_debug ("GdmGreeterLoginWindow: adding timed login timer");
+
                 login_window->priv->timed_login_timeout_id = g_timeout_add_seconds (login_window->priv->timed_login_delay,
                                                                                     (GSourceFunc)timed_login_timer,
                                                                                     login_window);
@@ -348,12 +351,12 @@
         /* FIXME: do animation */
         default_name = NULL;
 
-        restart_timed_login_timeout (login_window);
-
         show_restart_shutdown = get_show_restart_buttons (login_window);
 
         switch (number) {
         case MODE_SELECTION:
+                restart_timed_login_timeout (login_window);
+
                 set_log_in_button_mode (login_window, LOGIN_BUTTON_HIDDEN);
 
                 show_widget (login_window, "cancel-button", FALSE);
@@ -939,6 +942,9 @@
                        0, user_name);
 
         if (strcmp (user_name, GDM_USER_CHOOSER_USER_OTHER) == 0) {
+                /* stop the timed login until the verification times
+                   out or is cancelled */
+                remove_timed_login_timeout (login_window);
                 g_signal_emit (login_window, signals[BEGIN_VERIFICATION], 0);
         } else if (strcmp (user_name, GDM_USER_CHOOSER_USER_GUEST) == 0) {
                 /* FIXME: handle guest account stuff */
@@ -947,6 +953,9 @@
                 set_log_in_button_mode (login_window, LOGIN_BUTTON_TIMED_LOGIN);
                 set_message (login_window, _("Select language and click Log In"));
         } else {
+                /* stop the timed login until the verification times
+                   out or is cancelled */
+                remove_timed_login_timeout (login_window);
                 g_signal_emit (login_window, signals[BEGIN_VERIFICATION_FOR_USER], 0, user_name);
         }