aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-01-19 23:11:16 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-01-20 00:11:11 +0800
commit38069d2a7ed386cc85876aaefaa0dee9cd2ee484 (patch)
tree2b63b4b653bbd74d4cbfd73fa9a92addcdc58435 /src
parent902b24c56151985da6eadedc748803d686a07a62 (diff)
downloadgsoc2013-empathy-38069d2a7ed386cc85876aaefaa0dee9cd2ee484.tar
gsoc2013-empathy-38069d2a7ed386cc85876aaefaa0dee9cd2ee484.tar.gz
gsoc2013-empathy-38069d2a7ed386cc85876aaefaa0dee9cd2ee484.tar.bz2
gsoc2013-empathy-38069d2a7ed386cc85876aaefaa0dee9cd2ee484.tar.lz
gsoc2013-empathy-38069d2a7ed386cc85876aaefaa0dee9cd2ee484.tar.xz
gsoc2013-empathy-38069d2a7ed386cc85876aaefaa0dee9cd2ee484.tar.zst
gsoc2013-empathy-38069d2a7ed386cc85876aaefaa0dee9cd2ee484.zip
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).
Diffstat (limited to 'src')
-rw-r--r--src/empathy-account-assistant.c3
-rw-r--r--src/empathy.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index e0e230e43..a80e47c92 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 1d25e9247..63083f609 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;
}