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

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);