Merge lp:~robert-ancell/lightdm/liblightdm-async into lp:lightdm

[Robert Ancell]

Add asynchronous methods to liblightdm - lightdm_greeter_connect, lightdm_greeter_ensure_shared_data_dir and lightdm_greeter_start_session

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1954
http://jenkins.qa.ubuntu.com/job/lightdm-ci/284/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-amd64-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-armhf-ci/78/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/lightdm-ci/284/rebuild

review: Needs Fixing (continuous-integration)

[lp:~robert-ancell/lightdm/liblightdm-async]

1955. By Robert Ancell on 2014-04-29

Update documentation

1956. By Robert Ancell on 2014-04-29

Merge with trunk

=== modified file 'debian/liblightdm-gobject-1-0.symbols'
--- debian/liblightdm-gobject-1-0.symbols	2014-04-28 14:33:32 +0000
+++ debian/liblightdm-gobject-1-0.symbols	2014-04-29 01:26:07 +0000
@@ -16,7 +16,11 @@
  lightdm_greeter_authenticate_remote@Base 1.3.3
  lightdm_greeter_cancel_authentication@Base 0.9.2
  lightdm_greeter_cancel_autologin@Base 0.9.2
+ lightdm_greeter_connect@Base 1.11.1
+ lightdm_greeter_connect_finish@Base 1.11.1
  lightdm_greeter_connect_sync@Base 0.9.2
+ lightdm_greeter_ensure_shared_data_dir@Base 1.11.1
+ lightdm_greeter_ensure_shared_data_dir_finish@Base 1.11.1
  lightdm_greeter_ensure_shared_data_dir_sync@Base 1.9.8
  lightdm_greeter_get_authentication_user@Base 0.9.2
  lightdm_greeter_get_autologin_guest_hint@Base 0.9.2
@@ -38,6 +42,8 @@
  lightdm_greeter_respond@Base 0.9.2
  lightdm_greeter_set_language@Base 0.9.8
  lightdm_greeter_set_resettable@Base 1.11.1
+ lightdm_greeter_start_session@Base 1.11.1
+ lightdm_greeter_start_session_finish@Base 1.11.1
  lightdm_greeter_start_session_sync@Base 0.9.2
  lightdm_hibernate@Base 0.9.2
  lightdm_language_get_code@Base 0.9.2
 
=== modified file 'doc/lightdm-gobject-1-sections.txt'
--- doc/lightdm-gobject-1-sections.txt	2014-04-29 01:22:06 +0000
+++ doc/lightdm-gobject-1-sections.txt	2014-04-29 01:26:07 +0000
@@ -133,7 +133,11 @@
 LightDMPromptType
 lightdm_greeter_new
 lightdm_greeter_set_resettable
+lightdm_greeter_connect
+lightdm_greeter_connect_finish
 lightdm_greeter_connect_sync
+lightdm_greeter_ensure_shared_data_dir
+lightdm_greeter_ensure_shared_data_dir_finish
 lightdm_greeter_ensure_shared_data_dir_sync
 lightdm_greeter_get_default_session_hint
 lightdm_greeter_get_hint
@@ -158,6 +162,8 @@
 lightdm_greeter_get_in_authentication
 lightdm_greeter_get_is_authenticated
 lightdm_greeter_get_authentication_user
+lightdm_greeter_start_session
+lightdm_greeter_start_session_finish
 lightdm_greeter_start_session_sync
 <SUBSECTION Standard>
 LIGHTDM_GREETER
 
=== modified file 'doc/tmpl/greeter.sgml'
--- doc/tmpl/greeter.sgml	2014-04-29 01:22:06 +0000
+++ doc/tmpl/greeter.sgml	2014-04-29 01:26:07 +0000
@@ -155,6 +155,28 @@
 @resettable: 
 
 
+<!-- ##### FUNCTION lightdm_greeter_connect ##### -->
+<para>
+
+</para>
+
+@greeter: 
+@cancellable: 
+@callback: 
+@user_data: 
+
+
+<!-- ##### FUNCTION lightdm_greeter_connect_finish ##### -->
+<para>
+
+</para>
+
+@greeter: 
+@result: 
+@error: 
+@Returns: 
+
+
 <!-- ##### FUNCTION lightdm_greeter_connect_sync ##### -->
 <para>
 
@@ -165,6 +187,28 @@
 @Returns: 
 
 
+<!-- ##### FUNCTION lightdm_greeter_ensure_shared_data_dir ##### -->
+<para>
+
+</para>
+
+@greeter: 
+@username: 
+@cancellable: 
+@callback: 
+@user_data: 
+
+
+<!-- ##### FUNCTION lightdm_greeter_ensure_shared_data_dir_finish ##### -->
+<para>
+
+</para>
+
+@greeter: 
+@result: 
+@Returns: 
+
+
 <!-- ##### FUNCTION lightdm_greeter_ensure_shared_data_dir_sync ##### -->
 <para>
 
