Merge lp:~mardy/libsignon-glib/unregistered-lp1593805 into lp:libsignon-glib

[Alberto Mardegan]

Handle signond quitting on inactivity

This is a big diff; for a code review, I recommend reviewing the upstream commits one by one:
https://gitlab.com/accounts-sso/libsignon-glib/merge_requests/8/commits

[lp:~mardy/libsignon-glib/unregistered-lp1593805]

163. By Alberto Mardegan on 2016-07-13

Fix leak and authsession proxy creation

=== modified file 'README.md'
--- README.md	2016-05-19 15:13:07 +0000
+++ README.md	2016-07-13 14:51:18 +0000
@@ -1,7 +1,7 @@
 Single signon authentication library for GLib applications
 ==========================================================
 
-This project is a library for managing single signon credentilas which can be
+This project is a library for managing single signon credentials which can be
 used from GLib applications. It is effectively a GLib binding for the D-Bus API
 provided by [signond][].
 It is part of the accounts-sso project:

=== modified file 'configure.ac'
--- configure.ac	2016-05-19 15:28:09 +0000
+++ configure.ac	2016-07-13 14:51:18 +0000
@@ -63,17 +63,20 @@
 GTK_DOC_CHECK([1.14], [--flavour no-tmpl])
 
 AC_ARG_ENABLE([cast-checks],
-    [AS_HELP_STRING([--disable-cast-checks], [compile with GLib cast checks disabled])])
+    [AS_HELP_STRING([--disable-cast-checks], [compile with GLib cast checks disabled])],
+    [], [enable_cast_checks=yes])
 AS_IF([test "x$enable_cast_checks" = "xno"],
     [CFLAGS="$CFLAGS -DG_DISABLE_CAST_CHECKS"])
 
 AC_ARG_ENABLE([asserts],
-    [AS_HELP_STRING([--disable-asserts], [compile with GLib assertions disabled])])
+    [AS_HELP_STRING([--disable-asserts], [compile with GLib assertions disabled])],
+    [], [enable_asserts=yes])
 AS_IF([test "x$enable_asserts" = "xno"],
     [CFLAGS="$CFLAGS -DG_DISABLE_ASSERTS"])
 
 AC_ARG_ENABLE([checks],
-    [AS_HELP_STRING([--disable-checks], [compile with GLib checks disabled])])
+    [AS_HELP_STRING([--disable-checks], [compile with GLib checks disabled])],
+    [], [enable_checks=yes])
 AS_IF([test "x$checks" = "xno"],
     [CFLAGS="$CFLAGS -DG_DISABLE_CHECKS"])
 

