[evolution-kolab/ek-wip-porting-imapx: 2/3] Merge branch 'EDS_IMAPX_nobuild' into ek-wip-porting-imapx

[Christian Hilberg <chilberg src gnome org>]

commit 9690e8b73b768919055d35b6109237c38b3358cc
Merge: affd0d4 82f5748
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Mon Jan 16 19:51:11 2012 +0100

    Merge branch 'EDS_IMAPX_nobuild' into ek-wip-porting-imapx

 src/camel/providers/imapx/camel-imapx-server.c   |  101 +++++++++++++++-------
 src/camel/providers/imapx/camel-imapx-settings.c |   94 ++++++++++++++++++--
 src/camel/providers/imapx/camel-imapx-settings.h |    4 +
 src/camel/providers/imapx/camel-imapx-store.c    |   24 ++++--
 4 files changed, 172 insertions(+), 51 deletions(-)
---