@@ -380,6 +424,29 @@
 @Returns: 
 
 
+<!-- ##### FUNCTION lightdm_greeter_start_session ##### -->
+<para>
+
+</para>
+
+@greeter: 
+@session: 
+@cancellable: 
+@callback: 
+@user_data: 
+
+
+<!-- ##### FUNCTION lightdm_greeter_start_session_finish ##### -->
+<para>
+
+</para>
+
+@greeter: 
+@result: 
+@error: 
+@Returns: 
+
+
 <!-- ##### FUNCTION lightdm_greeter_start_session_sync ##### -->
 <para>
 
 
=== modified file 'liblightdm-gobject/greeter.c'
--- liblightdm-gobject/greeter.c	2014-04-28 22:56:38 +0000
+++ liblightdm-gobject/greeter.c	2014-04-29 01:26:07 +0000
@@ -125,6 +125,9 @@
 typedef struct
 {
     GObject parent_instance;
+    GCancellable *cancellable;
+    GAsyncReadyCallback callback;
+    gpointer user_data;
     gboolean complete;
     guint32 return_code;
     gchar *dir;
@@ -134,8 +137,9 @@
     GObjectClass parent_class;
 } RequestClass;
 GType request_get_type (void);
+static void request_iface_init (GAsyncResultIface *iface);
 #define REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), request_get_type (), Request))
-G_DEFINE_TYPE (Request, request, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_CODE (Request, request, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_RESULT, request_iface_init));
 
 /**
  * lightdm_greeter_new:
@@ -172,15 +176,33 @@
 }
 
 static Request *
-request_new (void)
+request_new (GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
 {
     Request *request;
 
     request = g_object_new (request_get_type (), NULL);
+    if (cancellable)
+        request->cancellable = g_object_ref (cancellable);
+    request->callback = callback;
+    request->user_data = user_data;
 
     return request;
 }
 
+static void
+request_complete (Request *request, GObject *object)
+{
+    request->complete = TRUE;
+
+    if (!request->callback)
+        return;
+
+    if (request->cancellable && g_cancellable_is_cancelled (request->cancellable))
+        return;
+
+    request->callback (object, G_ASYNC_RESULT (request), request->user_data);
+}
+
 static gboolean
 timed_login_cb (gpointer data)
 {
@@ -288,14 +310,17 @@
     return read_int (message, message_length, &offset);
 }
 
-static void
-write_message (LightDMGreeter *greeter, guint8 *message, gsize message_length)
+static gboolean
+send_message (LightDMGreeter *greeter, guint8 *message, gsize message_length)
 {
     LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
     GIOStatus status;
     GError *error = NULL;
     guint32 stated_length;
 
+    if (!priv->to_server_channel)
+        return FALSE;
+
     /* Double check that we're sending well-formed messages.  If we say we're
        sending more than we do, we end up DOS'ing lightdm as it waits for the
        rest.  If we say we're sending less than we do, we confuse the heck out
@@ -305,16 +330,20 @@
     if (stated_length != message_length)
     {
         g_warning ("Refusing to write malformed packet to daemon: declared size is %u, but actual size is %zu", stated_length, message_length);
-        return;
+        return FALSE;
     }
 
     status = g_io_channel_write_chars (priv->to_server_channel, (gchar *) message, message_length, NULL, &error);
     if (error)
         g_warning ("Error writing to daemon: %s", error->message);
     g_clear_error (&error);
-    if (status == G_IO_STATUS_NORMAL)
-        g_debug ("Wrote %zi bytes to daemon", message_length);
+    if (status != G_IO_STATUS_NORMAL)
+        return FALSE;
+
+    g_debug ("Wrote %zi bytes to daemon", message_length);
     g_io_channel_flush (priv->to_server_channel, NULL);
+
+    return TRUE;
 }
 
 static void
@@ -351,10 +380,11 @@
         priv->autologin_timeout = g_timeout_add (timeout * 1000, timed_login_cb, greeter);
     }
 
+    /* Notify asynchronous caller */
     request = g_list_nth_data (priv->connect_requests, 0);
     if (request)
     {
-        request->complete = TRUE;
+        request_complete (request, G_OBJECT (greeter));
         priv->connect_requests = g_list_remove (priv->connect_requests, request);
         g_object_unref (request);
     }
@@ -501,11 +531,12 @@
     LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
     Request *request;
 
+    /* Notify asynchronous caller */
     request = g_list_nth_data (priv->start_session_requests, 0);
     if (request)
     {
         request->return_code = read_int (message, message_length, offset);
-        request->complete = TRUE;
+        request_complete (request, G_OBJECT (greeter));
         priv->start_session_requests = g_list_remove (priv->start_session_requests, request);
         g_object_unref (request);
     }
