Updated Swedish translation

[empathy.git] / src / empathy-auth-client.c

diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c
index ec433ca97156c47ef40d6195c24bbb21cd0c31a8..be5b13a0b437dfd89d054afb923850fc343af069 100644 (file)
--- a/src/empathy-auth-client.c
+++ b/src/empathy-auth-client.c
@@ -19,33 +19,22 @@
  * Authors: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
  */
 
-#include <config.h>
+#include "config.h"
 
-#include <stdlib.h>
-#include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-#include <telepathy-glib/debug-sender.h>
-
-#define DEBUG_FLAG EMPATHY_DEBUG_TLS
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-auth-factory.h>
-#include <libempathy/empathy-server-sasl-handler.h>
-#include <libempathy/empathy-server-tls-handler.h>
-#include <libempathy/empathy-tls-verifier.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-bad-password-dialog.h>
-#include <libempathy-gtk/empathy-password-dialog.h>
-#include <libempathy-gtk/empathy-tls-dialog.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include <gnutls/gnutls.h>
 
+#include "empathy-auth-factory.h"
+#include "empathy-bad-password-dialog.h"
+#include "empathy-password-dialog.h"
 #include "empathy-sanity-cleaning.h"
+#include "empathy-server-tls-handler.h"
+#include "empathy-tls-dialog.h"
+#include "empathy-tls-verifier.h"
+#include "empathy-ui-utils.h"
 
-#include <gnutls/gnutls.h>
-
-#include <extensions/extensions.h>
+#define DEBUG_FLAG EMPATHY_DEBUG_TLS
+#include "empathy-debug.h"
 
 #define TIMEOUT 60
 
@@ -274,6 +263,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 +352,8 @@ main (int argc,
       use_timer = FALSE;
     }
 
-  start_timer ();
-  empathy_sanity_checking_run_if_needed ();
+  /* Wait for the migration code to be done before starting the timer */
+  empathy_sanity_checking_run_async (sanity_cb, NULL);
 
   gtk_main ();