=== modified file 'debian/changelog'
--- debian/changelog	2016-05-20 12:15:54 +0000
+++ debian/changelog	2016-07-13 14:51:18 +0000
@@ -1,3 +1,10 @@
+libsignon-glib (1.14+16.10.20160520.1-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Merge from upstream proposed branch
+    - Handle signond quitting on inactivity (LP: #1593805)
+
+ -- Alberto Mardegan <[e-mail]>  Wed, 22 Jun 2016 10:58:15 +0300
+
 libsignon-glib (1.14+16.10.20160520.1-0ubuntu1) yakkety; urgency=medium
 
   [ Alberto Mardegan ]

=== modified file 'docs/reference/Makefile.am'
--- docs/reference/Makefile.am	2013-06-05 11:05:29 +0000
+++ docs/reference/Makefile.am	2016-07-13 14:51:18 +0000
@@ -47,7 +47,6 @@
 	signon-auth-session-client-glib-gen.h \
 	signon-client-glib-gen.h \
 	signon-identity-glib-gen.h \
-	signon-dbus-queue.h \
 	signon-internals.h \
 	signon-proxy.h \
 	signon-utils.h \

=== modified file 'libsignon-glib/Makefile.am'
--- libsignon-glib/Makefile.am	2016-05-18 10:23:00 +0000
+++ libsignon-glib/Makefile.am	2016-07-13 14:51:18 +0000
@@ -44,16 +44,16 @@
 	signon-auth-service.h \
 	signon-identity-info.h \
 	signon-identity.h \
-	signon-dbus-queue.h \
 	signon-auth-session.h \
 	signon-internals.h \
 	signon-auth-service.c \
 	signon-identity-info.c \
 	signon-identity.c \
-	signon-dbus-queue.c \
 	signon-auth-session.c \
 	signon-errors.h \
 	signon-errors.c \
+	signon-proxy.c \
+	signon-proxy.h \
 	signon-utils.h \
 	signon-utils.c \
 	signon-types.h \

=== modified file 'libsignon-glib/signon-auth-service.c'
--- libsignon-glib/signon-auth-service.c	2016-05-04 09:21:44 +0000
+++ libsignon-glib/signon-auth-service.c	2016-07-13 14:51:18 +0000
@@ -4,7 +4,7 @@
  * This file is part of libsignon-glib
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'libsignon-glib/signon-auth-service.h'
--- libsignon-glib/signon-auth-service.h	2012-01-27 10:24:27 +0000
+++ libsignon-glib/signon-auth-service.h	2016-07-13 14:51:18 +0000
@@ -4,8 +4,9 @@
  * This file is part of libsignon-glib
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Alberto Mardegan <[e-mail]>
+ * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License

=== modified file 'libsignon-glib/signon-auth-session.c'
--- libsignon-glib/signon-auth-session.c	2016-05-18 09:17:09 +0000
+++ libsignon-glib/signon-auth-session.c	2016-07-13 14:51:18 +0000
@@ -4,7 +4,7 @@
  * This file is part of libsignon-glib
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -40,9 +40,9 @@
 
 #include "signon-internals.h"
 #include "signon-auth-session.h"
-#include "signon-dbus-queue.h"
 #include "signon-errors.h"
 #include "signon-marshal.h"
+#include "signon-proxy.h"
 #include "signon-utils.h"
 #include "sso-auth-service.h"
 #include "sso-auth-session-gen.h"
@@ -50,7 +50,11 @@
 /* SignonAuthSessionState is defined in signoncommon.h */
 #include <signoncommon.h>
 
-G_DEFINE_TYPE (SignonAuthSession, signon_auth_session, G_TYPE_OBJECT);
+static void signon_auth_session_proxy_if_init (SignonProxyInterface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (SignonAuthSession, signon_auth_session, G_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (SIGNON_TYPE_PROXY,
+                                                signon_auth_session_proxy_if_init))
 
 /* Signals */
 enum
@@ -266,6 +270,18 @@
 }
 
 static void
+signon_auth_session_proxy_setup (SignonProxy *proxy)
+{
+    auth_session_check_remote_object (SIGNON_AUTH_SESSION (proxy));
+}
+
+static void
+signon_auth_session_proxy_if_init (SignonProxyInterface *iface)
+{
+    iface->setup = signon_auth_session_proxy_setup;
+}
+
+static void
 signon_auth_session_init (SignonAuthSession *self)
 {
     self->priv = SIGNON_AUTH_SESSION_GET_PRIV (self);
@@ -287,6 +303,7 @@
     if (priv->cancellable)
     {
         g_cancellable_cancel (priv->cancellable);
+        g_object_unref (priv->cancellable);
         priv->cancellable = NULL;
     }
 
@@ -421,11 +438,10 @@
 
     g_return_if_fail (id >= 0);
 
-    auth_session_check_remote_object(self);
-    _signon_object_call_when_ready (self,
-                                    auth_session_object_quark(),
-                                    auth_session_set_id_ready_cb,
-                                    GINT_TO_POINTER(id));
+    signon_proxy_call_when_ready (self,
+                                  auth_session_object_quark(),
+                                  auth_session_set_id_ready_cb,
+                                  GINT_TO_POINTER(id));
 }
 
 /**
@@ -485,11 +501,10 @@
     operation_data->wanted_mechanisms = g_strdupv ((gchar **)wanted_mechanisms);
     operation_data->cb_data = cb_data;
 
-    auth_session_check_remote_object(self);
-    _signon_object_call_when_ready (self,
-                                    auth_session_object_quark(),
-                                    auth_session_query_available_mechanisms_ready_cb,
-                                    operation_data);
+    signon_proxy_call_when_ready (self,
+                                  auth_session_object_quark(),
+                                  auth_session_query_available_mechanisms_ready_cb,
+                                  operation_data);
 }
 
 /**
@@ -588,11 +603,10 @@
 
     priv->busy = TRUE;
 
-    auth_session_check_remote_object(self);
-    _signon_object_call_when_ready (self,
-                                    auth_session_object_quark(),
-                                    auth_session_process_ready_cb,
-                                    res);
+    signon_proxy_call_when_ready (self,
+                                  auth_session_object_quark(),
+                                  auth_session_process_ready_cb,
+                                  res);
 }
 
 /**
@@ -635,16 +649,14 @@
 
     g_return_if_fail (priv != NULL);
 
-    auth_session_check_remote_object(self);
-
     if (!priv->busy)
         return;
 
     priv->canceled = TRUE;
-    _signon_object_call_when_ready (self,
-                                    auth_session_object_quark(),
-                                    auth_session_cancel_ready_cb,
-                                    NULL);
+    signon_proxy_call_when_ready (self,
+                                  auth_session_object_quark(),
+                                  auth_session_cancel_ready_cb,
+                                  NULL);
 }
 
 static void
@@ -717,7 +729,7 @@
 
     DEBUG ("Object path received: %s", object_path);
     g_free (object_path);
-    _signon_object_ready (self, auth_session_object_quark (), error);
+    signon_proxy_set_ready (self, auth_session_object_quark (), error);
 }
 
 static void
@@ -748,7 +760,7 @@
     if (priv->proxy)
         destroy_proxy (priv);
 
-    _signon_object_not_ready(self);
+    signon_proxy_set_not_ready (self);
 }
 
 static gboolean
@@ -762,14 +774,7 @@
     priv->id = id;
     priv->method_name = g_strdup (method_name);
 
-    priv->registering = TRUE;
-    sso_auth_service_call_get_auth_session_object_path (
-        priv->auth_service_proxy,
-        id,
-        method_name,
-        priv->cancellable,
-        auth_session_get_object_path_reply,
-        self);
+    priv->registering = FALSE;
     priv->busy = FALSE;
     priv->canceled = FALSE;
     return TRUE;

=== modified file 'libsignon-glib/signon-auth-session.h'
--- libsignon-glib/signon-auth-session.h	2012-11-30 07:38:19 +0000
+++ libsignon-glib/signon-auth-session.h	2016-07-13 14:51:18 +0000
@@ -4,7 +4,7 @@
  * This file is part of libsignon-glib
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== removed file 'libsignon-glib/signon-dbus-queue.c'
--- libsignon-glib/signon-dbus-queue.c	2016-05-03 14:34:14 +0000
+++ libsignon-glib/signon-dbus-queue.c	1970-01-01 00:00:00 +0000
@@ -1,169 +0,0 @@
-/* vi: set et sw=4 ts=4 cino=t0,(0: */
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of libsignon-glib
- *
- * Copyright (C) 2009-2010 Nokia Corporation.
- *
- * Contact: Alberto Mardegan <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#include "signon-dbus-queue.h"
-
-typedef struct {
-    SignonReadyCb callback;
-    gpointer user_data;
-} SignonReadyCbData;
-
-typedef struct {
-    gpointer self;
-    GSList *callbacks;
-} SignonReadyData;
-
-static GQuark
-_signon_object_ready_quark()
-{
-  static GQuark quark = 0;
-
-  if (!quark)
-    quark = g_quark_from_static_string ("signon_object_ready_quark");
-
-  return quark;
-}
-
-static GQuark
-_signon_object_error_quark()
-{
-  static GQuark quark = 0;
-
-  if (!quark)
-    quark = g_quark_from_static_string ("signon_object_error_quark");
-
-  return quark;
-}
-
-static void
-signon_object_invoke_ready_callbacks (SignonReadyData *rd, const GError *error)
-{
-    GSList *list;
-
-    for (list = rd->callbacks; list != NULL; list = list->next)
-    {
-        SignonReadyCbData *cb = list->data;
-
-        cb->callback (rd->self, error, cb->user_data);
-        g_slice_free (SignonReadyCbData, cb);
-    }
-    g_slist_free (rd->callbacks);
-}
-
-static void
-signon_ready_data_free (SignonReadyData *rd)
-{
-    if (rd->self)
-    {
-        //TODO: Signon error codes need be presented instead of 555 and 666
-        GError error = { 555, 666, "Object disposed" };
-        signon_object_invoke_ready_callbacks (rd, &error);
-    }
-    g_slice_free (SignonReadyData, rd);
-}
-
-void
-_signon_object_call_when_ready (gpointer object, GQuark quark, SignonReadyCb callback,
-                                gpointer user_data)
-{
-    SignonReadyData *rd;
-    SignonReadyCbData *cb;
-
-    g_return_if_fail (G_IS_OBJECT (object));
-    g_return_if_fail (quark != 0);
-    g_return_if_fail (callback != NULL);
-
-    if (GPOINTER_TO_INT (g_object_get_qdata((GObject *)object,
-                           _signon_object_ready_quark())) == TRUE)
-    {
-        //TODO: specify the last error in object initialization
-        GError * err = g_object_get_qdata((GObject *)object,
-                                          _signon_object_error_quark());
-        return (*callback)(object, err, user_data);
-    }
-
-    cb = g_slice_new (SignonReadyCbData);
-    cb->callback = callback;
-    cb->user_data = user_data;
-
-    rd = g_object_get_qdata ((GObject *)object, quark);
-    if (!rd)
-    {
-        rd = g_slice_new (SignonReadyData);
-        rd->self = object;
-        rd->callbacks = NULL;
-        g_object_set_qdata_full ((GObject *)object, quark, rd,
-                                 (GDestroyNotify)signon_ready_data_free);
-    }
-
-    rd->callbacks = g_slist_append (rd->callbacks, cb);
-}
-
-void
-_signon_object_ready (gpointer object, GQuark quark, GError *error)
-{
-    SignonReadyData *rd;
-
-    g_object_set_qdata((GObject *)object, _signon_object_ready_quark(), GINT_TO_POINTER(TRUE));
-
-    if(error)
-        g_object_set_qdata_full ((GObject *)object, _signon_object_error_quark(),
-                                 error,
-                                 (GDestroyNotify)g_error_free);
-
-    /* steal the qdata so the callbacks won't be invoked again, even if the
-     * object becomes ready or is finalized while still invoking them */
-
-    rd = g_object_steal_qdata ((GObject *)object, quark);
-    if (!rd) return;
-
-    g_object_ref (object);
-
-    signon_object_invoke_ready_callbacks (rd, error);
-    rd->self = NULL; /* so the callbacks won't be invoked again */
-    signon_ready_data_free (rd);
-
-    g_object_unref (object);
-
-    //TODO: set some sort of ready information
-}
-
-void
-_signon_object_not_ready (gpointer object)
-{
-    g_object_set_qdata ((GObject *)object,
-                        _signon_object_ready_quark(),
-                        GINT_TO_POINTER(FALSE));
-
-    g_object_set_qdata ((GObject *)object,
-                        _signon_object_error_quark(),
-                        NULL);
-}
-
-const GError *
-_signon_object_last_error (gpointer object)
-{
-    return g_object_get_qdata((GObject *)object,
-                              _signon_object_error_quark());
-}

=== removed file 'libsignon-glib/signon-dbus-queue.h'
--- libsignon-glib/signon-dbus-queue.h	2016-05-03 14:34:14 +0000
+++ libsignon-glib/signon-dbus-queue.h	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-/* vi: set et sw=4 ts=4 cino=t0,(0: */
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of libsignon-glib
- *
- * Copyright (C) 2009-2010 Nokia Corporation.
- *
- * Contact: Alberto Mardegan <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#ifndef SIGNONDBUSQUEUEDDATA_H
-#define SIGNONDBUSQUEUEDDATA_H
-
-#include <glib.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-typedef void (*SignonReadyCb) (gpointer object, const GError *error,
-                               gpointer user_data);
-
-void _signon_object_call_when_ready (gpointer object, GQuark quark,
-                                    SignonReadyCb callback, gpointer user_data);
-
-void _signon_object_ready (gpointer object, GQuark quark, GError *error);
-void _signon_object_not_ready (gpointer object);
-
-const GError *_signon_object_last_error (gpointer object);
-
-G_END_DECLS
-#endif /* SIGNONDBUSQUEUEDDATA_H */

=== modified file 'libsignon-glib/signon-errors.c'
--- libsignon-glib/signon-errors.c	2012-08-02 10:25:48 +0000
+++ libsignon-glib/signon-errors.c	2016-07-13 14:51:18 +0000
@@ -4,7 +4,7 @@
  * This file is part of libsignon-glib
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'libsignon-glib/signon-errors.h'
--- libsignon-glib/signon-errors.h	2016-05-03 09:51:12 +0000
+++ libsignon-glib/signon-errors.h	2016-07-13 14:51:18 +0000
@@ -4,8 +4,9 @@
  * This file is part of libsignon-glib
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Alberto Mardegan <[e-mail]>
+ * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License

=== modified file 'libsignon-glib/signon-glib.h'
--- libsignon-glib/signon-glib.h	2011-12-09 14:51:02 +0000
+++ libsignon-glib/signon-glib.h	2016-07-13 14:51:18 +0000
@@ -3,7 +3,7 @@
 /*
  * This file is part of libsignon-glib
  *
- * Copyright (C) 2011 Canonical Ltd.
+ * Copyright (C) 2011-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'libsignon-glib/signon-identity-info.c'
--- libsignon-glib/signon-identity-info.c	2016-05-04 09:21:44 +0000
+++ libsignon-glib/signon-identity-info.c	2016-07-13 14:51:18 +0000
@@ -4,7 +4,7 @@
  * This file is part of libsignon-glib
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2011-2012 Canonical Ltd.
+ * Copyright (C) 2011-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'libsignon-glib/signon-identity-info.h'
--- libsignon-glib/signon-identity-info.h	2012-01-27 10:24:27 +0000
+++ libsignon-glib/signon-identity-info.h	2016-07-13 14:51:18 +0000
@@ -4,7 +4,7 @@
  * This file is part of libsignon-glib
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2011 Canonical Ltd.
+ * Copyright (C) 2011-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'libsignon-glib/signon-identity.c'
--- libsignon-glib/signon-identity.c	2016-05-18 09:17:09 +0000
+++ libsignon-glib/signon-identity.c	2016-07-13 14:51:18 +0000
@@ -4,7 +4,7 @@
  * This file is part of libsignon-glib
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -34,13 +34,17 @@
 #include "signon-identity.h"
 #include "signon-auth-session.h"
 #include "signon-internals.h"
-#include "signon-dbus-queue.h"
+#include "signon-proxy.h"
 #include "signon-utils.h"
 #include "signon-errors.h"
 #include "sso-auth-service.h"
 #include "sso-identity-gen.h"
 
-G_DEFINE_TYPE (SignonIdentity, signon_identity, G_TYPE_OBJECT);
+static void signon_identity_proxy_if_init (SignonProxyInterface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (SignonIdentity, signon_identity, G_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (SIGNON_TYPE_PROXY,
+                                                signon_identity_proxy_if_init))
 
 enum
 {
@@ -74,6 +78,7 @@
     gboolean removed;
     gboolean signed_out;
     gboolean updated;
+    gboolean first_registration;
 
     guint id;
 
@@ -176,6 +181,18 @@
 }
 
 static void
+signon_identity_proxy_setup (SignonProxy *proxy)
+{
+    identity_check_remote_registration (SIGNON_IDENTITY (proxy));
+}
+
+static void
+signon_identity_proxy_if_init (SignonProxyInterface *iface)
+{
+    iface->setup = signon_identity_proxy_setup;
+}
+
+static void
 signon_identity_set_property (GObject *object,
                               guint property_id,
                               const GValue *value,
@@ -230,6 +247,7 @@
     priv->removed = FALSE;
     priv->signed_out = FALSE;
     priv->updated = FALSE;
+    priv->first_registration = TRUE;
 }
 
 static void
@@ -359,7 +377,7 @@
 
     DEBUG ("%s %d", G_STRFUNC, __LINE__);
 
-    _signon_object_not_ready(self);
+    signon_proxy_set_not_ready (self);
 
     priv->registration_state = NOT_REGISTERED;
 
@@ -437,6 +455,27 @@
 
         priv->updated = TRUE;
     }
+    else if (error->domain == G_DBUS_ERROR &&
+             error->code == G_DBUS_ERROR_SERVICE_UNKNOWN)
+    {
+        /* This can happen if signond quits and the GDBusProxy is not notified
+         * about it -- typically because the main loop was not being run.
+         * We try the registration once more.
+         */
+        if (priv->first_registration)
+        {
+            DEBUG ("Service unknown; retrying registration");
+            g_error_free (error);
+            priv->first_registration = FALSE;
+            priv->registration_state = NOT_REGISTERED;
+            identity_check_remote_registration (identity);
+            return;
+        }
+        else
+        {
+            g_warning ("%s, second failure: %s", G_STRFUNC, error->message);
+        }
+    }
     else
         g_warning ("%s: %s", G_STRFUNC, error->message);
 