@@ -517,6 +548,7 @@
     LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
     Request *request;
 
+    /* Notify asynchronous caller */
     request = g_list_nth_data (priv->ensure_shared_data_dir_requests, 0);
     if (request)
     {
@@ -527,7 +559,7 @@
             g_free (request->dir);
             request->dir = NULL;
         }
-        request->complete = TRUE;
+        request_complete (request, G_OBJECT (greeter));
         priv->ensure_shared_data_dir_requests = g_list_remove (priv->ensure_shared_data_dir_requests, request);
         g_object_unref (request);
     }
@@ -571,13 +603,16 @@
 }
 
 static guint8 *
-read_message (LightDMGreeter *greeter, gsize *length, gboolean block)
+recv_message (LightDMGreeter *greeter, gsize *length, gboolean block)
 {
     LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
     gsize n_to_read, n_read;
     guint8 *buffer;
     GError *error = NULL;
 
+    if (!priv->from_server_channel)
+        return NULL;
+
     /* Read the header, or the whole message if we already have that */
     n_to_read = HEADER_SIZE;
     if (priv->n_read >= HEADER_SIZE)
@@ -613,7 +648,7 @@
         if (n_to_read > 0)
         {
             priv->read_buffer = g_realloc (priv->read_buffer, HEADER_SIZE + n_to_read);
-            return read_message (greeter, length, block);
+            return recv_message (greeter, length, block);
         }
     }
 
@@ -634,7 +669,7 @@
     gsize message_length;
 
     /* Read one message and process it */
-    message = read_message (greeter, &message_length, FALSE);
+    message = recv_message (greeter, &message_length, FALSE);
     if (message)
     {
         handle_message (greeter, message, message_length);
@@ -644,7 +679,7 @@
     return TRUE;
 }
 
-static void
+static gboolean
 send_connect (LightDMGreeter *greeter, gboolean resettable)
 {
     guint8 message[MAX_MESSAGE_LENGTH];
@@ -654,10 +689,11 @@
     write_header (message, MAX_MESSAGE_LENGTH, GREETER_MESSAGE_CONNECT, string_length (VERSION) + int_length (), &offset);
     write_string (message, MAX_MESSAGE_LENGTH, VERSION, &offset);
     write_int (message, MAX_MESSAGE_LENGTH, resettable ? 1 : 0, &offset);
-    write_message (greeter, message, offset);
+
+    return send_message (greeter, message, offset);
 }
 
-static void
+static gboolean
 send_start_session (LightDMGreeter *greeter, const gchar *session)
 {
     guint8 message[MAX_MESSAGE_LENGTH];
@@ -670,10 +706,10 @@
 
     write_header (message, MAX_MESSAGE_LENGTH, GREETER_MESSAGE_START_SESSION, string_length (session), &offset);
     write_string (message, MAX_MESSAGE_LENGTH, session, &offset);
-    write_message (greeter, message, offset);
+    return send_message (greeter, message, offset);
 }
 
