[empathy] auth-client: wait for the migration code to be done before starting the timer
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] auth-client: wait for the migration code to be done before starting the timer
- Date: Tue, 28 Aug 2012 07:09:10 +0000 (UTC)
commit 2f87cddf8c0bec795fa06cc4ce5f15e5c755748a
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Mon Aug 27 16:41:13 2012 +0200
auth-client: wait for the migration code to be done before starting the timer
src/empathy-auth-client.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c
index 529f373..d1f905c 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 ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]