From 2f87cddf8c0bec795fa06cc4ce5f15e5c755748a Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 27 Aug 2012 16:41:13 +0200
Subject: auth-client: wait for the migration code to be done before starting
 the timer

---
 src/empathy-auth-client.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c
index 529f3734f..d1f905c4f 100644
--- a/src/empathy-auth-client.c
+++ b/src/empathy-auth-client.c
@@ -274,6 +274,14 @@ auth_factory_auth_passsword_failed (EmpathyAuthFactory *factory,
   gtk_widget_show (dialog);
 }
 
+static void
+sanity_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  start_timer ();
+}
+
 int
 main (int argc,
     char **argv)
@@ -355,8 +363,8 @@ main (int argc,
       use_timer = FALSE;
     }
 
-  start_timer ();
-  empathy_sanity_checking_run_async (NULL, NULL);
+  /* Wait for the migration code to be done before starting the timer */
+  empathy_sanity_checking_run_async (sanity_cb, NULL);
 
   gtk_main ();
 
-- 
cgit v1.2.3