]> git.0d.be Git - empathy.git/commitdiff
auth-client: wait for the migration code to be done before starting the timer
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 27 Aug 2012 14:41:13 +0000 (16:41 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 28 Aug 2012 07:08:47 +0000 (09:08 +0200)
src/empathy-auth-client.c

index 529f3734f3a32db4d6fcd94625abde8f0cc47a6d..d1f905c4f734400a1175f412d19f47df1cd8c742 100644 (file)
@@ -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 ();