aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-08-27 22:41:13 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-08-28 15:08:47 +0800
commit2f87cddf8c0bec795fa06cc4ce5f15e5c755748a (patch)
treeeeea268f5e7270b66a5ba88c2d82c854a1257e54 /src
parentbc717ec969a0e02477208304d50872344744dbae (diff)
downloadgsoc2013-empathy-2f87cddf8c0bec795fa06cc4ce5f15e5c755748a.tar.gz
gsoc2013-empathy-2f87cddf8c0bec795fa06cc4ce5f15e5c755748a.tar.zst
gsoc2013-empathy-2f87cddf8c0bec795fa06cc4ce5f15e5c755748a.zip
auth-client: wait for the migration code to be done before starting the timer
Diffstat (limited to 'src')
-rw-r--r--src/empathy-auth-client.c12
1 files 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 ();