[empathy] Call create_salut_account_if_needed when the assistant is closed

[Guillaume Desmottes <gdesmott src gnome org>]

commit 38069d2a7ed386cc85876aaefaa0dee9cd2ee484
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Jan 19 15:11:16 2010 +0000

    Call create_salut_account_if_needed when the assistant is closed
    
    That way we only try to create the account if the assistant properly
    terminates (#607436).

 src/empathy-account-assistant.c |    3 +++
 src/empathy.c                   |    1 -
 tests/interactive/Makefile.am   |    3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index e0e230e..a80e47c 100644
--- a/src/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -27,6 +27,7 @@
 #include "empathy-account-assistant.h"
 #include "empathy-import-widget.h"
 #include "empathy-import-utils.h"
+#include "empathy-auto-salut-account-helper.h"
 
 #include <libempathy/empathy-account-settings.h>
 #include <libempathy/empathy-utils.h>
@@ -755,6 +756,8 @@ account_assistant_close_cb (GtkAssistant *assistant,
   if (priv->is_creating)
     return;
 
+  create_salut_account_if_needed ();
+
   gtk_widget_destroy (GTK_WIDGET (assistant));
 }
 
diff --git a/src/empathy.c b/src/empathy.c
index 1d25e92..63083f6 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -208,7 +208,6 @@ check_connection_managers_ready (EmpathyConnectionManagers *managers)
       if (!empathy_import_mc4_accounts (managers) && !start_hidden)
         maybe_show_account_assistant ();
 
-      create_salut_account_if_needed ();
       g_object_unref (managers);
       return TRUE;
     }
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index 7770e76..74403b5 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -31,7 +31,8 @@ test_empathy_account_assistant_SOURCES = test-empathy-account-assistant.c
 test_empathy_account_assistant_CFLAGS = -I$(top_srcdir)/src
 test_empathy_account_assistant_LDADD = 			\
 	$(top_builddir)/src/empathy-account-assistant.o	\
-	$(top_builddir)/src/empathy-import-utils.o	\
+	$(top_builddir)/src/empathy-auto-salut-account-helper.o	\
 	$(top_builddir)/src/empathy-import-pidgin.o	\
+	$(top_builddir)/src/empathy-import-utils.o	\
 	$(top_builddir)/src/empathy-import-widget.o	\
 	$(LDADD)