Fix lightdm_greeter_start_session_sync () blocking on success

2 files changed, 5 insertions, 24 deletions

diff --git a/src/greeter.c b/src/greeter.c
index bbf8579f..28ff3b7f 100644
--- a/src/greeter.c
+++ b/src/greeter.c
@@ -397,6 +397,8 @@ static void
 handle_start_session (Greeter *greeter, const gchar *session)
 {
     gboolean result;
+    guint8 message[MAX_MESSAGE_LENGTH];
+    gsize offset = 0;
 
     if (strcmp (session, "") == 0)
         session = NULL;
@@ -415,15 +417,9 @@ handle_start_session (Greeter *greeter, const gchar *session)
         result = FALSE;
     }
 
-    if (!result)
-    {
-        guint8 message[MAX_MESSAGE_LENGTH];
-        gsize offset = 0;
-
-        write_header (message, MAX_MESSAGE_LENGTH, SERVER_MESSAGE_SESSION_RESULT, int_length (), &offset);
-        write_int (message, MAX_MESSAGE_LENGTH, 1, &offset);
-        write_message (greeter, message, offset);
-    }
+    write_header (message, MAX_MESSAGE_LENGTH, SERVER_MESSAGE_SESSION_RESULT, int_length (), &offset);
+    write_int (message, MAX_MESSAGE_LENGTH, result ? 0 : 1, &offset);
+    write_message (greeter, message, offset);
 }
 
 static void
@@ -644,19 +640,6 @@ greeter_get_authentication (Greeter *greeter)
     return greeter->priv->authentication;
 }
 
-void
-greeter_quit (Greeter *greeter)
-{
-    guint8 message[MAX_MESSAGE_LENGTH];
-    gsize offset = 0;
-
-    g_return_if_fail (greeter != NULL);
-
-    write_header (message, MAX_MESSAGE_LENGTH, SERVER_MESSAGE_SESSION_RESULT, int_length (), &offset);
-    write_int (message, MAX_MESSAGE_LENGTH, 0, &offset);
-    write_message (greeter, message, offset);
-}
-
 static PAMSession *
 greeter_real_start_authentication (Greeter *greeter, const gchar *username)
 {
diff --git a/src/greeter.h b/src/greeter.h
index 9d9a7f3e..4694698e 100644
--- a/src/greeter.h
+++ b/src/greeter.h
@@ -50,8 +50,6 @@ gboolean greeter_get_guest_authenticated (Greeter *greeter);
 
 PAMSession *greeter_get_authentication (Greeter *greeter);
 
-void greeter_quit (Greeter *greeter);
-
 G_END_DECLS
 
 #endif /* _GREETER_H_ */