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

[Christian Hilberg <chilberg src gnome org>]

commit 22c5189c13e0f7525897a3916495a36d8cb8fef9
Merge: c0a4708 1c8c8ab
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Thu Mar 8 12:11:04 2012 +0100

    Merge branch 'ek-wip-porting'

 Doxyfile                                           | 1332 ++++++++++----------
 src/camel/camel-kolab-imapx-conn-manager.c         |  155 ++-
 src/camel/camel-kolab-imapx-conn-manager.h         |    1 -
 src/camel/camel-kolab-imapx-folder.c               |    2 +-
 src/camel/camel-kolab-imapx-server.c               |   22 +
 src/camel/camel-kolab-imapx-server.h               |    7 +
 src/camel/camel-kolab-imapx-store.c                |    6 +-
 src/camel/providers/VERSIONS                       |    2 +-
 src/camel/providers/imapx/Makefile.am              |    1 +
 src/camel/providers/imapx/camel-imapx-command.c    |    4 +-
 .../providers/imapx/camel-imapx-conn-manager.c     |    2 +-
 .../imapx/camel-imapx-extd-conn-manager-friend.h   |   46 +
 .../imapx/camel-imapx-extd-conn-manager.c          |   33 +-
 .../providers/imapx/camel-imapx-extd-server.c      |   12 +-
 .../providers/imapx/camel-imapx-extd-server.h      |    2 +-
 src/camel/providers/imapx/camel-imapx-extd-store.c |   47 +-
 src/camel/providers/imapx/camel-imapx-folder.c     |   20 +
 .../providers/imapx/camel-imapx-server-defs.h      |    2 +
 src/camel/providers/imapx/camel-imapx-server.c     |   26 +-
 19 files changed, 990 insertions(+), 732 deletions(-)
---