aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-01-08 17:39:11 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-01-08 17:50:48 +0800
commit620122e5b41b4ae529ffcdb927b6b4898d98b5f3 (patch)
treee579cf71583f320d24f680513a1df37d4587dde7 /libempathy
parent273ef9afeabc1de111d4b890dccb3e9153c8c3b1 (diff)
downloadgsoc2013-empathy-620122e5b41b4ae529ffcdb927b6b4898d98b5f3.tar
gsoc2013-empathy-620122e5b41b4ae529ffcdb927b6b4898d98b5f3.tar.gz
gsoc2013-empathy-620122e5b41b4ae529ffcdb927b6b4898d98b5f3.tar.bz2
gsoc2013-empathy-620122e5b41b4ae529ffcdb927b6b4898d98b5f3.tar.lz
gsoc2013-empathy-620122e5b41b4ae529ffcdb927b6b4898d98b5f3.tar.xz
gsoc2013-empathy-620122e5b41b4ae529ffcdb927b6b4898d98b5f3.tar.zst
gsoc2013-empathy-620122e5b41b4ae529ffcdb927b6b4898d98b5f3.zip
account-settings: early return if SASL earlier
We should update the URI schemes and service even if the account uses SASL, so it has to be done *before* the early return. I did not hit this bug before as the only CM on which we use URI schemes (rakia) was not implementing SASL channel when I implemented this feature. https://bugzilla.gnome.org/show_bug.cgi?id=691195
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-account-settings.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 8731479be..a0e42cc77 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -1327,6 +1327,12 @@ empathy_account_settings_account_updated (GObject *source,
goto out;
}
+ update_account_uri_schemes (settings);
+ update_account_service (settings);
+
+ g_simple_async_result_set_op_res_gboolean (priv->apply_result,
+ g_strv_length (reconnect_required) > 0);
+
/* Only set the password in the keyring if the CM supports SASL. */
if (priv->supports_sasl)
{
@@ -1348,12 +1354,6 @@ empathy_account_settings_account_updated (GObject *source,
return;
}
- update_account_uri_schemes (settings);
- update_account_service (settings);
-
- g_simple_async_result_set_op_res_gboolean (priv->apply_result,
- g_strv_length (reconnect_required) > 0);
-
out:
empathy_account_settings_discard_changes (settings);