-static void
+static gboolean
 send_ensure_shared_data_dir (LightDMGreeter *greeter, const gchar *username)
 {
     guint8 message[MAX_MESSAGE_LENGTH];
@@ -683,7 +719,51 @@
 
     write_header (message, MAX_MESSAGE_LENGTH, GREETER_MESSAGE_ENSURE_SHARED_DIR, string_length (username), &offset);
     write_string (message, MAX_MESSAGE_LENGTH, username, &offset);
-    write_message (greeter, message, offset);
+    return send_message (greeter, message, offset);
+}
+
+/**
+ * lightdm_greeter_connect:
+ * @greeter: The greeter to connect
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: (allow-none): A #GAsyncReadyCallback to call when completed or %NULL.
+ * @user_data: (allow-none): data to pass to the @callback or %NULL.
+ *
+ * Asynchronously connects the greeter to the display manager.
+ *
+ * When the operation is finished, @callback will be invoked. You can then call lightdm_greeter_connect_finish() to get the result of the operation.
+ *
+ * See lightdm_greeter_connect_sync() for the synchronous version.
+ **/
+void
+lightdm_greeter_connect (LightDMGreeter *greeter, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
+{
+    LightDMGreeterPrivate *priv;
+    Request *request;
+
+    g_return_if_fail (LIGHTDM_IS_GREETER (greeter));
+
+    priv = GET_PRIVATE (greeter);
+
+    request = request_new (cancellable, callback, user_data);
+    priv->connect_requests = g_list_append (priv->connect_requests, request);
+    send_connect (greeter, priv->resettable);
+}
+
+/**
+ * lightdm_greeter_connect_finish:
+ * @result: A #GAsyncResult.
+ * @error: return location for a #GError, or %NULL
+ *
+ * Finishes an operation started with lightdm_greeter_connect().
+ *
+ * Return value: #TRUE if successfully connected
+ **/
+gboolean
+lightdm_greeter_connect_finish (LightDMGreeter *greeter, GAsyncResult *result, GError **error)
+{
+    g_return_if_fail (LIGHTDM_IS_GREETER (greeter));
+    return REQUEST (result)->complete;
 }
 
 /**
@@ -699,42 +779,22 @@
 lightdm_greeter_connect_sync (LightDMGreeter *greeter, GError **error)
 {
     LightDMGreeterPrivate *priv;
-    const gchar *fd;
     Request *request;
 
     g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE);
 
     priv = GET_PRIVATE (greeter);
 
-    fd = g_getenv ("LIGHTDM_TO_SERVER_FD");
-    if (!fd)
-    {
-        g_warning ("No LIGHTDM_TO_SERVER_FD environment variable");
-        return FALSE;
-    }
-    priv->to_server_channel = g_io_channel_unix_new (atoi (fd));
-    g_io_channel_set_encoding (priv->to_server_channel, NULL, NULL);
-
-    fd = g_getenv ("LIGHTDM_FROM_SERVER_FD");
-    if (!fd)
-    {
-        g_warning ("No LIGHTDM_FROM_SERVER_FD environment variable");
-        return FALSE;
-    }
-    priv->from_server_channel = g_io_channel_unix_new (atoi (fd));
-    g_io_channel_set_encoding (priv->from_server_channel, NULL, NULL);
-    g_io_add_watch (priv->from_server_channel, G_IO_IN, from_server_cb, greeter);
-
     /* Read until we are connected */
     send_connect (greeter, priv->resettable);
-    request = request_new ();
+    request = request_new (NULL, NULL, NULL);
     priv->connect_requests = g_list_append (priv->connect_requests, g_object_ref (request));
     do
     {
         guint8 *message;
         gsize message_length;
 
-        message = read_message (greeter, &message_length, TRUE);
+        message = recv_message (greeter, &message_length, TRUE);
         if (!message)
             break;
         handle_message (greeter, message, message_length);
@@ -1028,7 +1088,7 @@
     write_header (message, MAX_MESSAGE_LENGTH, GREETER_MESSAGE_AUTHENTICATE, int_length () + string_length (username), &offset);
     write_int (message, MAX_MESSAGE_LENGTH, priv->authenticate_sequence_number, &offset);
     write_string (message, MAX_MESSAGE_LENGTH, username, &offset);
-    write_message (greeter, message, offset);
+    send_message (greeter, message, offset);
 }
 
 /**
@@ -1060,7 +1120,7 @@
     g_debug ("Starting authentication for guest account...");
     write_header (message, MAX_MESSAGE_LENGTH, GREETER_MESSAGE_AUTHENTICATE_AS_GUEST, int_length (), &offset);
     write_int (message, MAX_MESSAGE_LENGTH, priv->authenticate_sequence_number, &offset);
-    write_message (greeter, message, offset);
+    send_message (greeter, message, offset);
 }
 
 /**
@@ -1117,7 +1177,7 @@
     write_int (message, MAX_MESSAGE_LENGTH, priv->authenticate_sequence_number, &offset);
     write_string (message, MAX_MESSAGE_LENGTH, session, &offset);
     write_string (message, MAX_MESSAGE_LENGTH, username, &offset);
-    write_message (greeter, message, offset);
+    send_message (greeter, message, offset);
 }
 
 /**
@@ -1160,7 +1220,7 @@
         write_int (message, MAX_MESSAGE_LENGTH, g_list_length (priv->responses_received), &offset);
         for (iter = priv->responses_received; iter; iter = iter->next)
             write_string (message, MAX_MESSAGE_LENGTH, (gchar *)iter->data, &offset);
-        write_message (greeter, message, offset);
+        send_message (greeter, message, offset);
 
         g_list_free_full (priv->responses_received, g_free);
         priv->responses_received = NULL;
@@ -1188,7 +1248,7 @@
 
     priv->cancelling_authentication = TRUE;
     write_header (message, MAX_MESSAGE_LENGTH, GREETER_MESSAGE_CANCEL_AUTHENTICATION, 0, &offset);
-    write_message (greeter, message, offset);
+    send_message (greeter, message, offset);
 }
 
 /**
@@ -1258,7 +1318,53 @@
 
     write_header (message, MAX_MESSAGE_LENGTH, GREETER_MESSAGE_SET_LANGUAGE, string_length (language), &offset);
     write_string (message, MAX_MESSAGE_LENGTH, language, &offset);
-    write_message (greeter, message, offset);
+    send_message (greeter, message, offset);
+}
+
+/**
+ * lightdm_greeter_start_session:
+ * @greeter: A #LightDMGreeter
+ * @session: (allow-none): The session to log into or #NULL to use the default.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: (allow-none): A #GAsyncReadyCallback to call when completed or %NULL.
+ * @user_data: (allow-none): data to pass to the @callback or %NULL.
+ *
+ * Asynchronously start a session for the authenticated user.
+ *
+ * When the operation is finished, @callback will be invoked. You can then call lightdm_greeter_start_session_finish() to get the result of the operation.
+ *
+ * See lightdm_greeter_start_session_sync() for the synchronous version.
+ **/
+void
+lightdm_greeter_start_session (LightDMGreeter *greeter, const gchar *session, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
+{
+    LightDMGreeterPrivate *priv;
+    Request *request;
+
+    g_return_if_fail (LIGHTDM_IS_GREETER (greeter));
+
+    priv = GET_PRIVATE (greeter);
+
+    send_start_session (greeter, session);
+    request = request_new (cancellable, callback, user_data);
+    priv->start_session_requests = g_list_append (priv->start_session_requests, request);
+}
+
+/**
+ * lightdm_greeter_start_session_finish:
+ * @greeter: A #LightDMGreeter
+ * @result: A #GAsyncResult.
+ * @error: return location for a #GError, or %NULL
+ *
+ * Start a session for the authenticated user.
+ *
+ * Return value: TRUE if the session was started.
+ **/
+gboolean
+lightdm_greeter_start_session_finish (LightDMGreeter *greeter, GAsyncResult *result, GError **error)
+{
+    g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE);
+    return REQUEST (result)->return_code == 0;
 }
 
 /**
@@ -1287,14 +1393,14 @@
 
     /* Read until the session is started */
     send_start_session (greeter, session);
-    request = request_new ();
+    request = request_new (NULL, NULL, NULL);
     priv->start_session_requests = g_list_append (priv->start_session_requests, g_object_ref (request));
     do
     {
         guint8 *message;
         gsize message_length;
 
-        message = read_message (greeter, &message_length, TRUE);
+        message = recv_message (greeter, &message_length, TRUE);
         if (!message)
             break;
         handle_message (greeter, message, message_length);
@@ -1308,6 +1414,55 @@
 }
 
 /**
+ * lightdm_greeter_ensure_shared_data_dir:
+ * @greeter: A #LightDMGreeter
+ * @username: A username
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: (allow-none): A #GAsyncReadyCallback to call when completed or %NULL.
+ * @user_data: (allow-none): data to pass to the @callback or %NULL.
+ *
+ * Ensure that a shared data dir for the given user is available.  Both the
+ * greeter user and @username will have write access to that folder.  The
+ * intention is that larger pieces of shared data would be stored there (files
+ * that the greeter creates but wants to give to a user -- like camera
+ * photos -- or files that the user creates but wants the greeter to
+ * see -- like contact avatars).
+ *
+ * LightDM will automatically create these if the user actually logs in, so
+ * greeters only need to call this method if they want to store something in
+ * the directory themselves.
+ **/
+void
+lightdm_greeter_ensure_shared_data_dir (LightDMGreeter *greeter, const gchar *username, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
+{
+    LightDMGreeterPrivate *priv;
+    Request *request;
+
+    g_return_if_fail (LIGHTDM_IS_GREETER (greeter));
+
+    priv = GET_PRIVATE (greeter);
+
+    send_ensure_shared_data_dir (greeter, username);
+    request = request_new (cancellable, callback, user_data);
+    priv->ensure_shared_data_dir_requests = g_list_append (priv->ensure_shared_data_dir_requests, request);
+}
+
+/**
+ * lightdm_greeter_ensure_shared_data_dir_finish:
+ * @result: A #GAsyncResult.
+ * @greeter: A #LightDMGreeter
+ *
+ *
+ * Return value: The path to the shared directory, free with g_free.
+ **/
+gchar *
+lightdm_greeter_ensure_shared_data_dir_finish (LightDMGreeter *greeter, GAsyncResult *result)
+{
+    g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), NULL);
+    return g_strdup (REQUEST (result)->dir);
+}
+
+/**
  * lightdm_greeter_ensure_shared_data_dir_sync:
  * @greeter: A #LightDMGreeter
  * @username: A username
@@ -1323,7 +1478,7 @@
  * greeters only need to call this method if they want to store something in
  * the directory themselves.
  *
- * Return value: The path to the shared directory, free with g_free
+ * Return value: The path to the shared directory, free with g_free.
  **/
 gchar *
 lightdm_greeter_ensure_shared_data_dir_sync (LightDMGreeter *greeter, const gchar *username)
