[Pkg-telepathy-commits] [telepathy-mission-control-6] 235/280: Merge branch 'account-rework-27727-round4'

[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 79f0081b0a50ab59794827dd5af79f8671870fcd
Merge: 0e2b32c 0b2293f
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Jan 30 12:34:04 2014 +0000

    Merge branch 'account-rework-27727-round4'
    
    Reviewed-by: Xavier Claessens <xavier.claessens at collabora.co.uk>
    Bug: https://bugs.freedesktop.org/show_bug.cgi?id=27727

 configure.ac                                       |   2 +-
 mission-control-plugins/account-storage.c          | 598 +++++++--------
 mission-control-plugins/account-storage.h          | 203 ++---
 mission-control-plugins/account.c                  | 286 +------
 mission-control-plugins/account.h                  |  45 +-
 mission-control-plugins/implementation.h           |  48 +-
 mission-control-plugins/loader.c                   |  15 +
 mission-control-plugins/mission-control-plugins.h  |   9 +-
 src/mcd-account-addressing.c                       |   4 +-
 src/mcd-account-manager-default.c                  | 517 ++++++-------
 src/mcd-account-manager-default.h                  |   1 -
 src/mcd-account-manager.c                          | 278 +++----
 src/mcd-account-manager.h                          |   9 -
 src/mcd-account.c                                  | 283 +++----
 src/mcd-account.h                                  |  23 +-
 src/mcd-storage.c                                  | 826 ++++++---------------
 src/mcd-storage.h                                  |  22 +-
 tests/twisted/Makefile.am                          |   9 +-
 tests/twisted/account-manager/auto-connect.py      |   9 +-
 tests/twisted/account-manager/avatar-refresh.py    |  22 +-
 tests/twisted/account-manager/bad-cm.py            |  11 +-
 tests/twisted/account-storage/5-12.py              |  29 +
 tests/twisted/account-storage/5-14.py              |  29 +
 tests/twisted/account-storage/create-new.py        | 136 ++++
 .../account-storage/default-keyring-storage.py     | 317 --------
 tests/twisted/account-storage/load-keyfiles.py     | 274 +++++++
 tests/twisted/account-storage/storage_helper.py    | 174 +++++
 tests/twisted/dbus-account-plugin.c                | 521 ++++++-------
 tests/twisted/mc-debug-server.c                    |  30 +-
 tests/twisted/mcp-account-diversion.c              | 259 +++++--
 tests/twisted/mctest.py                            |  38 +-
 31 files changed, 2341 insertions(+), 2686 deletions(-)

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