@@ -449,7 +488,7 @@
      * TODO: if we will add a new state for identity: "INVALID"
      * consider emission of another error, like "invalid"
      * */
-    _signon_object_ready (identity, identity_object_quark (), error);
+    signon_proxy_set_ready (identity, identity_object_quark (), error);
 
     /*
      * as the registration failed we do not
@@ -470,7 +509,7 @@
 signon_identity_get_last_error (SignonIdentity *identity)
 {
     g_return_val_if_fail (SIGNON_IS_IDENTITY (identity), NULL);
-    return _signon_object_last_error(identity);
+    return signon_proxy_get_last_error (identity);
 }
 
 static void
@@ -707,11 +746,10 @@
     operation_data->info_variant = signon_identity_info_to_variant (info);
     operation_data->cb_data = cb_data;
 
-    identity_check_remote_registration (self);
-    _signon_object_call_when_ready (self,
-                                    identity_object_quark(),
-                                    identity_store_credentials_ready_cb,
-                                    operation_data);
+    signon_proxy_call_when_ready (self,
+                                  identity_object_quark(),
+                                  identity_store_credentials_ready_cb,
+                                  operation_data);
 }
 
 /**
@@ -963,11 +1001,10 @@
     operation_data->operation = operation;
     operation_data->cb_data = cb_data;
 
-    identity_check_remote_registration (self);
-    _signon_object_call_when_ready (self,
-                                    identity_object_quark(),
-                                    identity_verify_ready_cb,
-                                    operation_data);
+    signon_proxy_call_when_ready (self,
+                                  identity_object_quark(),
+                                  identity_verify_ready_cb,
+                                  operation_data);
 }
 
 /**
@@ -1309,10 +1346,10 @@
 
     IdentityVoidData *operation_data = g_slice_new0 (IdentityVoidData);
     operation_data->cb_data = cb_data;
-    _signon_object_call_when_ready (self,
-                                    identity_object_quark(),
-                                    identity_info_ready_cb,
-                                    operation_data);
+    signon_proxy_call_when_ready (self,
+                                  identity_object_quark(),
+                                  identity_info_ready_cb,
+                                  operation_data);
 }
 
 /**
@@ -1336,11 +1373,10 @@
 
     DEBUG ("%s %d", G_STRFUNC, __LINE__);
 
-    identity_check_remote_registration (self);
-    _signon_object_call_when_ready (self,
-                                    identity_object_quark(),
-                                    identity_remove_ready_cb,
-                                    cb_data);
+    signon_proxy_call_when_ready (self,
+                                  identity_object_quark(),
+                                  identity_remove_ready_cb,
+                                  cb_data);
 }
 
 /**
@@ -1364,11 +1400,10 @@
     cb_data->cb = (SignonIdentityVoidCb)cb;
     cb_data->user_data = user_data;
 
-    identity_check_remote_registration (self);
-    _signon_object_call_when_ready (self,
-                                    identity_object_quark(),
-                                    identity_signout_ready_cb,
-                                    cb_data);
+    signon_proxy_call_when_ready (self,
+                                  identity_object_quark(),
+                                  identity_signout_ready_cb,
+                                  cb_data);
 }
 
 /**
@@ -1435,7 +1470,6 @@
     cb_data->cb = cb;
     cb_data->user_data = user_data;
 
-    identity_check_remote_registration (self);
     identity_void_operation(self,
                             SIGNON_INFO,
                             cb_data);

=== modified file 'libsignon-glib/signon-identity.h'
--- libsignon-glib/signon-identity.h	2014-12-05 07:15:03 +0000
+++ libsignon-glib/signon-identity.h	2016-07-13 14:51:18 +0000
@@ -4,8 +4,9 @@
  * This file is part of libsignon-glib
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
- * Contact: Alberto Mardegan <[e-mail]>
+ * Contact: Alberto Mardegan <[e-mail]>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License

=== modified file 'libsignon-glib/signon-internals.h'
--- libsignon-glib/signon-internals.h	2012-08-02 10:25:48 +0000
+++ libsignon-glib/signon-internals.h	2016-07-13 14:51:18 +0000
@@ -4,7 +4,7 @@
  * This file is part of libsignon-glib
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== added file 'libsignon-glib/signon-proxy.c'
--- libsignon-glib/signon-proxy.c	1970-01-01 00:00:00 +0000
+++ libsignon-glib/signon-proxy.c	2016-07-13 14:51:18 +0000
@@ -0,0 +1,219 @@
+/* vi: set et sw=4 ts=4 cino=t0,(0: */
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of libsignon-glib
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#include "signon-proxy.h"
+#include "signon-internals.h"
+
+G_DEFINE_INTERFACE (SignonProxy, signon_proxy, G_TYPE_OBJECT)
+
+typedef struct {
+    SignonReadyCb callback;
+    gpointer user_data;
+} SignonReadyCbData;
+
+typedef struct {
+    gpointer self;
+    GSList *callbacks;
+    guint idle_id;
+} SignonReadyData;
+
+static void
+signon_proxy_default_init (SignonProxyInterface *iface)
+{
+    /* add properties and signals to the interface here */
+}
+
+static GQuark
+_signon_proxy_ready_quark()
+{
+  static GQuark quark = 0;
+
+  if (!quark)
+    quark = g_quark_from_static_string ("signon_proxy_ready_quark");
+
+  return quark;
+}
+
+static GQuark
+_signon_proxy_error_quark()
+{
+  static GQuark quark = 0;
+
+  if (!quark)
+    quark = g_quark_from_static_string ("signon_proxy_error_quark");
+
+  return quark;
+}
+
+static void
+signon_proxy_invoke_ready_callbacks (SignonReadyData *rd, const GError *error)
+{
+    GSList *list;
+    /* Make a copy of the callbacks list and erase the pointer in the
+     * structure, to ensure that we won't invoke the same callback twice. */
+    GSList *callbacks = rd->callbacks;
+    rd->callbacks = NULL;
+
+    for (list = callbacks; list != NULL; list = list->next)
+    {
+        SignonReadyCbData *cb = list->data;
+
+        cb->callback (rd->self, error, cb->user_data);
+        g_slice_free (SignonReadyCbData, cb);
+    }
+    g_slist_free (callbacks);
+}
+
+static void
+signon_ready_data_free (SignonReadyData *rd)
+{
+    if (rd->self)
+    {
+        //TODO: Signon error codes need be presented instead of 555 and 666
+        GError error = { 555, 666, "Object disposed" };
+        signon_proxy_invoke_ready_callbacks (rd, &error);
+    }
+    if (rd->idle_id > 0)
+    {
+        g_source_remove (rd->idle_id);
+        rd->idle_id = 0;
+    }
+    g_slice_free (SignonReadyData, rd);
+}
+
+static gboolean
+signon_proxy_call_when_ready_idle (SignonReadyData *rd)
+{
+    if (GPOINTER_TO_INT (g_object_get_qdata((GObject*)rd->self,
+                           _signon_proxy_ready_quark())) == TRUE)
+    {
+        //TODO: specify the last error in object initialization
+        GError * err = g_object_get_qdata((GObject*)rd->self,
+                                          _signon_proxy_error_quark());
+        signon_proxy_invoke_ready_callbacks (rd, err);
+    }
+    else
+    {
+        signon_proxy_setup (SIGNON_PROXY (rd->self));
+    }
+
+    rd->idle_id = 0;
+    return FALSE;
+}
+
+void
+signon_proxy_setup (gpointer self)
+{
+    SignonProxyInterface *iface;
+
+    g_return_if_fail (SIGNON_IS_PROXY (self));
+
+    iface = SIGNON_PROXY_GET_IFACE (self);
+    if (iface->setup != NULL)
+    {
+        iface->setup (self);
+    }
+}
+
+void
+signon_proxy_call_when_ready (gpointer object, GQuark quark, SignonReadyCb callback,
+                              gpointer user_data)
+{
+    SignonReadyData *rd;
+    SignonReadyCbData *cb;
+
+    g_return_if_fail (SIGNON_IS_PROXY (object));
+    g_return_if_fail (quark != 0);
+    g_return_if_fail (callback != NULL);
+
+    cb = g_slice_new (SignonReadyCbData);
+    cb->callback = callback;
+    cb->user_data = user_data;
+
+    rd = g_object_get_qdata ((GObject *)object, quark);
+    if (!rd)
+    {
+        rd = g_slice_new (SignonReadyData);
+        rd->self = object;
+        rd->callbacks = NULL;
+        rd->idle_id = 0;
+        g_object_set_qdata_full ((GObject *)object, quark, rd,
+                                 (GDestroyNotify)signon_ready_data_free);
+    }
+
+    rd->callbacks = g_slist_append (rd->callbacks, cb);
+    if (rd->idle_id == 0)
+    {
+        rd->idle_id =
+            g_idle_add ((GSourceFunc)signon_proxy_call_when_ready_idle, rd);
+    }
+}
+
+void
+signon_proxy_set_ready (gpointer object, GQuark quark, GError *error)
+{
+    SignonReadyData *rd;
+
+    g_return_if_fail (SIGNON_IS_PROXY (object));
+
+    g_object_set_qdata((GObject *)object, _signon_proxy_ready_quark(), GINT_TO_POINTER(TRUE));
+
+    if(error)
+        g_object_set_qdata_full ((GObject *)object, _signon_proxy_error_quark(),
+                                 error,
+                                 (GDestroyNotify)g_error_free);
+
+    rd = g_object_get_qdata ((GObject *)object, quark);
+    if (!rd) return;
+
+    g_object_ref (object);
+
+    signon_proxy_invoke_ready_callbacks (rd, error);
+
+    g_object_unref (object);
+}
+
+void
+signon_proxy_set_not_ready (gpointer object)
+{
+    g_return_if_fail (SIGNON_IS_PROXY (object));
+
+    g_object_set_qdata ((GObject *)object,
+                        _signon_proxy_ready_quark(),
+                        GINT_TO_POINTER(FALSE));
+
+    g_object_set_qdata ((GObject *)object,
+                        _signon_proxy_error_quark(),
+                        NULL);
+}
+
+const GError *
+signon_proxy_get_last_error (gpointer object)
+{
+    g_return_val_if_fail (SIGNON_IS_PROXY (object), NULL);
+
+    return g_object_get_qdata((GObject *)object,
+                              _signon_proxy_error_quark());
+}

