Fix broken and obsolete greeter quit signal

13 files changed, 15 insertions, 51 deletions

diff --git a/src/display.c b/src/display.c
index d594aeef..23e2d332 100644
--- a/src/display.c
+++ b/src/display.c
@@ -85,9 +85,6 @@ struct DisplayPrivate
     /* Communication link to greeter */
     Greeter *greeter;
   
-    /* Timeout for greeter to respond to quit request */
-    guint greeter_quit_timeout;
-
     /* Current PAM session */
     PAMSession *pam_session;
 
@@ -106,9 +103,6 @@ struct DisplayPrivate
 
 G_DEFINE_TYPE (Display, display, G_TYPE_OBJECT);
 
-/* Length of time in milliseconds to wait for a greeter to quit */
-#define GREETER_QUIT_TIMEOUT 1000
-
 static gboolean start_greeter_session (Display *display);
 static gboolean start_user_session (Display *display, PAMSession *pam_session, const gchar *name);
 
@@ -399,10 +393,6 @@ session_stopped_cb (Session *session, Display *display)
     else
         g_debug ("User session quit");
 
-    if (display->priv->greeter_quit_timeout)
-        g_source_remove (display->priv->greeter_quit_timeout);
-    display->priv->greeter_quit_timeout = 0;
-
     /* Stop listening to events from the greeter */
     if (display->priv->greeter)
         g_signal_handlers_disconnect_matched (display->priv->greeter, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, display);
@@ -584,18 +574,6 @@ autologin_authentication_result_cb (PAMSession *session, int result, Display *di
     g_object_unref (session);
 }
 
-static gboolean
-quit_timeout_cb (gpointer data)
-{
-    Display *display = data;
-
-    g_debug ("Greeter did not quit, sending kill signal");
-    session_stop (display->priv->session);
-
-    display->priv->greeter_quit_timeout = 0;
-    return TRUE;
-}
-
 static PAMSession *
 greeter_start_authentication_cb (Greeter *greeter, const gchar *username, Display *display)
 {
@@ -637,11 +615,9 @@ greeter_start_session_cb (Greeter *greeter, const gchar *session, gboolean is_gu
         username = pam_session_get_username (pam_session);
     }
 
-    /* Stop the greeter, and start the session when it has quit */
-    greeter_quit (display->priv->greeter);
-    if (display->priv->greeter_quit_timeout)
-        g_source_remove (display->priv->greeter_quit_timeout);
-    display->priv->greeter_quit_timeout = g_timeout_add (GREETER_QUIT_TIMEOUT, quit_timeout_cb, display);
+    /* Stop the greeter */
+    g_debug ("Stopping greeter");
+    session_stop (display->priv->session);  
 
     return TRUE;
 }
@@ -966,8 +942,6 @@ display_finalize (GObject *object)
     g_object_unref (self->priv->display_server);
     g_free (self->priv->greeter_user);
     g_free (self->priv->greeter_session);
-    if (self->priv->greeter_quit_timeout)
-        g_source_remove (self->priv->greeter_quit_timeout);
     if (self->priv->greeter)
         g_object_unref (self->priv->greeter);
     g_free (self->priv->xsessions_dir);
diff --git a/tests/scripts/login-guest-fail-setup-script.script b/tests/scripts/login-guest-fail-setup-script.script
index 8a08c0d8..53b80b99 100644
--- a/tests/scripts/login-guest-fail-setup-script.script
+++ b/tests/scripts/login-guest-fail-setup-script.script
@@ -18,7 +18,7 @@ GREETER CONNECTED-TO-DAEMON
 # Login as guest
 GREETER AUTHENTICATE-GUEST
 GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
-GREETER QUIT
+GREETER TERMINATE SIGNAL=15
 
 # X server resets
 XSERVER :50 DISCONNECT-CLIENTS
diff --git a/tests/scripts/login-guest.script b/tests/scripts/login-guest.script
index 56ebe033..2622cbd9 100644
--- a/tests/scripts/login-guest.script
+++ b/tests/scripts/login-guest.script
@@ -18,7 +18,7 @@ GREETER CONNECTED-TO-DAEMON
 # Login as guest
 GREETER AUTHENTICATE-GUEST
 GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
-GREETER QUIT
+GREETER TERMINATE SIGNAL=15
 
 # X server resets
 XSERVER :50 DISCONNECT-CLIENTS
diff --git a/tests/scripts/login-logout.script b/tests/scripts/login-logout.script
index 9b0e4da2..92edaa27 100644
--- a/tests/scripts/login-logout.script
+++ b/tests/scripts/login-logout.script
@@ -20,7 +20,7 @@ GREETER AUTHENTICATE USERNAME=alice
 GREETER SHOW-PROMPT TEXT="Password:"
 GREETER RESPOND TEXT="password"
 GREETER AUTHENTICATION-COMPLETE USERNAME=alice AUTHENTICATED=TRUE
-GREETER QUIT
+GREETER TERMINATE SIGNAL=15
 
 # X server resets
 XSERVER :50 DISCONNECT-CLIENTS
diff --git a/tests/scripts/login-manual.script b/tests/scripts/login-manual.script
index ea61c6fb..846435b8 100644
--- a/tests/scripts/login-manual.script
+++ b/tests/scripts/login-manual.script
@@ -22,7 +22,7 @@ GREETER RESPOND TEXT="alice"
 GREETER SHOW-PROMPT TEXT="Password:"
 GREETER RESPOND TEXT="password"
 GREETER AUTHENTICATION-COMPLETE USERNAME=alice AUTHENTICATED=TRUE
-GREETER QUIT
+GREETER TERMINATE SIGNAL=15
 
 # X server resets
 XSERVER :50 DISCONNECT-CLIENTS
