diff options
| author | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-08-22 21:02:12 +0800 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-08-22 22:55:45 +0800 |
| commit | 793497ef17da9a0d9b6c5d95fb62826787e46a14 (patch) | |
| tree | a77b9a7103a9b055bcdbc6f3686972c2a7a2bcae | |
| parent | 82f3ed08b45446a8fcf258a0d2202c18defdcf8f (diff) | |
| download | gsoc2013-empathy-793497ef17da9a0d9b6c5d95fb62826787e46a14.tar gsoc2013-empathy-793497ef17da9a0d9b6c5d95fb62826787e46a14.tar.gz gsoc2013-empathy-793497ef17da9a0d9b6c5d95fb62826787e46a14.tar.bz2 gsoc2013-empathy-793497ef17da9a0d9b6c5d95fb62826787e46a14.tar.lz gsoc2013-empathy-793497ef17da9a0d9b6c5d95fb62826787e46a14.tar.xz gsoc2013-empathy-793497ef17da9a0d9b6c5d95fb62826787e46a14.tar.zst gsoc2013-empathy-793497ef17da9a0d9b6c5d95fb62826787e46a14.zip | |
UOA: Changing enable state of MC account should not modify per-service state
ag_account_set_enabled() is not global enable state, we have to ensure that
selected service is NULL before that.
| -rw-r--r-- | ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c b/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c index 20b8f0949..c0ff400f6 100644 --- a/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c +++ b/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c @@ -542,6 +542,9 @@ account_manager_uoa_set (const McpAccountStorage *storage, if (!tp_strdiff (key, "Enabled")) { + /* Enabled is a global setting on the account, not per-services, + * unfortunately */ + ag_account_select_service (account, NULL); ag_account_set_enabled (account, !tp_strdiff (val, "true")); } else if (!tp_strdiff (key, "DisplayName")) |