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

[Christian Hilberg <chilberg src gnome org>]

commit baf732d21673cc9a0b28405579b57ac36d04b74b
Merge: 2fc128f da01c6a
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Thu Feb 2 11:08:45 2012 +0100

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

 src/camel/providers/imapx/camel-imapx-command.c  |  130 ++++++++++++++++++++++
 src/camel/providers/imapx/camel-imapx-command.h  |   44 +++++++-
 src/camel/providers/imapx/camel-imapx-job.h      |    2 +-
 src/camel/providers/imapx/camel-imapx-provider.c |    2 -
 src/camel/providers/imapx/camel-imapx-server.c   |   91 ++++++++-------
 src/camel/providers/imapx/camel-imapx-server.h   |    7 +-
 6 files changed, 224 insertions(+), 52 deletions(-)
---
diff --cc src/camel/providers/imapx/camel-imapx-provider.c
index f98167a,116ff13..8e2310c
--- a/src/camel/providers/imapx/camel-imapx-provider.c
+++ b/src/camel/providers/imapx/camel-imapx-provider.c
@@@ -119,12 -119,8 +119,10 @@@ CamelServiceAuthType camel_imapx_passwo
  	TRUE
  };
  
 +#if 0
  void camel_imapx_module_init (void);
 +#endif
  
- extern void imapx_utils_init (void);
- 
  void
  camel_imapx_module_init (void)
  {