[Pkg-telepathy-commits] [telepathy-mission-control-6] 210/280: McdAccountManagerDefault: don't try to save "absent" accounts

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-mission-control-6.

commit 2257fbc2b95c00719aac0d8707643c05785dda4e
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Nov 15 15:04:18 2013 +0000

    McdAccountManagerDefault: don't try to save "absent" accounts
    
    These are empty account records corresponding to empty files in a
    high-priority directory, which only exist to "mask" an account
    of the same name in a lower-priority directory.
    
    Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27727
---
 src/mcd-account-manager-default.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/mcd-account-manager-default.c b/src/mcd-account-manager-default.c
index db0ede9..0b9acc6 100644
--- a/src/mcd-account-manager-default.c
+++ b/src/mcd-account-manager-default.c
@@ -543,6 +543,11 @@ _commit (const McpAccountStorage *self,
     {
       if (account == NULL || !tp_strdiff (account, account_p))
         {
+          McdDefaultStoredAccount *sa = sa_p;
+
+          if (sa->absent)
+            continue;
+
           if (!am_default_commit_one (amd, account_p, sa_p))
             all_succeeded = FALSE;
         }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-6.git