That way we only try to create the account if the assistant properly
terminates (#607436).
#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>
if (priv->is_creating)
return;
+ create_salut_account_if_needed ();
+
gtk_widget_destroy (GTK_WIDGET (assistant));
}
if (!empathy_import_mc4_accounts (managers) && !start_hidden)
maybe_show_account_assistant ();
- create_salut_account_if_needed ();
g_object_unref (managers);
return TRUE;
}
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)