summaryrefslogtreecommitdiff
path: root/daemon/gdm-slave.h
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2012-10-11 17:29:07 -0400
committerRay Strode <rstrode@redhat.com>2012-10-11 17:35:20 -0400
commit99c4f960c0689d310a799e87f6361fb25a8862f6 (patch)
treef4b5743f910823cd00940fdd5a8ab35be41d43e6 /daemon/gdm-slave.h
parent73de732f1c476188f7798aa125794e74589d8b02 (diff)
downloadgdm-99c4f960c0689d310a799e87f6361fb25a8862f6.tar.gz
slave: don't fail if user session already active when activating from unlock
After GDM successfully reauthenticates a user it runs gdm_slave_switch_to_user_session to jump to the user's VT and unlock it. Of course, if the user is reauthenticating from an unlock screen instead of a user switched login screen, then they'll already be on the right VT. gdm_slave_switch_to_user_session fails if the user is already switched to the session specified. This failing behavior is used at login time to decide start a user's session (versus switching to a user's already running session). This commit changes gdm_slave_switch_to_user_session to take an additional parameter to decide whether or not switching to an already active session should fail, or merely skip to the unlocking step. https://bugzilla.gnome.org/show_bug.cgi?id=685988
Diffstat (limited to 'daemon/gdm-slave.h')
-rw-r--r--daemon/gdm-slave.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/daemon/gdm-slave.h b/daemon/gdm-slave.h
index 98e25f50..0647618f 100644
--- a/daemon/gdm-slave.h
+++ b/daemon/gdm-slave.h
@@ -99,7 +99,8 @@ gboolean gdm_slave_add_user_authorization (GdmSlave *slave,
char **filename);
gboolean gdm_slave_switch_to_user_session (GdmSlave *slave,
- const char *username);
+ const char *username,
+ gboolean fail_if_already_switched);
gboolean gdm_slave_connect_to_x11_display (GdmSlave *slave);