@@ -1340,14 +1495,14 @@
 
     /* Read until a response */
     send_ensure_shared_data_dir (greeter, username);
-    request = request_new ();
+    request = request_new (NULL, NULL, NULL);
     priv->ensure_shared_data_dir_requests = g_list_append (priv->ensure_shared_data_dir_requests, g_object_ref (request));
     do
     {
         guint8 *message;
         gsize message_length;
 
-        message = read_message (greeter, &message_length, TRUE);
+        message = recv_message (greeter, &message_length, TRUE);
         if (!message)
             break;
         handle_message (greeter, message, message_length);
@@ -1364,9 +1519,29 @@
 lightdm_greeter_init (LightDMGreeter *greeter)
 {
     LightDMGreeterPrivate *priv = GET_PRIVATE (greeter);
+    const gchar *fd;
 
     priv->read_buffer = g_malloc (HEADER_SIZE);
     priv->hints = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
+
+    fd = g_getenv ("LIGHTDM_TO_SERVER_FD");
+    if (fd)
+    {
+        priv->to_server_channel = g_io_channel_unix_new (atoi (fd));
+        g_io_channel_set_encoding (priv->to_server_channel, NULL, NULL);
+    }
+    else
+        g_warning ("No LIGHTDM_TO_SERVER_FD environment variable");
+
+    fd = g_getenv ("LIGHTDM_FROM_SERVER_FD");
+    if (fd)
+    {
+        priv->from_server_channel = g_io_channel_unix_new (atoi (fd));
+        g_io_channel_set_encoding (priv->from_server_channel, NULL, NULL);
+        g_io_add_watch (priv->from_server_channel, G_IO_IN, from_server_cb, greeter);
+    }
+    else
+        g_warning ("No LIGHTDM_FROM_SERVER_FD environment variable");
 }
 
 static void
@@ -1699,6 +1874,8 @@
     Request *request = REQUEST (object);
 
     g_free (request->dir);
+    if (request->cancellable)
+        g_object_unref (request->cancellable);
 
     G_OBJECT_CLASS (request_parent_class)->finalize (object);
 }
