[evolution-kolab/account-mgmt] Move CamelKolabIMAPXStore to libekolab.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-kolab/account-mgmt] Move CamelKolabIMAPXStore to libekolab.
- Date: Tue, 3 Jul 2012 16:59:06 +0000 (UTC)
commit fcc1cf46fe2a90469a5aac32fb58da8a988a35ac
Author: Matthew Barnes <mbarnes redhat com>
Date: Tue Jul 3 11:48:50 2012 -0400
Move CamelKolabIMAPXStore to libekolab.
Needed by KolabMailImapClient, and libcamelkolab is a dlopen()'ed
module not meant to be linked to.
src/camel/Makefile.am | 6 ++----
src/camel/camel-kolab-imapx-provider.c | 2 +-
src/libekolab/Makefile.am | 2 ++
src/{camel => libekolab}/camel-kolab-imapx-store.c | 0
src/{camel => libekolab}/camel-kolab-imapx-store.h | 0
src/libekolab/kolab-mail-imap-client.c | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/camel/Makefile.am b/src/camel/Makefile.am
index d7a80ce..1d168ae 100644
--- a/src/camel/Makefile.am
+++ b/src/camel/Makefile.am
@@ -9,8 +9,7 @@ libcamelkolab_la_SOURCES = \
camel-imapx-metadata.c \
camel-kolab-imapx-metadata-db.c \
camel-kolab-imapx-metadata.c \
- camel-kolab-imapx-provider.c \
- camel-kolab-imapx-store.c
+ camel-kolab-imapx-provider.c
noinst_HEADERS = \
camel-imapx-extd-server.h \
@@ -19,8 +18,7 @@ noinst_HEADERS = \
camel-imapx-metadata.h \
camel-kolab-imapx-metadata-db.h \
camel-kolab-imapx-metadata.h \
- camel-kolab-imapx-provider.h \
- camel-kolab-imapx-store.h
+ camel-kolab-imapx-provider.h
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"camel-kolab\" \
diff --git a/src/camel/camel-kolab-imapx-provider.c b/src/camel/camel-kolab-imapx-provider.c
index ea89607..b8edb85 100644
--- a/src/camel/camel-kolab-imapx-provider.c
+++ b/src/camel/camel-kolab-imapx-provider.c
@@ -32,11 +32,11 @@
#include <string.h>
#include <glib/gi18n-lib.h>
+#include <libekolab/camel-kolab-imapx-store.h>
#include <libekolabutil/camel-system-headers.h>
#include <libekolabutil/kolab-util-camel.h>
#include "camel-kolab-imapx-provider.h"
-#include "camel-kolab-imapx-store.h"
/*----------------------------------------------------------------------------*/
diff --git a/src/libekolab/Makefile.am b/src/libekolab/Makefile.am
index 4ec4ac8..7f6c0a7 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-imapx-store.c \
camel-kolab-session.c \
kolab-enumtypes.c \
kolab-data-folder-metadata.c \
@@ -53,6 +54,7 @@ libekolab_la_SOURCES = \
noinst_HEADERS = \
e-source-kolab-folder.h \
camel-kolab-imapx-settings.h \
+ camel-kolab-imapx-store.h \
camel-kolab-session.h \
kolab-backend-types.h \
kolab-data-folder-metadata.h \
diff --git a/src/camel/camel-kolab-imapx-store.c b/src/libekolab/camel-kolab-imapx-store.c
similarity index 100%
rename from src/camel/camel-kolab-imapx-store.c
rename to src/libekolab/camel-kolab-imapx-store.c
diff --git a/src/camel/camel-kolab-imapx-store.h b/src/libekolab/camel-kolab-imapx-store.h
similarity index 100%
rename from src/camel/camel-kolab-imapx-store.h
rename to src/libekolab/camel-kolab-imapx-store.h
diff --git a/src/libekolab/kolab-mail-imap-client.c b/src/libekolab/kolab-mail-imap-client.c
index 2210126..209fdee 100644
--- a/src/libekolab/kolab-mail-imap-client.c
+++ b/src/libekolab/kolab-mail-imap-client.c
@@ -30,7 +30,6 @@
#include <glib/gi18n-lib.h>
#include <camel/camel-kolab-imapx-provider.h>
-#include <camel/camel-kolab-imapx-store.h>
#include <libekolabutil/camel-system-headers.h>
#include <libekolabutil/kolab-util-glib.h>
@@ -38,6 +37,7 @@
#include <libekolabutil/kolab-util-camel.h>
#include "camel-kolab-session.h"
+#include "camel-kolab-imapx-store.h"
#include "kolab-util-backend.h"
#include "kolab-mail-summary.h"
#include "kolab-types.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]