=== added file 'libsignon-glib/signon-proxy.h'
--- libsignon-glib/signon-proxy.h	1970-01-01 00:00:00 +0000
+++ libsignon-glib/signon-proxy.h	2016-07-13 14:51:18 +0000
@@ -0,0 +1,65 @@
+/* vi: set et sw=4 ts=4 cino=t0,(0: */
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of libsignon-glib
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2012-2016 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#ifndef _SIGNON_PROXY_H_
+#define _SIGNON_PROXY_H_
+
+#include <glib.h>
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define SIGNON_TYPE_PROXY             (signon_proxy_get_type ())
+G_GNUC_INTERNAL
+G_DECLARE_INTERFACE(SignonProxy, signon_proxy, SIGNON, PROXY, GObject)
+
+typedef void (*SignonReadyCb) (gpointer object, const GError *error,
+                               gpointer user_data);
+
+struct _SignonProxyInterface
+{
+    GTypeInterface parent_iface;
+
+    void (*setup) (SignonProxy *self);
+};
+
+G_GNUC_INTERNAL
+void signon_proxy_setup (gpointer self);
+
+G_GNUC_INTERNAL
+void signon_proxy_call_when_ready (gpointer self, GQuark quark,
+                                   SignonReadyCb callback, gpointer user_data);
+
+G_GNUC_INTERNAL
+void signon_proxy_set_ready (gpointer self, GQuark quark, GError *error);
+
+G_GNUC_INTERNAL
+void signon_proxy_set_not_ready (gpointer self);
+
+G_GNUC_INTERNAL
+const GError *signon_proxy_get_last_error (gpointer self);
+
+G_END_DECLS
+#endif /* _SIGNON_PROXY_H_ */

