[evolution-kolab] Move CamelKolabSession to libekolab.

[Matthew Barnes <mbarnes src gnome org>]

commit efc57a744b3ca17952633eb7eb7a2aad01bd09bb
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Jul 3 11:21:32 2012 -0400

    Move CamelKolabSession to libekolab.
    
    Needed by KolabMailImapClient, and libcamelkolab is a dlopen()'ed module
    not meant to be linked to.

 src/camel/Makefile.am                              |    6 ++----
 src/libekolab/Makefile.am                          |    2 ++
 src/{camel => libekolab}/camel-kolab-session.c     |    0
 src/{camel => libekolab}/camel-kolab-session.h     |    0
 src/libekolab/kolab-mail-imap-client.c             |    2 +-
 src/libekolabutil/kolab-util-ldap.c                |    2 --
 .../libekolab/test-kolab-util-cal-freebusy.c       |    3 +--
 .../integration/libekolab/test-kolab-util-http.c   |    3 +--
 8 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/src/camel/Makefile.am b/src/camel/Makefile.am
index 738d365..d7a80ce 100644
--- a/src/camel/Makefile.am
+++ b/src/camel/Makefile.am
@@ -10,8 +10,7 @@ libcamelkolab_la_SOURCES =			\
 	camel-kolab-imapx-metadata-db.c		\
 	camel-kolab-imapx-metadata.c		\
 	camel-kolab-imapx-provider.c		\
-	camel-kolab-imapx-store.c		\
-	camel-kolab-session.c
+	camel-kolab-imapx-store.c
 
 noinst_HEADERS =				\
 	camel-imapx-extd-server.h		\
@@ -21,8 +20,7 @@ noinst_HEADERS =				\
 	camel-kolab-imapx-metadata-db.h		\
 	camel-kolab-imapx-metadata.h		\
 	camel-kolab-imapx-provider.h		\
-	camel-kolab-imapx-store.h		\
-	camel-kolab-session.h
+	camel-kolab-imapx-store.h
 
 AM_CPPFLAGS =					\
 	-DG_LOG_DOMAIN=\"camel-kolab\"		\
diff --git a/src/libekolab/Makefile.am b/src/libekolab/Makefile.am
index 3e87713..4ec4ac8 100644
--- a/src/libekolab/Makefile.am
+++ b/src/libekolab/Makefile.am
@@ -43,6 +43,7 @@ ENUM_GENERATED =			\
 libekolab_la_SOURCES =			\
 	e-source-kolab-folder.c		\
 	camel-kolab-imapx-settings.c	\
+	camel-kolab-session.c		\
 	kolab-enumtypes.c		\
 	kolab-data-folder-metadata.c	\
 	kolab-data-folder-permissions.c	\
@@ -52,6 +53,7 @@ libekolab_la_SOURCES =			\
 noinst_HEADERS =			\
 	e-source-kolab-folder.h		\
 	camel-kolab-imapx-settings.h	\
+	camel-kolab-session.h		\
 	kolab-backend-types.h		\
 	kolab-data-folder-metadata.h	\
 	kolab-data-folder-permissions.h	\
diff --git a/src/camel/camel-kolab-session.c b/src/libekolab/camel-kolab-session.c
similarity index 100%
rename from src/camel/camel-kolab-session.c
rename to src/libekolab/camel-kolab-session.c
diff --git a/src/camel/camel-kolab-session.h b/src/libekolab/camel-kolab-session.h
similarity index 100%
rename from src/camel/camel-kolab-session.h
rename to src/libekolab/camel-kolab-session.h
diff --git a/src/libekolab/kolab-mail-imap-client.c b/src/libekolab/kolab-mail-imap-client.c
index 4b77448..2210126 100644
--- a/src/libekolab/kolab-mail-imap-client.c
+++ b/src/libekolab/kolab-mail-imap-client.c
@@ -31,13 +31,13 @@
 
 #include <camel/camel-kolab-imapx-provider.h>
 #include <camel/camel-kolab-imapx-store.h>
-#include <camel/camel-kolab-session.h>
 
 #include <libekolabutil/camel-system-headers.h>
 #include <libekolabutil/kolab-util-glib.h>
 #include <libekolabutil/kolab-util-error.h>
 #include <libekolabutil/kolab-util-camel.h>
 
+#include "camel-kolab-session.h"
 #include "kolab-util-backend.h"
 #include "kolab-mail-summary.h"
 #include "kolab-types.h"
diff --git a/src/libekolabutil/kolab-util-ldap.c b/src/libekolabutil/kolab-util-ldap.c
index 3e0186c..3355369 100644
--- a/src/libekolabutil/kolab-util-ldap.c
+++ b/src/libekolabutil/kolab-util-ldap.c
@@ -20,8 +20,6 @@
 #include "kolab-util-ldap.h"
 #include "camel-system-headers.h"
 
-#include <camel/camel-kolab-session.h>
-
 #include <curl/curl.h>
 
 #include <string.h>
diff --git a/src/tests/integration/libekolab/test-kolab-util-cal-freebusy.c b/src/tests/integration/libekolab/test-kolab-util-cal-freebusy.c
index f3f1d98..a558404 100644
--- a/src/tests/integration/libekolab/test-kolab-util-cal-freebusy.c
+++ b/src/tests/integration/libekolab/test-kolab-util-cal-freebusy.c
@@ -34,10 +34,9 @@
 #include <glib.h>
 #include <stdlib.h>
 
-#include <camel/camel-kolab-session.h>
-
 #include <libecal/libecal.h>
 
+#include <libekolab/camel-kolab-session.h>
 #include <libekolabutil/camel-kolab-stream.h>
 #include <libekolabutil/camel-system-headers.h>
 #include <libekolabutil/kolab-util-camel.h>
diff --git a/src/tests/integration/libekolab/test-kolab-util-http.c b/src/tests/integration/libekolab/test-kolab-util-http.c
index 009ae70..318f172 100644
--- a/src/tests/integration/libekolab/test-kolab-util-http.c
+++ b/src/tests/integration/libekolab/test-kolab-util-http.c
@@ -34,8 +34,7 @@
 #include <glib.h>
 #include <stdlib.h>
 
-#include <camel/camel-kolab-session.h>
-
+#include <libekolab/camel-kolab-session.h>
 #include <libekolabutil/camel-kolab-stream.h>
 #include <libekolabutil/camel-system-headers.h>
 #include <libekolabutil/kolab-util-camel.h>