[evolution-data-server] Convert IMAPX back to a loadable module.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Convert IMAPX back to a loadable module.
- Date: Fri, 1 Nov 2013 01:29:00 +0000 (UTC)
commit ee29272e5a96338d7015409941d1a6e18de379fa
Author: Matthew Barnes <mbarnes redhat com>
Date: Thu Oct 31 21:00:37 2013 -0400
Convert IMAPX back to a loadable module.
Since evolution-kolab is no longer active, convert the IMAPX provider
back to a loadable module so that necessary changes can be made without
affecting libcamel's public API.
The IMAPX chapter of Camel's API documentation will remain, however.
camel/Makefile.am | 38 +---------
camel/camel.h | 16 ----
camel/providers/imapx/Makefile.am | 84 +++++++++++++++-----
camel/{ => providers/imapx}/camel-imapx-command.c | 0
camel/{ => providers/imapx}/camel-imapx-command.h | 8 +--
camel/{ => providers/imapx}/camel-imapx-folder.c | 1 +
camel/{ => providers/imapx}/camel-imapx-folder.h | 11 +--
camel/{ => providers/imapx}/camel-imapx-job.c | 2 +-
camel/{ => providers/imapx}/camel-imapx-job.h | 4 -
.../imapx}/camel-imapx-list-response.c | 2 +-
.../imapx}/camel-imapx-list-response.h | 7 +-
camel/{ => providers/imapx}/camel-imapx-mailbox.c | 0
camel/{ => providers/imapx}/camel-imapx-mailbox.h | 10 +--
.../imapx}/camel-imapx-namespace-response.c | 2 +-
.../imapx}/camel-imapx-namespace-response.h | 8 +--
.../{ => providers/imapx}/camel-imapx-namespace.c | 0
.../{ => providers/imapx}/camel-imapx-namespace.h | 4 -
camel/providers/imapx/camel-imapx-provider.c | 2 +
camel/{ => providers/imapx}/camel-imapx-search.c | 6 +-
camel/{ => providers/imapx}/camel-imapx-search.h | 9 +--
camel/{ => providers/imapx}/camel-imapx-server.c | 0
camel/{ => providers/imapx}/camel-imapx-server.h | 8 +--
camel/{ => providers/imapx}/camel-imapx-settings.c | 0
camel/{ => providers/imapx}/camel-imapx-settings.h | 4 -
.../imapx}/camel-imapx-status-response.c | 2 +-
.../imapx}/camel-imapx-status-response.h | 7 +-
.../imapx}/camel-imapx-store-summary.c | 3 +-
.../imapx}/camel-imapx-store-summary.h | 9 +--
camel/{ => providers/imapx}/camel-imapx-store.c | 0
camel/{ => providers/imapx}/camel-imapx-store.h | 4 -
camel/{ => providers/imapx}/camel-imapx-stream.c | 2 +-
camel/{ => providers/imapx}/camel-imapx-stream.h | 6 +-
camel/{ => providers/imapx}/camel-imapx-summary.c | 4 +-
camel/{ => providers/imapx}/camel-imapx-summary.h | 7 +--
camel/{ => providers/imapx}/camel-imapx-tokens.txt | 0
camel/{ => providers/imapx}/camel-imapx-utils.c | 0
camel/{ => providers/imapx}/camel-imapx-utils.h | 9 +--
docs/reference/camel/Makefile.am | 78 ++++++++++--------
docs/reference/camel/camel.types | 13 +++
po/POTFILES.in | 10 +-
40 files changed, 165 insertions(+), 215 deletions(-)
---
diff --git a/camel/Makefile.am b/camel/Makefile.am
index e6375c8..0ed4b59 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -19,9 +19,6 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_in_files = camel.pc.in
pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=-$(API_VERSION).pc)
-camel-imapx-tokenise.h: camel-imapx-tokens.txt
- @GPERF@ -H imapx_hash -N imapx_tokenise_struct -L ANSI-C -o -t -k1,$$ $< --output-file=$@
-
libcamelincludedir = $(privincludedir)/camel
camellibexecdir = $(libexecdir)
@@ -42,7 +39,7 @@ camel-enumtypes.c: $(top_srcdir)/enumtypes.c.template $(ENUM_TYPES)
--fhead "#include \"camel-enumtypes.h\"" \
$(addprefix $(srcdir)/,$(ENUM_TYPES)) > $@
-ENUM_GENERATED = camel-enumtypes.h camel-enumtypes.c camel-imapx-tokenise.h
+ENUM_GENERATED = camel-enumtypes.h camel-enumtypes.c
libcamel_1_2_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
@@ -171,22 +168,6 @@ libcamel_1_2_la_SOURCES = \
camel-vee-store.c \
camel-vee-summary.c \
camel-vtrash-folder.c \
- camel-imapx-command.c \
- camel-imapx-folder.c \
- camel-imapx-job.c \
- camel-imapx-list-response.c \
- camel-imapx-mailbox.c \
- camel-imapx-namespace.c \
- camel-imapx-namespace-response.c \
- camel-imapx-search.c \
- camel-imapx-server.c \
- camel-imapx-settings.c \
- camel-imapx-status-response.c \
- camel-imapx-store-summary.c \
- camel-imapx-store.c \
- camel-imapx-stream.c \
- camel-imapx-summary.c \
- camel-imapx-utils.c \
camel.c \
$(LIBCAMEL_PLATFORM_DEP_SOURCES)
@@ -306,22 +287,6 @@ libcamelinclude_HEADERS = \
camel-vee-store.h \
camel-vee-summary.h \
camel-vtrash-folder.h \
- camel-imapx-command.h \
- camel-imapx-folder.h \
- camel-imapx-job.h \
- camel-imapx-list-response.h \
- camel-imapx-mailbox.h \
- camel-imapx-namespace.h \
- camel-imapx-namespace-response.h \
- camel-imapx-search.h \
- camel-imapx-server.h \
- camel-imapx-settings.h \
- camel-imapx-status-response.h \
- camel-imapx-store-summary.h \
- camel-imapx-store.h \
- camel-imapx-stream.h \
- camel-imapx-summary.h \
- camel-imapx-utils.h \
camel.h
libcamel_1_2_la_LDFLAGS = -version-info $(LIBCAMEL_CURRENT):$(LIBCAMEL_REVISION):$(LIBCAMEL_AGE)
$(NO_UNDEFINED) \
@@ -424,7 +389,6 @@ BUILT_SOURCES = \
EXTRA_DIST = \
$(pkgconfig_in_files) \
- camel-imapx-tokens.txt \
gentables.pl \
README
diff --git a/camel/camel.h b/camel/camel.h
index f2931c6..41c8eca 100644
--- a/camel/camel.h
+++ b/camel/camel.h
@@ -138,22 +138,6 @@
#include <camel/camel-vee-store.h>
#include <camel/camel-vee-summary.h>
#include <camel/camel-vtrash-folder.h>
-#include <camel/camel-imapx-command.h>
-#include <camel/camel-imapx-job.h>
-#include <camel/camel-imapx-folder.h>
-#include <camel/camel-imapx-list-response.h>
-#include <camel/camel-imapx-mailbox.h>
-#include <camel/camel-imapx-namespace.h>
-#include <camel/camel-imapx-namespace-response.h>
-#include <camel/camel-imapx-search.h>
-#include <camel/camel-imapx-server.h>
-#include <camel/camel-imapx-status-response.h>
-#include <camel/camel-imapx-store-summary.h>
-#include <camel/camel-imapx-store.h>
-#include <camel/camel-imapx-stream.h>
-#include <camel/camel-imapx-summary.h>
-#include <camel/camel-imapx-settings.h>
-#include <camel/camel-imapx-utils.h>
#undef __CAMEL_H_INSIDE__
diff --git a/camel/providers/imapx/Makefile.am b/camel/providers/imapx/Makefile.am
index 8ba0185..2897b6e 100644
--- a/camel/providers/imapx/Makefile.am
+++ b/camel/providers/imapx/Makefile.am
@@ -1,23 +1,60 @@
camel_provider_LTLIBRARIES = libcamelimapx.la
camel_provider_DATA = libcamelimapx.urls
+camel-imapx-tokenise.h: camel-imapx-tokens.txt
+ @GPERF@ -H imapx_hash -N imapx_tokenise_struct -L ANSI-C -o -t -k1,$$ $< --output-file=$@
+
libcamelimapx_la_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -I.. \
- -I$(srcdir)/.. \
- -I$(top_srcdir)/camel \
- -I$(top_srcdir) \
- $(CAMEL_CFLAGS) \
- -DG_LOG_DOMAIN=\"camel-imapx\" \
- $(CODE_COVERAGE_CFLAGS) \
+ $(AM_CPPFLAGS) \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/camel \
+ -I$(top_builddir) \
+ -I$(top_builddir)/camel \
+ $(CAMEL_CFLAGS) \
+ -DG_LOG_DOMAIN=\"camel-imapx\" \
+ $(CODE_COVERAGE_CFLAGS) \
$(NULL)
-libcamelimapx_la_SOURCES = \
- camel-imapx-provider.c
+libcamelimapx_la_SOURCES = \
+ camel-imapx-provider.c \
+ camel-imapx-command.c \
+ camel-imapx-command.h \
+ camel-imapx-folder.c \
+ camel-imapx-folder.h \
+ camel-imapx-job.c \
+ camel-imapx-job.h \
+ camel-imapx-list-response.c \
+ camel-imapx-list-response.h \
+ camel-imapx-mailbox.c \
+ camel-imapx-mailbox.h \
+ camel-imapx-namespace.c \
+ camel-imapx-namespace.h \
+ camel-imapx-namespace-response.c \
+ camel-imapx-namespace-response.h \
+ camel-imapx-search.c \
+ camel-imapx-search.h \
+ camel-imapx-server.c \
+ camel-imapx-server.h \
+ camel-imapx-settings.c \
+ camel-imapx-settings.h \
+ camel-imapx-status-response.c \
+ camel-imapx-status-response.h \
+ camel-imapx-store.c \
+ camel-imapx-store.h \
+ camel-imapx-store-summary.c \
+ camel-imapx-store-summary.h \
+ camel-imapx-stream.c \
+ camel-imapx-stream.h \
+ camel-imapx-summary.c \
+ camel-imapx-summary.h \
+ camel-imapx-tokenise.h \
+ camel-imapx-utils.c \
+ camel-imapx-utils.h \
+ $(NULL)
libcamelimapx_la_LIBADD = \
- $(top_builddir)/camel/libcamel-1.2.la \
- $(CAMEL_LIBS)
+ $(top_builddir)/camel/libcamel-1.2.la \
+ $(CAMEL_LIBS)
libcamelimapx_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) \
$(CODE_COVERAGE_LDFLAGS) \
@@ -26,18 +63,23 @@ libcamelimapx_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) \
noinst_PROGRAMS = test-imapx
test_imapx_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -I.. \
- -I$(srcdir)/.. \
- -I$(top_srcdir)/camel \
- -I$(top_srcdir) \
- $(CAMEL_CFLAGS) \
+ $(AM_CPPFLAGS) \
+ -I.. \
+ -I$(srcdir)/.. \
+ -I$(top_srcdir)/camel \
+ -I$(top_srcdir) \
+ $(CAMEL_CFLAGS) \
-DG_LOG_DOMAIN=\"camel-imapx\"
test_imapx_SOURCES = test-imapx.c
-test_imapx_LDADD = \
- $(CAMEL_LIBS) \
+test_imapx_LDADD = \
+ $(CAMEL_LIBS) \
$(top_builddir)/camel/libcamel-1.2.la
-EXTRA_DIST = libcamelimapx.urls
+BUILT_SOURCES = camel-imapx-tokenise.h
+
+EXTRA_DIST = \
+ camel-imapx-tokens.txt \
+ libcamelimapx.urls \
+ $(NULL)
-include $(top_srcdir)/git.mk
diff --git a/camel/camel-imapx-command.c b/camel/providers/imapx/camel-imapx-command.c
similarity index 100%
rename from camel/camel-imapx-command.c
rename to camel/providers/imapx/camel-imapx-command.c
diff --git a/camel/camel-imapx-command.h b/camel/providers/imapx/camel-imapx-command.h
similarity index 95%
rename from camel/camel-imapx-command.h
rename to camel/providers/imapx/camel-imapx-command.h
index ed2c480..5cadce7 100644
--- a/camel/camel-imapx-command.h
+++ b/camel/providers/imapx/camel-imapx-command.h
@@ -16,15 +16,11 @@
*
*/
-#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
-#error "Only <camel/camel.h> can be included directly."
-#endif
-
#ifndef CAMEL_IMAPX_COMMAND_H
#define CAMEL_IMAPX_COMMAND_H
-#include <camel/camel-imapx-mailbox.h>
-#include <camel/camel-imapx-utils.h>
+#include "camel-imapx-mailbox.h"
+#include "camel-imapx-utils.h"
#define CAMEL_IS_IMAPX_COMMAND(command) \
(camel_imapx_command_check (command))
diff --git a/camel/camel-imapx-folder.c b/camel/providers/imapx/camel-imapx-folder.c
similarity index 99%
rename from camel/camel-imapx-folder.c
rename to camel/providers/imapx/camel-imapx-folder.c
index f142b9f..25110fc 100644
--- a/camel/camel-imapx-folder.c
+++ b/camel/providers/imapx/camel-imapx-folder.c
@@ -30,6 +30,7 @@
#include "camel-imapx-folder.h"
#include "camel-imapx-search.h"
#include "camel-imapx-server.h"
+#include "camel-imapx-settings.h"
#include "camel-imapx-store.h"
#include "camel-imapx-summary.h"
#include "camel-imapx-utils.h"
diff --git a/camel/camel-imapx-folder.h b/camel/providers/imapx/camel-imapx-folder.h
similarity index 90%
rename from camel/camel-imapx-folder.h
rename to camel/providers/imapx/camel-imapx-folder.h
index f0904e7..4140635 100644
--- a/camel/camel-imapx-folder.h
+++ b/camel/providers/imapx/camel-imapx-folder.h
@@ -21,19 +21,12 @@
* Boston, MA 02110-1301, USA.
*/
-#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
-#error "Only <camel/camel.h> can be included directly."
-#endif
-
#ifndef CAMEL_IMAPX_FOLDER_H
#define CAMEL_IMAPX_FOLDER_H
-#include <camel/camel-offline-folder.h>
-#include <camel/camel-data-cache.h>
-#include <camel/camel-folder-search.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
-#include <camel/camel-imapx-mailbox.h>
+#include "camel-imapx-mailbox.h"
/* Standard GObject macros */
#define CAMEL_TYPE_IMAPX_FOLDER \
diff --git a/camel/camel-imapx-job.c b/camel/providers/imapx/camel-imapx-job.c
similarity index 99%
rename from camel/camel-imapx-job.c
rename to camel/providers/imapx/camel-imapx-job.c
index 07e09a3..f790f54 100644
--- a/camel/camel-imapx-job.c
+++ b/camel/providers/imapx/camel-imapx-job.c
@@ -20,7 +20,7 @@
#include <string.h>
-#include <camel/camel-imapx-folder.h>
+#include "camel-imapx-folder.h"
typedef struct _CamelIMAPXRealJob CamelIMAPXRealJob;
diff --git a/camel/camel-imapx-job.h b/camel/providers/imapx/camel-imapx-job.h
similarity index 95%
rename from camel/camel-imapx-job.h
rename to camel/providers/imapx/camel-imapx-job.h
index 840385b..e834c2f 100644
--- a/camel/camel-imapx-job.h
+++ b/camel/providers/imapx/camel-imapx-job.h
@@ -16,10 +16,6 @@
*
*/
-#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
-#error "Only <camel/camel.h> can be included directly."
-#endif
-
#ifndef CAMEL_IMAPX_JOB_H
#define CAMEL_IMAPX_JOB_H
diff --git a/camel/camel-imapx-list-response.c b/camel/providers/imapx/camel-imapx-list-response.c
similarity index 99%
rename from camel/camel-imapx-list-response.c
rename to camel/providers/imapx/camel-imapx-list-response.c
index fc846f2..d527825 100644
--- a/camel/camel-imapx-list-response.c
+++ b/camel/providers/imapx/camel-imapx-list-response.c
@@ -34,7 +34,7 @@
#include "camel-imapx-list-response.h"
-#include <camel/camel-imapx-utils.h>
+#include "camel-imapx-utils.h"
#define CAMEL_IMAPX_LIST_RESPONSE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/camel/camel-imapx-list-response.h b/camel/providers/imapx/camel-imapx-list-response.h
similarity index 96%
rename from camel/camel-imapx-list-response.h
rename to camel/providers/imapx/camel-imapx-list-response.h
index e1c5fa9..acc4ef5 100644
--- a/camel/camel-imapx-list-response.h
+++ b/camel/providers/imapx/camel-imapx-list-response.h
@@ -16,15 +16,12 @@
*
*/
-#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
-#error "Only <camel/camel.h> can be included directly."
-#endif
-
#ifndef CAMEL_IMAPX_LIST_RESPONSE_H
#define CAMEL_IMAPX_LIST_RESPONSE_H
#include <gio/gio.h>
-#include <camel/camel-imapx-stream.h>
+
+#include "camel-imapx-stream.h"
/* Standard GObject macros */
#define CAMEL_TYPE_IMAPX_LIST_RESPONSE \
diff --git a/camel/camel-imapx-mailbox.c b/camel/providers/imapx/camel-imapx-mailbox.c
similarity index 100%
rename from camel/camel-imapx-mailbox.c
rename to camel/providers/imapx/camel-imapx-mailbox.c
diff --git a/camel/camel-imapx-mailbox.h b/camel/providers/imapx/camel-imapx-mailbox.h
similarity index 95%
rename from camel/camel-imapx-mailbox.h
rename to camel/providers/imapx/camel-imapx-mailbox.h
index ee2fded..cef581f 100644
--- a/camel/camel-imapx-mailbox.h
+++ b/camel/providers/imapx/camel-imapx-mailbox.h
@@ -16,16 +16,12 @@
*
*/
-#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
-#error "Only <camel/camel.h> can be included directly."
-#endif
-
#ifndef CAMEL_IMAPX_MAILBOX_H
#define CAMEL_IMAPX_MAILBOX_H
-#include <camel/camel-imapx-namespace.h>
-#include <camel/camel-imapx-list-response.h>
-#include <camel/camel-imapx-status-response.h>
+#include "camel-imapx-namespace.h"
+#include "camel-imapx-list-response.h"
+#include "camel-imapx-status-response.h"
/* Standard GObject macros */
#define CAMEL_TYPE_IMAPX_MAILBOX \
diff --git a/camel/camel-imapx-namespace-response.c b/camel/providers/imapx/camel-imapx-namespace-response.c
similarity index 99%
rename from camel/camel-imapx-namespace-response.c
rename to camel/providers/imapx/camel-imapx-namespace-response.c
index 2a750e1..f604c88 100644
--- a/camel/camel-imapx-namespace-response.c
+++ b/camel/providers/imapx/camel-imapx-namespace-response.c
@@ -30,7 +30,7 @@
#include <string.h>
-#include <camel/camel-imapx-utils.h>
+#include "camel-imapx-utils.h"
#define CAMEL_IMAPX_NAMESPACE_RESPONSE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/camel/camel-imapx-namespace-response.h b/camel/providers/imapx/camel-imapx-namespace-response.h
similarity index 93%
rename from camel/camel-imapx-namespace-response.h
rename to camel/providers/imapx/camel-imapx-namespace-response.h
index a2eee89..86b5d7a 100644
--- a/camel/camel-imapx-namespace-response.h
+++ b/camel/providers/imapx/camel-imapx-namespace-response.h
@@ -16,15 +16,11 @@
*
*/
-#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
-#error "Only <camel/camel.h> can be included directly."
-#endif
-
#ifndef CAMEL_IMAPX_NAMESPACE_RESPONSE_H
#define CAMEL_IMAPX_NAMESPACE_RESPONSE_H
-#include <camel/camel-imapx-namespace.h>
-#include <camel/camel-imapx-list-response.h>
+#include "camel-imapx-namespace.h"
+#include "camel-imapx-list-response.h"
/* Standard GObject macros */
#define CAMEL_TYPE_IMAPX_NAMESPACE_RESPONSE \
diff --git a/camel/camel-imapx-namespace.c b/camel/providers/imapx/camel-imapx-namespace.c
similarity index 100%
rename from camel/camel-imapx-namespace.c
rename to camel/providers/imapx/camel-imapx-namespace.c
diff --git a/camel/camel-imapx-namespace.h b/camel/providers/imapx/camel-imapx-namespace.h
similarity index 96%
rename from camel/camel-imapx-namespace.h
rename to camel/providers/imapx/camel-imapx-namespace.h
index ca15dca..3129fce 100644
--- a/camel/camel-imapx-namespace.h
+++ b/camel/providers/imapx/camel-imapx-namespace.h
@@ -16,10 +16,6 @@
*
*/
-#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
-#error "Only <camel/camel.h> can be included directly."
-#endif
-
#ifndef CAMEL_IMAPX_NAMESPACE_H
#define CAMEL_IMAPX_NAMESPACE_H
diff --git a/camel/providers/imapx/camel-imapx-provider.c b/camel/providers/imapx/camel-imapx-provider.c
index a31a9b7..9dbbf70 100644
--- a/camel/providers/imapx/camel-imapx-provider.c
+++ b/camel/providers/imapx/camel-imapx-provider.c
@@ -30,6 +30,8 @@
#include <camel/camel.h>
#include <glib/gi18n-lib.h>
+#include "camel-imapx-store.h"
+
static guint imapx_url_hash (gconstpointer key);
static gint imapx_url_equal (gconstpointer a, gconstpointer b);
diff --git a/camel/camel-imapx-search.c b/camel/providers/imapx/camel-imapx-search.c
similarity index 98%
rename from camel/camel-imapx-search.c
rename to camel/providers/imapx/camel-imapx-search.c
index 8b46de4..bbd94c8 100644
--- a/camel/camel-imapx-search.c
+++ b/camel/providers/imapx/camel-imapx-search.c
@@ -18,8 +18,10 @@
#include "camel-imapx-search.h"
-#include "camel-offline-store.h"
-#include "camel-search-private.h"
+#include <camel/camel.h>
+#include <camel/camel-search-private.h>
+
+#include "camel-imapx-folder.h"
#define CAMEL_IMAPX_SEARCH_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/camel/camel-imapx-search.h b/camel/providers/imapx/camel-imapx-search.h
similarity index 91%
rename from camel/camel-imapx-search.h
rename to camel/providers/imapx/camel-imapx-search.h
index 9128dbb..f831730 100644
--- a/camel/camel-imapx-search.h
+++ b/camel/providers/imapx/camel-imapx-search.h
@@ -16,15 +16,12 @@
*
*/
-#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
-#error "Only <camel/camel.h> can be included directly."
-#endif
-
#ifndef CAMEL_IMAPX_SEARCH_H
#define CAMEL_IMAPX_SEARCH_H
-#include <camel/camel-folder-search.h>
-#include <camel/camel-imapx-server.h>
+#include <camel/camel.h>
+
+#include "camel-imapx-server.h"
/* Standard GObject macros */
#define CAMEL_TYPE_IMAPX_SEARCH \
diff --git a/camel/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
similarity index 100%
rename from camel/camel-imapx-server.c
rename to camel/providers/imapx/camel-imapx-server.c
diff --git a/camel/camel-imapx-server.h b/camel/providers/imapx/camel-imapx-server.h
similarity index 97%
rename from camel/camel-imapx-server.h
rename to camel/providers/imapx/camel-imapx-server.h
index d5881fb..faec7ff 100644
--- a/camel/camel-imapx-server.h
+++ b/camel/providers/imapx/camel-imapx-server.h
@@ -17,16 +17,10 @@
* Boston, MA 02110-1301, USA.
*/
-#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
-#error "Only <camel/camel.h> can be included directly."
-#endif
-
#ifndef CAMEL_IMAPX_SERVER_H
#define CAMEL_IMAPX_SERVER_H
-#include <camel/camel-data-cache.h>
-#include <camel/camel-session.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
#include "camel-imapx-command.h"
#include "camel-imapx-mailbox.h"
diff --git a/camel/camel-imapx-settings.c b/camel/providers/imapx/camel-imapx-settings.c
similarity index 100%
rename from camel/camel-imapx-settings.c
rename to camel/providers/imapx/camel-imapx-settings.c
diff --git a/camel/camel-imapx-settings.h b/camel/providers/imapx/camel-imapx-settings.h
similarity index 97%
rename from camel/camel-imapx-settings.h
rename to camel/providers/imapx/camel-imapx-settings.h
index 7ce3d1a..69dc5a5 100644
--- a/camel/camel-imapx-settings.h
+++ b/camel/providers/imapx/camel-imapx-settings.h
@@ -16,10 +16,6 @@
*
*/
-#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
-#error "Only <camel/camel.h> can be included directly."
-#endif
-
#ifndef CAMEL_IMAPX_SETTINGS_H
#define CAMEL_IMAPX_SETTINGS_H
diff --git a/camel/camel-imapx-status-response.c b/camel/providers/imapx/camel-imapx-status-response.c
similarity index 99%
rename from camel/camel-imapx-status-response.c
rename to camel/providers/imapx/camel-imapx-status-response.c
index 11ac962..501a6a2 100644
--- a/camel/camel-imapx-status-response.c
+++ b/camel/providers/imapx/camel-imapx-status-response.c
@@ -28,7 +28,7 @@
#include "camel-imapx-status-response.h"
-#include <camel/camel-imapx-utils.h>
+#include "camel-imapx-utils.h"
#define CAMEL_IMAPX_STATUS_RESPONSE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/camel/camel-imapx-status-response.h b/camel/providers/imapx/camel-imapx-status-response.h
similarity index 95%
rename from camel/camel-imapx-status-response.h
rename to camel/providers/imapx/camel-imapx-status-response.h
index 9779098..b203d81 100644
--- a/camel/camel-imapx-status-response.h
+++ b/camel/providers/imapx/camel-imapx-status-response.h
@@ -16,15 +16,12 @@
*
*/
-#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
-#error "Only <camel/camel.h> can be included directly."
-#endif
-
#ifndef CAMEL_IMAPX_STATUS_RESPONSE_H
#define CAMEL_IMAPX_STATUS_RESPONSE_H
#include <gio/gio.h>
-#include <camel/camel-imapx-stream.h>
+
+#include "camel-imapx-stream.h"
/* Standard GObject macros */
#define CAMEL_TYPE_IMAPX_STATUS_RESPONSE \
diff --git a/camel/camel-imapx-store-summary.c b/camel/providers/imapx/camel-imapx-store-summary.c
similarity index 99%
rename from camel/camel-imapx-store-summary.c
rename to camel/providers/imapx/camel-imapx-store-summary.c
index 0b4ea96..4c7c485 100644
--- a/camel/camel-imapx-store-summary.c
+++ b/camel/providers/imapx/camel-imapx-store-summary.c
@@ -26,7 +26,8 @@
#include <string.h>
#include <unistd.h>
-#include <camel/camel-file-utils.h>
+#include <camel/camel.h>
+
#include "camel-imapx-utils.h"
#include "camel-imapx-store-summary.h"
diff --git a/camel/camel-imapx-store-summary.h b/camel/providers/imapx/camel-imapx-store-summary.h
similarity index 92%
rename from camel/camel-imapx-store-summary.h
rename to camel/providers/imapx/camel-imapx-store-summary.h
index c0f4319..6472f64 100644
--- a/camel/camel-imapx-store-summary.h
+++ b/camel/providers/imapx/camel-imapx-store-summary.h
@@ -16,15 +16,12 @@
*
*/
-#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
-#error "Only <camel/camel.h> can be included directly."
-#endif
-
#ifndef CAMEL_IMAPX_STORE_SUMMARY_H
#define CAMEL_IMAPX_STORE_SUMMARY_H
-#include <camel/camel-store-summary.h>
-#include <camel/camel-imapx-mailbox.h>
+#include <camel/camel.h>
+
+#include "camel-imapx-mailbox.h"
/* Standard GObject macros */
#define CAMEL_TYPE_IMAPX_STORE_SUMMARY \
diff --git a/camel/camel-imapx-store.c b/camel/providers/imapx/camel-imapx-store.c
similarity index 100%
rename from camel/camel-imapx-store.c
rename to camel/providers/imapx/camel-imapx-store.c
diff --git a/camel/camel-imapx-store.h b/camel/providers/imapx/camel-imapx-store.h
similarity index 95%
rename from camel/camel-imapx-store.h
rename to camel/providers/imapx/camel-imapx-store.h
index 6d75c4f..c9b6c30 100644
--- a/camel/camel-imapx-store.h
+++ b/camel/providers/imapx/camel-imapx-store.h
@@ -21,10 +21,6 @@
* Boston, MA 02110-1301, USA.
*/
-#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
-#error "Only <camel/camel.h> can be included directly."
-#endif
-
#ifndef CAMEL_IMAPX_STORE_H
#define CAMEL_IMAPX_STORE_H
diff --git a/camel/camel-imapx-stream.c b/camel/providers/imapx/camel-imapx-stream.c
similarity index 99%
rename from camel/camel-imapx-stream.c
rename to camel/providers/imapx/camel-imapx-stream.c
index 9899792..f6cdf1a 100644
--- a/camel/camel-imapx-stream.c
+++ b/camel/providers/imapx/camel-imapx-stream.c
@@ -31,7 +31,7 @@
#include <glib/gi18n-lib.h>
-#include <camel/camel-stream-mem.h>
+#include <camel/camel.h>
#include "camel-imapx-utils.h"
#include "camel-imapx-stream.h"
diff --git a/camel/camel-imapx-stream.h b/camel/providers/imapx/camel-imapx-stream.h
similarity index 96%
rename from camel/camel-imapx-stream.h
rename to camel/providers/imapx/camel-imapx-stream.h
index 5c0719c..4b81f03 100644
--- a/camel/camel-imapx-stream.h
+++ b/camel/providers/imapx/camel-imapx-stream.h
@@ -20,14 +20,10 @@
* Boston, MA 02110-1301, USA.
*/
-#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
-#error "Only <camel/camel.h> can be included directly."
-#endif
-
#ifndef CAMEL_IMAPX_STREAM_H
#define CAMEL_IMAPX_STREAM_H
-#include <camel/camel-stream.h>
+#include <camel/camel.h>
/* Standard GObject macros */
#define CAMEL_TYPE_IMAPX_STREAM \
diff --git a/camel/camel-imapx-summary.c b/camel/providers/imapx/camel-imapx-summary.c
similarity index 99%
rename from camel/camel-imapx-summary.c
rename to camel/providers/imapx/camel-imapx-summary.c
index 7fcf756..3677718 100644
--- a/camel/camel-imapx-summary.c
+++ b/camel/providers/imapx/camel-imapx-summary.c
@@ -31,9 +31,7 @@
#include <unistd.h>
#include <sys/stat.h>
-#include <camel/camel-db.h>
-#include <camel/camel-store.h>
-#include <camel/camel-string-utils.h>
+#include <camel/camel.h>
#include "camel-imapx-summary.h"
diff --git a/camel/camel-imapx-summary.h b/camel/providers/imapx/camel-imapx-summary.h
similarity index 92%
rename from camel/camel-imapx-summary.h
rename to camel/providers/imapx/camel-imapx-summary.h
index 919f102..b5a83a4 100644
--- a/camel/camel-imapx-summary.h
+++ b/camel/providers/imapx/camel-imapx-summary.h
@@ -20,15 +20,10 @@
* Boston, MA 02110-1301, USA.
*/
-#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
-#error "Only <camel/camel.h> can be included directly."
-#endif
-
#ifndef CAMEL_IMAPX_SUMMARY_H
#define CAMEL_IMAPX_SUMMARY_H
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-folder.h>
+#include <camel/camel.h>
/* Standard GObject macros */
#define CAMEL_TYPE_IMAPX_SUMMARY \
diff --git a/camel/camel-imapx-tokens.txt b/camel/providers/imapx/camel-imapx-tokens.txt
similarity index 100%
rename from camel/camel-imapx-tokens.txt
rename to camel/providers/imapx/camel-imapx-tokens.txt
diff --git a/camel/camel-imapx-utils.c b/camel/providers/imapx/camel-imapx-utils.c
similarity index 100%
rename from camel/camel-imapx-utils.c
rename to camel/providers/imapx/camel-imapx-utils.c
diff --git a/camel/camel-imapx-utils.h b/camel/providers/imapx/camel-imapx-utils.h
similarity index 98%
rename from camel/camel-imapx-utils.h
rename to camel/providers/imapx/camel-imapx-utils.h
index ac1f08e..8ae8450 100644
--- a/camel/camel-imapx-utils.h
+++ b/camel/providers/imapx/camel-imapx-utils.h
@@ -17,15 +17,12 @@
* Boston, MA 02110-1301, USA.
*/
-#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
-#error "Only <camel/camel.h> can be included directly."
-#endif
-
#ifndef CAMEL_IMAPX_UTILS_H
#define CAMEL_IMAPX_UTILS_H
-#include <camel/camel-store.h>
-#include <camel/camel-imapx-mailbox.h>
+#include <camel/camel.h>
+
+#include "camel-imapx-mailbox.h"
G_BEGIN_DECLS
diff --git a/docs/reference/camel/Makefile.am b/docs/reference/camel/Makefile.am
index 6b12161..d0821e9 100644
--- a/docs/reference/camel/Makefile.am
+++ b/docs/reference/camel/Makefile.am
@@ -5,7 +5,10 @@ DOC_MODULE = camel
DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
# The directory containing the source code (if it contains documentation).
-DOC_SOURCE_DIR = $(top_srcdir)/camel
+DOC_SOURCE_DIR = \
+ $(top_srcdir)/camel \
+ $(top_srcdir)/camel/providers/imapx \
+ $(NULL)
HTML_DIR = $(datadir)/gtk-doc/html
@@ -19,19 +22,22 @@ SCANGOBJ_OPTIONS =
MKDB_OPTIONS = --sgml-mode --output-format=xml --name-space=camel
# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
-GTKDOC_CFLAGS = \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- -I$(top_builddir)/camel \
- $(CAMEL_CFLAGS)
+GTKDOC_CFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ -I$(top_builddir)/camel \
+ -I$(top_builddir)/camel/providers \
+ $(CAMEL_CFLAGS) \
+ $(NULL)
-GTKDOC_LIBS = \
- $(top_builddir)/camel/libcamel-1.2.la \
- $(CAMEL_LIBS)
+GTKDOC_LIBS = \
+ $(top_builddir)/camel/libcamel-1.2.la \
+ $(top_builddir)/camel/providers/imapx/libcamelimapx.la \
+ $(CAMEL_LIBS) \
+ $(NULL)
# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
-content_files = \
- tree_index.sgml
+content_files = tree_index.sgml
# Used for dependencies. The docs will be rebuilt if any of these change.
HFILE_GLOB=$(top_srcdir)/camel/*.h
@@ -39,35 +45,37 @@ CFILE_GLOB=$(top_srcdir)/camel/*.c
# Header files to ignore when scanning
# XXX Ignore the imapx provider for now.
-IGNORE_HFILES = \
- broken-date-parser.h \
- camel-charset-map-private.h \
- camel-enumtypes.h \
- camel-groupwise-private.h \
- camel-i18n.h \
- camel-imap-private.h \
- camel-imap-types.h \
- camel-imapx-tokenise.h \
- camel-imapx-utils.h \
- camel-local-private.h \
- camel-net-utils-win32.h \
- camel-nntp-private.h \
- camel-nntp-types.h \
- camel-search-private.h \
- camel-types.h \
- camel-win32.h \
- providers \
- tests
+IGNORE_HFILES = \
+ broken-date-parser.h \
+ camel-charset-map-private.h \
+ camel-enumtypes.h \
+ camel-groupwise-private.h \
+ camel-i18n.h \
+ camel-imap-private.h \
+ camel-imap-types.h \
+ camel-imapx-tokenise.h \
+ camel-imapx-utils.h \
+ camel-local-private.h \
+ camel-net-utils-win32.h \
+ camel-nntp-private.h \
+ camel-nntp-types.h \
+ camel-search-private.h \
+ camel-types.h \
+ camel-win32.h \
+ providers \
+ tests \
+ $(NULL)
# This includes the standard gtk-doc make rules, copied by gtkdocize.
include $(top_srcdir)/gtk-doc.make
# Other files to distribute
-EXTRA_DIST += \
- $(content_files) \
- $(DOC_MODULE)-docs.sgml \
- $(DOC_MODULE)-sections.txt \
- camel.hierarchy
+EXTRA_DIST += \
+ $(content_files) \
+ $(DOC_MODULE)-docs.sgml \
+ $(DOC_MODULE)-sections.txt \
+ camel.hierarchy \
+ $(NULL)
#TESTS = $(GTKDOC_CHECK)
diff --git a/docs/reference/camel/camel.types b/docs/reference/camel/camel.types
index 013ee16..be7f09d 100644
--- a/docs/reference/camel/camel.types
+++ b/docs/reference/camel/camel.types
@@ -1,4 +1,17 @@
#include <camel/camel.h>
+#include <imapx/camel-imapx-folder.h>
+#include <imapx/camel-imapx-list-response.h>
+#include <imapx/camel-imapx-mailbox.h>
+#include <imapx/camel-imapx-namespace.h>
+#include <imapx/camel-imapx-namespace-response.h>
+#include <imapx/camel-imapx-search.h>
+#include <imapx/camel-imapx-server.h>
+#include <imapx/camel-imapx-settings.h>
+#include <imapx/camel-imapx-status-response.h>
+#include <imapx/camel-imapx-store.h>
+#include <imapx/camel-imapx-store-summary.h>
+#include <imapx/camel-imapx-stream.h>
+#include <imapx/camel-imapx-summary.h>
camel_address_get_type
camel_block_file_get_type
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 78662c6..1a22b4a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -61,11 +61,6 @@ camel/camel-folder-summary.c
camel/camel-folder-thread.c
camel/camel-gpg-context.c
camel/camel-html-parser.c
-camel/camel-imapx-command.c
-camel/camel-imapx-folder.c
-camel/camel-imapx-server.c
-camel/camel-imapx-store.c
-camel/camel-imapx-stream.c
camel/camel-index.c
camel/camel-index-control.c
camel/camel-internet-address.c
@@ -140,7 +135,12 @@ camel/camel-vee-folder.c
camel/camel-vee-store.c
camel/camel-vee-summary.c
camel/camel-vtrash-folder.c
+camel/providers/imapx/camel-imapx-command.c
+camel/providers/imapx/camel-imapx-folder.c
camel/providers/imapx/camel-imapx-provider.c
+camel/providers/imapx/camel-imapx-server.c
+camel/providers/imapx/camel-imapx-store.c
+camel/providers/imapx/camel-imapx-stream.c
camel/providers/local/camel-local-folder.c
camel/providers/local/camel-local-provider.c
camel/providers/local/camel-local-store.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