@@ -1709,3 +1886,29 @@
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
     object_class->finalize = request_finalize;
 }
+
+static gpointer
+request_get_user_data (GAsyncResult *result)
+{
+    return REQUEST (result)->user_data;
+}
+
+static GObject *
+request_get_source_object (GAsyncResult *res)
+{
+    return NULL;
+}
+
+static gboolean
+request_is_tagged (GAsyncResult *res, gpointer source_tag)
+{
+    return FALSE;
+}
+
+static void
+request_iface_init (GAsyncResultIface *iface)
+{
+    iface->get_user_data = request_get_user_data;
+    iface->get_source_object = request_get_source_object;
+    iface->is_tagged = request_is_tagged;
+}
 
=== modified file 'liblightdm-gobject/liblightdm-gobject-1.vapi'
--- liblightdm-gobject/liblightdm-gobject-1.vapi	2014-04-08 00:32:13 +0000
+++ liblightdm-gobject/liblightdm-gobject-1.vapi	2014-04-29 01:26:07 +0000
@@ -24,6 +24,7 @@
         public signal void authentication_complete ();
         public signal void autologin_timer_expired ();
 
+        public async bool connect_sync () throws GLib.Error;
         public bool connect_sync () throws GLib.Error;
         public unowned string get_hint (string name);
         public unowned string default_session_hint { get; }
@@ -47,7 +48,10 @@
         public bool in_authentication { get; }
         public bool is_authenticated { get; }
         public unowned string? authentication_user { get; }
+        public async void start_session (string? session = null) throws GLib.Error;
         public bool start_session_sync (string? session = null) throws GLib.Error;
