diff options
author | Ray Strode <rstrode@redhat.com> | 2008-03-09 21:47:27 +0000 |
---|---|---|
committer | Ray Strode <halfline@src.gnome.org> | 2008-03-09 21:47:27 +0000 |
commit | 064e38373749987c0035398e5b9d726be75b72bb (patch) | |
tree | 3b4c9f75d92e2a5cce1c0ace595d7e4b070ed8ef /daemon/gdm-simple-slave.c | |
parent | 3259f2a3391c7f062c5311d3994c30e06412f2b3 (diff) | |
download | gdm-064e38373749987c0035398e5b9d726be75b72bb.tar.gz |
Rename "Timed Login" request on the slave to "Auto Login" since that's
2008-03-09 Ray Strode <rstrode@redhat.com>
* daemon/gdm-simple-slave.c (on_greeter_auto_login):
* daemon/gdm-greeter-server.[ch]:
(handle_begin_auto_login), (greeter_handle_child_message),
(gdm_greeter_server_class_init):
* gui/gdm-greeter-client.[ch]:
(gdm_greeter_client_call_begin_auto_login):
* gui/gdm-greeter-session.[ch]:
(on_begin_auto_login):
* gui/gdm-greeter-login-window.[ch]:
(timed_login_timer), (on_login_button_clicked_answer_query),
(on_user_chosen), (gdm_greeter_login_window_class_init):
Rename "Timed Login" request on the slave to "Auto Login"
since that's what it is. All the delay logic happens in
the greeter and the slave just logins in immediately after
getting the request
svn path=/trunk/; revision=5973
Diffstat (limited to 'daemon/gdm-simple-slave.c')
-rw-r--r-- | daemon/gdm-simple-slave.c | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c index 3c65b261..1cbf0230 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c @@ -611,29 +611,11 @@ on_greeter_begin_verification (GdmGreeterServer *greeter_server, } static void -on_greeter_begin_timed_login (GdmGreeterServer *greeter_server, - GdmSimpleSlave *slave) +on_greeter_begin_auto_login (GdmGreeterServer *greeter_server, + const char *username, + GdmSimpleSlave *slave) { - char *username; - gboolean enabled; - gboolean res; - - g_debug ("GdmSimpleSlave: begin timed login"); - - enabled = FALSE; - res = gdm_settings_client_get_boolean (GDM_KEY_TIMED_LOGIN_ENABLE, &enabled); - if (! enabled) { - g_warning ("GdmSimpleSlave: timed login requested but disabled in configuration"); - return; - } - - username = NULL; - res = gdm_settings_client_get_string (GDM_KEY_TIMED_LOGIN_USER, &username); - if (username == NULL) { - g_warning ("GdmSimpleSlave: timed login requested but username not specified in configuration"); - return; - } - + g_debug ("GdmSimpleSlave: begin auto login for user '%s'", username); gdm_session_setup_for_user (GDM_SESSION (slave->priv->session), "gdm-autologin", username); @@ -795,8 +777,8 @@ run_greeter (GdmSimpleSlave *slave) slave->priv->greeter_server = gdm_greeter_server_new (display_id); g_signal_connect (slave->priv->greeter_server, - "begin-timed-login", - G_CALLBACK (on_greeter_begin_timed_login), + "begin-auto-login", + G_CALLBACK (on_greeter_begin_auto_login), slave); g_signal_connect (slave->priv->greeter_server, "begin-verification", |