Commit 38069d2a authored by Guillaume Desmottes's avatar Guillaume Desmottes

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).
parent 902b24c5
......@@ -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));
}
......
......@@ -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;
}
......
......@@ -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)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment