[evolution-activesync: 2/2] Merge ssh://git.gnome.org/git/evolution-activesync

[dwmw2 <dwmw2 src gnome org>]

commit 33a2de13fe23fae27dd44f8896d6d8e0c3633a14
Merge: 67ea594 d168f43
Author: David Woodhouse <David Woodhouse intel com>
Date:   Thu Aug 13 11:55:39 2015 +0100

    Merge ssh://git.gnome.org/git/evolution-activesync

 Makefile.am                                        |   10 +-
 README                                             |    2 +-
 TODO                                               |    4 +-
 check_tests/eas_connection_tests.c                 |    2 +-
 collection/e-eas-backend-factory.c                 |    4 +
 collection/e-eas-backend.c                         |   15 +-
 collection/module-eas-backend.c                    |    2 +
 configtool/activesync-setup.sh                     |   23 +-
 configuration/Makefile.am                          |    4 +-
 configuration/e-mail-config-eas-backend.c          |   77 ++-
 configuration/module-eas-mail-config.c             |    2 +
 configure.ac                                       |   13 +-
 eas-daemon/libeas/Makefile.am                      |    8 +-
 eas-daemon/libeas/eas-2way-sync-req.c              |    6 +-
 eas-daemon/libeas/eas-connection.c                 |   75 ++--
 eas-daemon/libeas/eas-connection.h                 |   11 +-
 eas-daemon/libeas/eas-sync-folder-msg.c            |   12 +-
 eas-daemon/libeas/eas-sync-req.c                   |    6 +-
 eplugin/Makefile.am                                |   72 ---
 eplugin/activesync-account-setup.c                 |  673 --------------------
 eplugin/eas-account-listener.c                     |  571 -----------------
 eplugin/eas-account-listener.h                     |   57 --
 eplugin/org-gnome-evolution-activesync.eplug.xml   |   28 -
 eplugin/org-gnome-evolution-activesync.error.xml   |    4 -
 libeasaccount/src/Makefile.am                      |    4 +-
 libeasaccount/src/eas-account-list.c               |  563 +++++------------
 libeasaccount/src/eas-account-list.h               |   24 +-
 libeasclient/libeasmail.h                          |    2 +-
 .../meego-ux-settings-activesync.qmlproject        |    2 -
 org.meego.activesyncd.account.gschema.xml          |   31 +
 org.meego.activesyncd.gschema.xml                  |   13 +
 po/POTFILES.in                                     |    4 +-
 32 files changed, 393 insertions(+), 1931 deletions(-)
---