diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-01-08 19:38:01 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-01-08 19:38:01 +0800 |
| commit | 5dd66017b88e4a0d248ff75e26f12c45a959a7fa (patch) | |
| tree | 3c615b376a4c3cdda96b86b5b8ff1d15644b51f2 /libempathy/empathy-account-settings.c | |
| parent | 7fd0b32b8fb6ad3fe29c46ed2afe2bdd25d6687e (diff) | |
| parent | d95a09bded20a2cccf0847f4663fd075536399ca (diff) | |
| download | gsoc2013-empathy-5dd66017b88e4a0d248ff75e26f12c45a959a7fa.tar gsoc2013-empathy-5dd66017b88e4a0d248ff75e26f12c45a959a7fa.tar.gz gsoc2013-empathy-5dd66017b88e4a0d248ff75e26f12c45a959a7fa.tar.bz2 gsoc2013-empathy-5dd66017b88e4a0d248ff75e26f12c45a959a7fa.tar.lz gsoc2013-empathy-5dd66017b88e4a0d248ff75e26f12c45a959a7fa.tar.xz gsoc2013-empathy-5dd66017b88e4a0d248ff75e26f12c45a959a7fa.tar.zst gsoc2013-empathy-5dd66017b88e4a0d248ff75e26f12c45a959a7fa.zip | |
Merge branch 'gnome-3-6'
Diffstat (limited to 'libempathy/empathy-account-settings.c')
| -rw-r--r-- | libempathy/empathy-account-settings.c | 12 |
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); |