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

[Christian Hilberg <chilberg src gnome org>]

commit 2fc128f10b63a066999de663328a06e2896f4f7c
Merge: d166938 5c6b973
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Wed Feb 1 17:29:01 2012 +0100

    Merge branch 'EDS_IMAPX_nobuild' into ek-wip-porting-imapx
    
    Conflicts:
    	src/camel/providers/imapx/Makefile.am
    	src/camel/providers/imapx/camel-imapx-conn-manager.c
    	src/camel/providers/imapx/camel-imapx-server.c

 src/camel/providers/imapx/Makefile.am              |    4 +
 src/camel/providers/imapx/camel-imapx-command.c    |  538 +++
 src/camel/providers/imapx/camel-imapx-command.h    |  120 +
 .../providers/imapx/camel-imapx-conn-manager.c     |  583 +++-
 src/camel/providers/imapx/camel-imapx-job.c        |  243 ++
 src/camel/providers/imapx/camel-imapx-job.h        |   78 +
 src/camel/providers/imapx/camel-imapx-server.c     | 3602 ++++++++++----------
 src/camel/providers/imapx/camel-imapx-server.h     |   22 +-
 src/camel/providers/imapx/camel-imapx-store.c      |   17 +-
 src/camel/providers/imapx/camel-imapx-utils.c      |   38 +-
 src/camel/providers/imapx/camel-imapx-utils.h      |    2 +-
 11 files changed, 3139 insertions(+), 2108 deletions(-)
---
diff --cc src/camel/providers/imapx/Makefile.am
index edb7224,8d76c5a..6eedd64
--- a/src/camel/providers/imapx/Makefile.am
+++ b/src/camel/providers/imapx/Makefile.am
@@@ -3,32 -3,20 +3,34 @@@ noinst_LTLIBRARIES = libcamelimapx.l
  
  libcamelimapx_la_CPPFLAGS = \
  	$(AM_CPPFLAGS)				\
 -	-I..					\
 -	-I$(srcdir)/..				\
 -	-I$(top_srcdir)/camel			\
 -	-I$(top_srcdir)				\
  	$(CAMEL_CFLAGS)				\
 -	-DG_LOG_DOMAIN=\"camel-imapx\"
 +	$(SQLITE_CFLAGS)			\
 +	$(GLIB_CFLAGS)				\
 +	$(KOLAB_INCLUDE)			\
 +	-DG_LOG_DOMAIN=\"camel-imapx-extd\"
 +
 +libcamelimapx_la_CFLAGS = \
 +	$(CFLAGS)				\
 +	$(ADD_CFLAGS)				\
 +	$(SQLITE_CFLAGS)			\
 +	$(GLIB_CFLAGS)				\
 +	-std=gnu99				\
 +	-Wno-missing-field-initializers		\
 +	-Wno-unused-parameter			\
 +	-Wno-switch-default			\
 +	-Wno-format
  
  libcamelimapx_la_SOURCES =			\
+ 	camel-imapx-command.c			\
  	camel-imapx-conn-manager.c		\
 +	camel-imapx-extd-conn-manager.c		\
  	camel-imapx-folder.c			\
 +	camel-imapx-extd-folder.c		\
+ 	camel-imapx-job.c			\
 +	camel-imapx-metadata.c			\
  	camel-imapx-provider.c			\
  	camel-imapx-server.c			\
 +	camel-imapx-extd-server.c		\
  	camel-imapx-settings.c			\
  	camel-imapx-store-summary.c		\
  	camel-imapx-store.c			\
@@@ -38,17 -25,11 +40,19 @@@
  	camel-imapx-utils.c
  
  noinst_HEADERS =				\
+ 	camel-imapx-command.h			\
  	camel-imapx-conn-manager.h		\
 +	camel-imapx-conn-manager-defs.h		\
 +	camel-imapx-conn-manager-friend.h	\
 +	camel-imapx-extd-conn-manager.h		\
  	camel-imapx-folder.h			\
 +	camel-imapx-extd-folder.h		\
+ 	camel-imapx-job.h			\
 +	camel-imapx-metadata.h			\
  	camel-imapx-server.h			\
 +	camel-imapx-server-defs.h		\
 +	camel-imapx-server-friend.h		\
 +	camel-imapx-extd-server.h		\
  	camel-imapx-settings.h			\
  	camel-imapx-store-summary.h		\
  	camel-imapx-store.h			\
diff --cc src/camel/providers/imapx/camel-imapx-conn-manager.c
index 415ea31,1b87384..5b16d9b
--- a/src/camel/providers/imapx/camel-imapx-conn-manager.c
+++ b/src/camel/providers/imapx/camel-imapx-conn-manager.c
@@@ -519,17 -717,13 +717,24 @@@ camel_imapx_conn_manager_close_connecti
  {
  	g_return_if_fail (CAMEL_IS_IMAPX_CONN_MANAGER (con_man));
  
- 	imapx_prune_connections (con_man);
+ 	CON_WRITE_LOCK (con_man);
+ 
+ 	g_list_free_full (
+ 		con_man->priv->connections,
+ 		(GDestroyNotify) connection_info_unref);
+ 	con_man->priv->connections = NULL;
+ 
+ 	CON_WRITE_UNLOCK (con_man);
  }
  
 +/*----------------------------------------------------------------------------*/
 +/* "friend" API for subclasses */
 +
 +#include "camel-imapx-conn-manager-friend.h"
 +
 +CamelIMAPXServer*
 +camel_imapx_conn_manager_find_connection (CamelIMAPXConnManager *con_man,
 +                                          const gchar *folder_name)
 +{
 +	return imapx_find_connection (con_man, folder_name);
 +}