diff --git a/tests/scripts/login-no-password.script b/tests/scripts/login-no-password.script
index ba8f268e..c7db8d2d 100644
--- a/tests/scripts/login-no-password.script
+++ b/tests/scripts/login-no-password.script
@@ -18,7 +18,7 @@ GREETER CONNECTED-TO-DAEMON
 # Login as bob (no password required)
 GREETER AUTHENTICATE USERNAME=bob
 GREETER AUTHENTICATION-COMPLETE USERNAME=bob AUTHENTICATED=TRUE
-GREETER QUIT
+GREETER TERMINATE SIGNAL=15
 
 # X server resets
 XSERVER :50 DISCONNECT-CLIENTS
diff --git a/tests/scripts/login-session-crash.script b/tests/scripts/login-session-crash.script
index b1b2300b..1198c38c 100644
--- a/tests/scripts/login-session-crash.script
+++ b/tests/scripts/login-session-crash.script
@@ -20,7 +20,7 @@ GREETER AUTHENTICATE USERNAME=alice
 GREETER SHOW-PROMPT TEXT="Password:"
 GREETER RESPOND TEXT="password"
 GREETER AUTHENTICATION-COMPLETE USERNAME=alice AUTHENTICATED=TRUE
-GREETER QUIT
+GREETER TERMINATE SIGNAL=15
 
 # X server resets
 XSERVER :50 DISCONNECT-CLIENTS
diff --git a/tests/scripts/login-xserver-crash.script b/tests/scripts/login-xserver-crash.script
index e3a405cc..a1dc54ae 100644
--- a/tests/scripts/login-xserver-crash.script
+++ b/tests/scripts/login-xserver-crash.script
@@ -20,7 +20,7 @@ GREETER AUTHENTICATE USERNAME=alice
 GREETER SHOW-PROMPT TEXT="Password:"
 GREETER RESPOND TEXT="password"
 GREETER AUTHENTICATION-COMPLETE USERNAME=alice AUTHENTICATED=TRUE
-GREETER QUIT
+GREETER TERMINATE SIGNAL=15
 
 # X server resets
 XSERVER :50 DISCONNECT-CLIENTS
diff --git a/tests/scripts/login.script b/tests/scripts/login.script
index 98fe7d45..ac8ea91b 100644
--- a/tests/scripts/login.script
+++ b/tests/scripts/login.script
@@ -20,7 +20,7 @@ GREETER AUTHENTICATE USERNAME=alice
 GREETER SHOW-PROMPT TEXT="Password:"
 GREETER RESPOND TEXT="password"
 GREETER AUTHENTICATION-COMPLETE USERNAME=alice AUTHENTICATED=TRUE
-GREETER QUIT
+GREETER TERMINATE SIGNAL=15
 
 # X server resets
 XSERVER :50 DISCONNECT-CLIENTS
diff --git a/tests/scripts/switch-to-greeter.script b/tests/scripts/switch-to-greeter.script
index f38e1e50..79b8ec80 100644
--- a/tests/scripts/switch-to-greeter.script
+++ b/tests/scripts/switch-to-greeter.script
@@ -20,7 +20,7 @@ GREETER AUTHENTICATE USERNAME=alice
 GREETER SHOW-PROMPT TEXT="Password:"
 GREETER RESPOND TEXT="password"
 GREETER AUTHENTICATION-COMPLETE USERNAME=alice AUTHENTICATED=TRUE
-GREETER QUIT
+GREETER TERMINATE SIGNAL=15
 
 # X server resets
 XSERVER :50 DISCONNECT-CLIENTS
diff --git a/tests/scripts/xdmcp-login.script b/tests/scripts/xdmcp-login.script
index 15ad8d3c..2efa4440 100644
--- a/tests/scripts/xdmcp-login.script
+++ b/tests/scripts/xdmcp-login.script
@@ -28,7 +28,7 @@ GREETER AUTHENTICATE USERNAME=alice
 GREETER SHOW-PROMPT TEXT="Password:"
 GREETER RESPOND TEXT="password"
 GREETER AUTHENTICATION-COMPLETE USERNAME=alice AUTHENTICATED=TRUE
-GREETER QUIT
+GREETER TERMINATE SIGNAL=15
 
 # Session starts
 SESSION START USER=alice
diff --git a/tests/src/test-gobject-greeter.c b/tests/src/test-gobject-greeter.c
index 611de70d..4a2634bb 100644
--- a/tests/src/test-gobject-greeter.c
+++ b/tests/src/test-gobject-greeter.c
@@ -53,12 +53,7 @@ authentication_complete_cb (LightDMGreeter *greeter)
     if (!lightdm_greeter_get_is_authenticated (greeter))
         return;
 
-    if (lightdm_greeter_start_session_sync (greeter, NULL))
-    {
-        notify_status ("GREETER QUIT");
-        exit (EXIT_SUCCESS);
-    }
-    else
+    if (!lightdm_greeter_start_session_sync (greeter, NULL))
         notify_status ("GREETER SESSION-FAILED");
 }
 
diff --git a/tests/src/test-qt-greeter.cpp b/tests/src/test-qt-greeter.cpp
index 902ef9e6..384eb9b8 100644
--- a/tests/src/test-qt-greeter.cpp
+++ b/tests/src/test-qt-greeter.cpp
@@ -54,12 +54,7 @@ void TestGreeter::authenticationComplete ()
     if (!isAuthenticated ())
         return;
 
-    if (startSessionSync ())
-    {
-        notify_status ("GREETER QUIT");
-        exit (EXIT_SUCCESS);
-    }
-    else
+    if (!startSessionSync ())
         notify_status ("GREETER SESSION-FAILED");
 }