From: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date: Wed, 22 Aug 2012 13:02:12 +0000 (+0200)
Subject: UOA: Changing enable state of MC account should not modify per-service state
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=793497ef17da9a0d9b6c5d95fb62826787e46a14;hp=82f3ed08b45446a8fcf258a0d2202c18defdcf8f

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.
---

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 20b8f094..c0ff400f 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"))