[gdm/multi-stack: 14/25] Queue a greeter reset when the user clicks cancel
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm/multi-stack: 14/25] Queue a greeter reset when the user clicks cancel
- Date: Tue, 20 Jul 2010 04:47:26 +0000 (UTC)
commit a42691518a864011756d67df687db697c741f0a8
Author: Ray Strode <rstrode redhat com>
Date: Thu Feb 5 15:20:25 2009 -0500
Queue a greeter reset when the user clicks cancel
daemon/gdm-simple-slave.c | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
---
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index b6a4b9c..b06a3b8 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -958,6 +958,9 @@ on_greeter_start_conversation (GdmGreeterServer *greeter_server,
GdmSimpleSlave *slave)
{
g_debug ("GdmSimpleSlave: starting conversation with '%s' pam service'", service_name);
+ if (slave->priv->greeter_reset_id > 0) {
+ return;
+ }
gdm_session_start_conversation (GDM_SESSION (slave->priv->session),
service_name);
}
@@ -968,6 +971,9 @@ on_greeter_begin_verification (GdmGreeterServer *greeter_server,
GdmSimpleSlave *slave)
{
g_debug ("GdmSimpleSlave: begin verification");
+ if (slave->priv->greeter_reset_id > 0) {
+ return;
+ }
gdm_session_setup (GDM_SESSION (slave->priv->session),
service_name);
}
@@ -978,6 +984,9 @@ on_greeter_begin_auto_login (GdmGreeterServer *greeter_server,
GdmSimpleSlave *slave)
{
g_debug ("GdmSimpleSlave: begin auto login for user '%s'", username);
+ if (slave->priv->greeter_reset_id > 0) {
+ return;
+ }
gdm_session_setup_for_user (GDM_SESSION (slave->priv->session),
"gdm-autologin",
username);
@@ -990,6 +999,9 @@ on_greeter_begin_verification_for_user (GdmGreeterServer *greeter_server,
GdmSimpleSlave *slave)
{
g_debug ("GdmSimpleSlave: begin verification");
+ if (slave->priv->greeter_reset_id > 0) {
+ return;
+ }
gdm_session_setup_for_user (GDM_SESSION (slave->priv->session),
service_name,
username);
@@ -1001,6 +1013,9 @@ on_greeter_answer (GdmGreeterServer *greeter_server,
const char *text,
GdmSimpleSlave *slave)
{
+ if (slave->priv->greeter_reset_id > 0) {
+ return;
+ }
gdm_session_answer_query (GDM_SESSION (slave->priv->session), service_name, text);
}
@@ -1009,6 +1024,9 @@ on_greeter_session_selected (GdmGreeterServer *greeter_server,
const char *text,
GdmSimpleSlave *slave)
{
+ if (slave->priv->greeter_reset_id > 0) {
+ return;
+ }
gdm_session_select_session (GDM_SESSION (slave->priv->session), text);
}
@@ -1017,6 +1035,9 @@ on_greeter_language_selected (GdmGreeterServer *greeter_server,
const char *text,
GdmSimpleSlave *slave)
{
+ if (slave->priv->greeter_reset_id > 0) {
+ return;
+ }
gdm_session_select_language (GDM_SESSION (slave->priv->session), text);
}
@@ -1025,6 +1046,9 @@ on_greeter_layout_selected (GdmGreeterServer *greeter_server,
const char *text,
GdmSimpleSlave *slave)
{
+ if (slave->priv->greeter_reset_id > 0) {
+ return;
+ }
gdm_session_select_layout (GDM_SESSION (slave->priv->session), text);
}
@@ -1041,7 +1065,11 @@ on_greeter_cancel (GdmGreeterServer *greeter_server,
GdmSimpleSlave *slave)
{
g_debug ("GdmSimpleSlave: Greeter cancelled");
+ if (slave->priv->greeter_reset_id > 0) {
+ return;
+ }
reset_session (slave);
+ queue_greeter_reset (slave);
}
static void
@@ -1051,6 +1079,9 @@ on_greeter_connected (GdmGreeterServer *greeter_server,
gboolean display_is_local;
g_debug ("GdmSimpleSlave: Greeter connected");
+ if (slave->priv->greeter_reset_id > 0) {
+ return;
+ }
g_object_get (slave,
"display-is-local", &display_is_local,
@@ -1068,6 +1099,9 @@ on_start_session_when_ready (GdmGreeterServer *session,
GdmSimpleSlave *slave)
{
g_debug ("GdmSimpleSlave: Will start session when ready");
+ if (slave->priv->greeter_reset_id > 0) {
+ return;
+ }
slave->priv->start_session_when_ready = TRUE;
if (slave->priv->waiting_to_start_session) {
@@ -1081,6 +1115,9 @@ on_start_session_later (GdmGreeterServer *session,
GdmSimpleSlave *slave)
{
g_debug ("GdmSimpleSlave: Will start session when ready and told");
+ if (slave->priv->greeter_reset_id > 0) {
+ return;
+ }
slave->priv->start_session_when_ready = FALSE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]