=== modified file 'libsignon-glib/signon-types.h'
--- libsignon-glib/signon-types.h	2012-11-30 07:38:19 +0000
+++ libsignon-glib/signon-types.h	2016-07-13 14:51:18 +0000
@@ -3,7 +3,7 @@
 /*
  * This file is part of libsignon-glib
  *
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'libsignon-glib/signon-utils.c'
--- libsignon-glib/signon-utils.c	2016-05-04 09:21:44 +0000
+++ libsignon-glib/signon-utils.c	2016-07-13 14:51:18 +0000
@@ -4,7 +4,7 @@
  * This file is part of libsignon-glib
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'libsignon-glib/signon-utils.h'
--- libsignon-glib/signon-utils.h	2012-08-02 10:25:45 +0000
+++ libsignon-glib/signon-utils.h	2016-07-13 14:51:18 +0000
@@ -4,7 +4,7 @@
  * This file is part of libsignon-glib
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'libsignon-glib/sso-auth-service.c'
--- libsignon-glib/sso-auth-service.c	2016-05-04 09:21:44 +0000
+++ libsignon-glib/sso-auth-service.c	2016-07-13 14:51:18 +0000
@@ -3,7 +3,7 @@
 /*
  * This file is part of libsignon-glib
  *
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'libsignon-glib/sso-auth-service.h'
--- libsignon-glib/sso-auth-service.h	2012-08-02 10:25:45 +0000
+++ libsignon-glib/sso-auth-service.h	2016-07-13 14:51:18 +0000
@@ -3,7 +3,7 @@
 /*
  * This file is part of libsignon-glib
  *
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *

=== modified file 'tests/check_signon.c'
--- tests/check_signon.c	2016-05-04 09:22:30 +0000
+++ tests/check_signon.c	2016-07-13 14:51:18 +0000
@@ -3,7 +3,7 @@
  * This file is part of libsignon-glib
  *
  * Copyright (C) 2009-2011 Nokia Corporation.
- * Copyright (C) 2011-2012 Canonical Ltd.
+ * Copyright (C) 2011-2016 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -82,6 +82,23 @@
     }
 }
 
+static gboolean
+quit_loop (gpointer user_data)
+{
+    GMainLoop *loop = user_data;
+    g_main_loop_quit (loop);
+    return FALSE;
+}
+
+static void
+run_main_loop_for_n_seconds(guint seconds)
+{
+    GMainLoop *loop = g_main_loop_new (NULL, FALSE);
+    g_timeout_add_seconds (seconds, quit_loop, loop);
+    g_main_loop_run (loop);
+    g_main_loop_unref (loop);
+}
+
 START_TEST(test_init)
 {
     g_debug("%s", G_STRFUNC);
@@ -220,14 +237,6 @@
 }
 END_TEST
 
-
-static gboolean
-test_quit_main_loop_cb (gpointer data)
-{
-    g_main_loop_quit (main_loop);
-    return FALSE;
-}
-
 static void
 test_auth_session_query_mechanisms_cb (SignonAuthSession *self,
                                       gchar **mechanisms,
@@ -920,7 +929,7 @@
     /* Wait some time to ensure that the info-updated signals are
      * processed
      */
