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

[Christian Hilberg <chilberg src gnome org>]

commit a78ab08411e603a4c1bf0033b96c2a9d8d66bdeb
Merge: 9edde79 58a4c46
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Tue Feb 7 19:50:09 2012 +0100

    Merge branch 'ek-wip-porting'

 src/camel/camel-kolab-imapx-provider.c             |    6 +-
 src/camel/providers/imapx/Makefile.am              |    2 +
 .../providers/imapx/camel-imapx-extd-folder.c      |   29 +++++-
 .../providers/imapx/camel-imapx-extd-folder.h      |    2 +
 .../providers/imapx/camel-imapx-folder-defs.h      |   50 ++++++++++
 .../providers/imapx/camel-imapx-folder-friend.h    |   47 +++++++++
 src/camel/providers/imapx/camel-imapx-folder.c     |  101 +++++++++++++++++++-
 src/camel/providers/imapx/camel-imapx-folder.h     |    2 +
 src/camel/providers/imapx/camel-imapx-provider.c   |    4 +-
 src/camel/providers/imapx/camel-imapx-settings.c   |   65 +++++++++++++
 src/camel/providers/imapx/camel-imapx-settings.h   |    5 +
 11 files changed, 305 insertions(+), 8 deletions(-)
---