+        public async string ensure_shared_data_dir (string username);
+        public string ensure_shared_data_dir_sync (string username);
     }
     [CCode (has_type_id = false)]
     public enum MessageType {
 
=== modified file 'liblightdm-gobject/lightdm/greeter.h'
--- liblightdm-gobject/lightdm/greeter.h	2014-04-28 20:56:28 +0000
+++ liblightdm-gobject/lightdm/greeter.h	2014-04-29 01:26:07 +0000
@@ -12,11 +12,12 @@
 #define LIGHTDM_GREETER_H_
 
 #include <glib-object.h>
+#include <gio/gio.h>
 
 G_BEGIN_DECLS
 
 #define LIGHTDM_TYPE_GREETER            (lightdm_greeter_get_type())
-#define LIGHTDM_GREETER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_GREETER, LightDMGreeter));
+#define LIGHTDM_GREETER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_GREETER, LightDMGreeter))
 #define LIGHTDM_GREETER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), LIGHTDM_TYPE_GREETER, LightDMGreeterClass))
 #define LIGHTDM_IS_GREETER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIGHTDM_TYPE_GREETER))
 #define LIGHTDM_IS_GREETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_GREETER))
@@ -73,6 +74,10 @@
 
 void lightdm_greeter_set_resettable (LightDMGreeter *greeter, gboolean resettable);
 
+void lightdm_greeter_connect (LightDMGreeter *greeter, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
+
+gboolean lightdm_greeter_connect_finish (LightDMGreeter *greeter, GAsyncResult *result, GError **error);
+
 gboolean lightdm_greeter_connect_sync (LightDMGreeter *greeter, GError **error);
 
 const gchar *lightdm_greeter_get_hint (LightDMGreeter *greeter, const gchar *name);
@@ -121,8 +126,16 @@
 
 void lightdm_greeter_set_language (LightDMGreeter *greeter, const gchar *language);
 
+void lightdm_greeter_start_session (LightDMGreeter *greeter, const gchar *session, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
+
+gboolean lightdm_greeter_start_session_finish (LightDMGreeter *greeter, GAsyncResult *result, GError **error);
+
 gboolean lightdm_greeter_start_session_sync (LightDMGreeter *greeter, const gchar *session, GError **error);
 
+void lightdm_greeter_ensure_shared_data_dir (LightDMGreeter *greeter, const gchar *username, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
+
+gchar *lightdm_greeter_ensure_shared_data_dir_finish (LightDMGreeter *greeter, GAsyncResult *result);
+
 gchar *lightdm_greeter_ensure_shared_data_dir_sync (LightDMGreeter *greeter, const gchar *username);
 
 G_END_DECLS
 
=== modified file 'tests/src/test-gobject-greeter.c'
--- tests/src/test-gobject-greeter.c	2014-04-28 20:56:28 +0000
+++ tests/src/test-gobject-greeter.c	2014-04-29 01:26:07 +0000
@@ -10,6 +10,7 @@
 
 #include "status.h"
 
+static int exit_code = EXIT_SUCCESS;
 static gchar *greeter_id;
 static GMainLoop *loop;
 static LightDMGreeter *greeter;
@@ -103,6 +104,70 @@
 }
 
 static void
+start_session_finished (GObject *object, GAsyncResult *result, gpointer data)
+{
+    LightDMGreeter *greeter = LIGHTDM_GREETER (object);
+    GError *error = NULL;
+
+    if (!lightdm_greeter_start_session_finish (greeter, result, &error))
+        status_notify ("%s SESSION-FAILED", greeter_id);
+    g_clear_error (&error);
+}
+
+static void
+write_shared_data_finished (GObject *object, GAsyncResult *result, gpointer data)
+{
+    LightDMGreeter *greeter = LIGHTDM_GREETER (object);
+    gchar *dir, *path, *test_data;
+    FILE *f;
+
+    dir = lightdm_greeter_ensure_shared_data_dir_finish (greeter, result);
+    if (!dir)
+    {
+        status_notify ("%s WRITE-SHARED-DATA ERROR=NO_SHARED_DIR", greeter_id);
+        return;
+    }
+
+    path = g_build_filename (dir, "data", NULL);
+    test_data = data;
+    if (!(f = fopen (path, "w")) || fprintf (f, "%s", test_data) < 0)
+        status_notify ("%s WRITE-SHARED-DATA ERROR=%s", greeter_id, strerror (errno));
+    else
+        status_notify ("%s WRITE-SHARED-DATA RESULT=TRUE", greeter_id);
+    g_free (test_data);
+
+    if (f)
+        fclose (f);
+    g_free (path);
+    g_free (dir);
+}
+
+static void
+read_shared_data_finished (GObject *object, GAsyncResult *result, gpointer data)
+{
+    LightDMGreeter *greeter = LIGHTDM_GREETER (object);
+    gchar *dir, *path;
+    gchar *contents = NULL;
+    GError *error = NULL;
+
+    dir = lightdm_greeter_ensure_shared_data_dir_finish (greeter, result);
+    if (!dir)
+    {
+        status_notify ("%s READ-SHARED-DATA ERROR=NO_SHARED_DIR", greeter_id);
+        return;
+    }
+
+    path = g_build_filename (dir, "data", NULL);
+    if (g_file_get_contents (path, &contents, NULL, &error))
+        status_notify ("%s READ-SHARED-DATA DATA=%s", greeter_id, contents);
+    else
+        status_notify ("%s READ-SHARED-DATA ERROR=%s", greeter_id, error->message);
+    g_free (path);
+    g_free (contents);
+    g_clear_error (&error);
+}
+
+static void
 request_cb (const gchar *name, GHashTable *params)
 {
     if (!name)
@@ -133,10 +198,7 @@
         lightdm_greeter_cancel_authentication (greeter);
 
     else if (strcmp (name, "START-SESSION") == 0)
-    {
-        if (!lightdm_greeter_start_session_sync (greeter, g_hash_table_lookup (params, "SESSION"), NULL))
-            status_notify ("%s SESSION-FAILED", greeter_id);
-    }
+        lightdm_greeter_start_session (greeter, g_hash_table_lookup (params, "SESSION"), NULL, start_session_finished, NULL);
 
     else if (strcmp (name, "LOG-DEFAULT-SESSION") == 0)
         status_notify ("%s LOG-DEFAULT-SESSION SESSION=%s", greeter_id, lightdm_greeter_get_default_session_hint (greeter));
@@ -146,56 +208,12 @@
 
     else if (strcmp (name, "WRITE-SHARED-DATA") == 0)
     {
-        gchar *dir;
-
-        dir = lightdm_greeter_ensure_shared_data_dir_sync (greeter, g_hash_table_lookup (params, "USERNAME"));
-        if (dir)
-        {
-            gchar *path;
-            FILE *f;
-
-            g_printerr ("dir='%s'\n", dir);
-
-            path = g_build_filename (dir, "data", NULL);
-            if (!(f = fopen (path, "w")) || fprintf (f, "%s", (const gchar *) g_hash_table_lookup (params, "DATA")) < 0)
-                status_notify ("%s WRITE-SHARED-DATA ERROR=%s", greeter_id, strerror (errno));
-            else
-                status_notify ("%s WRITE-SHARED-DATA RESULT=TRUE", greeter_id);
-
-            if (f)
-                fclose (f);
-            g_free (path);
-            g_free (dir);
-        }
-        else
-            status_notify ("%s WRITE-SHARED-DATA ERROR=NO_SHARED_DIR", greeter_id);
+        const gchar *data = g_hash_table_lookup (params, "DATA");
+        lightdm_greeter_ensure_shared_data_dir (greeter, g_hash_table_lookup (params, "USERNAME"), NULL, write_shared_data_finished, g_strdup (data));
     }
 
     else if (strcmp (name, "READ-SHARED-DATA") == 0)
-    {
-        gchar *dir;
-
-        dir = lightdm_greeter_ensure_shared_data_dir_sync (greeter, g_hash_table_lookup (params, "USERNAME"));
-        if (dir)
-        {
-            gchar *path;
-            gchar *contents = NULL;
-            GError *error = NULL;
-
-            g_printerr ("dir='%s'\n", dir);
-
-            path = g_build_filename (dir, "data", NULL);
-            if (g_file_get_contents (path, &contents, NULL, &error))
-                status_notify ("%s READ-SHARED-DATA DATA=%s", greeter_id, contents);
-            else
-                status_notify ("%s READ-SHARED-DATA ERROR=%s", greeter_id, error->message);
-            g_free (path);
-            g_free (contents);
-            g_clear_error (&error);
-        }
-        else
-            status_notify ("%s READ-SHARED-DATA ERROR=NO_SHARED_DIR", greeter_id);
-    }
+        lightdm_greeter_ensure_shared_data_dir (greeter, g_hash_table_lookup (params, "USERNAME"), NULL, read_shared_data_finished, NULL);
 
     else if (strcmp (name, "WATCH-USER") == 0)
     {
@@ -350,6 +368,25 @@
     status_notify ("%s USER-REMOVED USERNAME=%s", greeter_id, lightdm_user_get_name (user));
 }
 
+static void
+connect_finished (GObject *object, GAsyncResult *result, gpointer data)
+{
+    LightDMGreeter *greeter = LIGHTDM_GREETER (object);
+    GError *error = NULL;
+
+    if (!lightdm_greeter_connect_finish (greeter, result, &error))
+    {
+        status_notify ("%s FAIL-CONNECT-DAEMON", greeter_id);
+        exit_code = EXIT_FAILURE;
+        g_main_loop_quit (loop);
+        return;
+    }
+
+    status_notify ("%s CONNECTED-TO-DAEMON", greeter_id);
+
+    notify_hints (greeter);
+}
+
 int
 main (int argc, char **argv)
 {
@@ -444,17 +481,9 @@
     }
 
     status_notify ("%s CONNECT-TO-DAEMON", greeter_id);
-    if (!lightdm_greeter_connect_sync (greeter, NULL))
-    {
-        status_notify ("%s FAIL-CONNECT-DAEMON", greeter_id);
-        return EXIT_FAILURE;
-    }
-
-    status_notify ("%s CONNECTED-TO-DAEMON", greeter_id);
-
-    notify_hints (greeter);
+    lightdm_greeter_connect (greeter, NULL, connect_finished, NULL);
 
     g_main_loop_run (loop);
 
-    return EXIT_SUCCESS;
+    return exit_code;
 }