-    g_timeout_add_seconds (2, test_quit_main_loop_cb, main_loop);
+    g_timeout_add_seconds (2, quit_loop, main_loop);
 }
 
 START_TEST(test_store_credentials_identity)
@@ -949,7 +958,6 @@
                                                  &last_id);
     g_hash_table_destroy (methods);
 
-    g_timeout_add (1000, test_quit_main_loop_cb, idty);
     g_main_loop_run (main_loop);
 
     g_object_unref(idty);
@@ -995,6 +1003,8 @@
     gchar secret[] = "007";
     gchar caption[] = "caption";
 
+    main_loop = g_main_loop_new (NULL, FALSE);
+
     signon_identity_store_credentials_with_args (idty,
                                                  username,
                                                  secret,
@@ -1006,7 +1016,7 @@
                                                  0,
                                                  store_credentials_identity_cb,
                                                  NULL);
-    main_loop = g_main_loop_new (NULL, FALSE);
+    g_main_loop_run (main_loop);
 
     signon_identity_verify_secret(idty,
                                  secret,
@@ -1264,12 +1274,10 @@
     signon_identity_remove(idty2, identity_remove_cb, NULL);
     g_main_loop_run (main_loop);
 
-    /*
-     * no main_loops required as
-     * the callback is executed immediately
-     * */
     signon_identity_query_info (idty2, identity_info_cb, NULL);
+    g_main_loop_run (main_loop);
     signon_identity_query_info (idty, identity_info_cb, NULL);
+    g_main_loop_run (main_loop);
 
     signon_identity_info_free (info);
     g_object_unref (idty);
@@ -1323,8 +1331,7 @@
     SignonIdentity *idty2 = signon_identity_new_from_db (id);
 
     /* wait some more time to ensure that the object gets registered */
-    g_timeout_add_seconds (2, test_quit_main_loop_cb, main_loop);
-    g_main_loop_run (main_loop);
+    run_main_loop_for_n_seconds(2);
 
     signon_identity_info_free (info);
 
@@ -1389,7 +1396,7 @@
     /*
      * give time to handle unregistered signal
      * */
-    g_timeout_add_seconds (5, test_quit_main_loop_cb, main_loop);
+    //run_main_loop_for_n_seconds(5);
 
     signon_identity_query_info (idty, identity_info_cb, &info);
     g_main_loop_run (main_loop);
@@ -1404,6 +1411,12 @@
 
 START_TEST(test_unregistered_auth_session)
 {
+    GVariantBuilder builder;
+    GVariant *session_data;
+    GVariant *reply = NULL;
+    gchar *username;
+    gboolean ok;
+
     g_debug("%s", G_STRFUNC);
     SignonIdentity *idty = signon_identity_new();
     fail_unless (idty != NULL);
@@ -1417,8 +1430,7 @@
                                                           "ssotest",
                                                            &err);
     /* give time to register the objects */
-    g_timeout_add_seconds (2, test_quit_main_loop_cb, main_loop);
-    g_main_loop_run (main_loop);
+    run_main_loop_for_n_seconds(2);
 
     /*
      * give the time for identity to became idle
@@ -1426,12 +1438,32 @@
     sleep(SIGNOND_IDLE_TIMEOUT);
     SignonIdentity *idty2 = signon_identity_new();
 
-    /*
-     * give time to handle unregistered signal
-     * */
-    g_timeout_add_seconds (5, test_quit_main_loop_cb, main_loop);
+    g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
+    g_variant_builder_add (&builder, "{sv}",
+                           SIGNON_SESSION_DATA_USERNAME,
+                           g_variant_new_string ("test_username"));
+    g_variant_builder_add (&builder, "{sv}",
+                           SIGNON_SESSION_DATA_SECRET,
+                           g_variant_new_string ("test_pw"));
+
+    session_data = g_variant_builder_end (&builder);
+
+    signon_auth_session_process_async (as,
+                                       session_data,
+                                       "mech1",
+                                       NULL,
+                                       test_auth_session_process_async_cb,
+                                       &reply);
     g_main_loop_run (main_loop);
 
+    fail_unless (reply != NULL);
+    session_data = NULL;
+
+    ok = g_variant_lookup (reply, SIGNON_SESSION_DATA_USERNAME, "&s", &username);
+    ck_assert (ok);
+    ck_assert_str_eq (username, "test_username");
+
+    g_variant_unref (reply);
 
     gchar* patterns[4];
     patterns[0] = g_strdup("mech1");
@@ -1453,6 +1485,8 @@
     g_free (patterns[1]);
     g_free (patterns[2]);
     g_free (patterns[3]);
+
+    end_test ();
 }
 END_TEST
 

