[evolution-kolab: 9/9] Merge branch 'ek-wip-porting'

[Christian Hilberg <chilberg src gnome org>]

commit d74f0ee80cfac3aa56f366e45fd83401b68f5859
Merge: 9cde63c 92e1d4a
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Wed Mar 14 11:41:13 2012 +0100

    Merge branch 'ek-wip-porting'

 src/camel/camel-kolab-imapx-conn-manager.c         |   10 +-
 src/camel/camel-kolab-imapx-server.c               |  374 +------
 src/camel/camel-kolab-imapx-server.h               |   36 +-
 src/camel/camel-kolab-imapx-store.c                | 1196 ++++++++------------
 src/camel/camel-kolab-imapx-store.h                |    6 -
 src/camel/camel-kolab-session.c                    |  381 ++++---
 src/camel/camel-kolab-session.h                    |   31 +-
 .../providers/imapx/camel-imapx-extd-folder.c      |   11 +-
 src/camel/providers/imapx/camel-imapx-extd-store.c |   12 +-
 src/libekolab/kolab-mail-imap-client.c             |  277 ++---
 src/libekolab/kolab-mail-info-db.c                 |   10 +-
 src/libekolab/kolab-settings-handler.c             |   72 ++
 src/libekolab/kolab-settings-handler.h             |    7 +-
 src/libekolab/kolab-util-backend.c                 |  129 ++-
 src/libekolab/kolab-util-backend.h                 |    4 +
 src/libekolabutil/kolab-util-camel.h               |   10 +-
 16 files changed, 1068 insertions(+), 1498 deletions(-)
---