=== modified file 'tests/signon-glib-test.sh'
--- tests/signon-glib-test.sh	2016-05-03 09:43:43 +0000
+++ tests/signon-glib-test.sh	2016-07-13 14:51:18 +0000
@@ -3,9 +3,9 @@
 # Environment variables for the signon daemon
 export SSO_LOGGING_LEVEL=2
 export SSO_STORAGE_PATH="/tmp"
-export SSO_DAEMON_TIMEOUT=5
-export SSO_IDENTITY_TIMEOUT=5
-export SSO_AUTHSESSION_TIMEOUT=5
+export SSO_DAEMON_TIMEOUT=1
+export SSO_IDENTITY_TIMEOUT=3
+export SSO_AUTHSESSION_TIMEOUT=3
 export SSO_EXTENSIONS_DIR="/tmp" # this disables all extensions
 
 #Environment variables for the test application
@@ -25,7 +25,8 @@
 # session
 if command -v dbus-test-runner > /dev/null ; then
     echo "Using dbus-test-runner"
-    dbus-test-runner -m 180 -t signond -r \
+    dbus-test-runner -m 180 --keep-env \
+        -t signond -r \
         -t "$TEST_APP" -f com.google.code.AccountsSSO.SingleSignOn
 else
     echo "Using existing D-Bus session"