[evolution-data-server] Lock down Camel headers.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Lock down Camel headers.
- Date: Fri, 2 Apr 2010 21:30:08 +0000 (UTC)
commit 9acc8ab70f4695cfe88e8da6019efeeeb4634b79
Author: Matthew Barnes <mbarnes redhat com>
Date: Fri Apr 2 11:30:58 2010 -0400
Lock down Camel headers.
Henceforth only <camel/camel.h> may be included from outside of Camel.
This also applies to Camel's own provider modules.
addressbook/libebook/Makefile.am | 8 ++-
addressbook/libebook/e-destination.c | 2 +-
camel/Makefile.am | 52 +++++++++++---------
camel/camel-address.h | 10 +++-
camel/camel-arg.h | 6 ++-
camel/camel-block-file.h | 10 +++-
camel/camel-certdb.h | 10 +++-
camel/camel-charset-map.h | 10 +++-
camel/camel-cipher-context.h | 4 ++
camel/camel-data-cache.h | 6 ++-
camel/camel-data-wrapper.h | 6 ++-
camel/camel-db.h | 8 ++-
camel/camel-debug.h | 6 ++-
camel/camel-disco-diary.h | 6 ++-
camel/camel-disco-folder.h | 6 ++-
camel/camel-disco-store.h | 6 ++-
camel/camel-exception.h | 6 ++-
camel/camel-file-utils.h | 6 ++-
camel/camel-filter-driver.h | 10 +++-
camel/camel-filter-search.h | 4 ++
camel/camel-folder-search.h | 10 +++-
camel/camel-folder-summary.h | 10 +++-
camel/camel-folder-thread.h | 10 +++-
camel/camel-folder.h | 6 ++-
camel/camel-gpg-context.h | 10 +++-
camel/camel-html-parser.h | 10 +++-
camel/camel-http-stream.h | 10 +++-
camel/camel-iconv.h | 10 +++-
camel/camel-index.h | 10 +++-
camel/camel-internet-address.h | 10 +++-
camel/camel-junk-plugin.h | 8 ++-
camel/camel-list-utils.h | 8 ++-
camel/camel-lock-client.h | 10 +++-
camel/camel-lock-helper.h | 10 +++-
camel/camel-lock.h | 10 +++-
camel/camel-medium.h | 6 ++-
camel/camel-mempool.h | 4 ++
camel/camel-mime-filter-basic.h | 10 +++-
camel/camel-mime-filter-bestenc.h | 10 +++-
camel/camel-mime-filter-canon.h | 10 +++-
camel/camel-mime-filter-charset.h | 10 +++-
camel/camel-mime-filter-crlf.h | 10 +++-
camel/camel-mime-filter-enriched.h | 10 +++-
camel/camel-mime-filter-from.h | 10 +++-
camel/camel-mime-filter-gzip.h | 10 +++-
camel/camel-mime-filter-html.h | 10 +++-
camel/camel-mime-filter-index.h | 10 +++-
camel/camel-mime-filter-linewrap.h | 10 +++-
camel/camel-mime-filter-pgp.h | 10 +++-
camel/camel-mime-filter-progress.h | 10 +++-
camel/camel-mime-filter-save.h | 10 +++-
camel/camel-mime-filter-tohtml.h | 10 +++-
camel/camel-mime-filter-windows.h | 10 +++-
camel/camel-mime-filter-yenc.h | 10 +++-
camel/camel-mime-filter.h | 10 +++-
camel/camel-mime-message.h | 6 ++-
camel/camel-mime-parser.h | 10 +++-
camel/camel-mime-part-utils.h | 6 ++-
camel/camel-mime-part.h | 6 ++-
camel/camel-mime-utils.h | 10 +++-
camel/camel-movemail.h | 6 ++-
camel/camel-msgport.h | 4 ++
camel/camel-multipart-encrypted.h | 10 +++-
camel/camel-multipart-signed.h | 6 ++-
camel/camel-multipart.h | 6 ++-
camel/camel-net-utils-win32.h | 4 +-
camel/camel-net-utils.h | 6 ++-
camel/camel-nntp-address.h | 10 +++-
camel/camel-object.h | 6 ++-
camel/camel-offline-folder.h | 10 +++-
camel/camel-offline-journal.h | 10 +++-
camel/camel-offline-store.h | 10 +++-
camel/camel-operation.h | 6 ++-
camel/camel-partition-table.h | 10 +++-
camel/camel-private.h | 3 +-
camel/camel-provider.h | 6 ++-
camel/camel-sasl-anonymous.h | 4 ++
camel/camel-sasl-cram-md5.h | 4 ++
camel/camel-sasl-digest-md5.h | 4 ++
camel/camel-sasl-gssapi.h | 10 +++-
camel/camel-sasl-login.h | 4 ++
camel/camel-sasl-ntlm.h | 4 ++
camel/camel-sasl-plain.h | 4 ++
camel/camel-sasl-popb4smtp.h | 4 ++
camel/camel-sasl.h | 4 ++
camel/camel-search-private.c | 37 --------------
camel/camel-search-private.h | 9 ++--
camel/camel-search-sql-sexp.h | 10 +++-
camel/camel-search-sql.h | 10 +++-
camel/camel-seekable-stream.h | 6 ++-
camel/camel-seekable-substream.h | 6 ++-
camel/camel-service.h | 6 ++-
camel/camel-session.h | 6 ++-
camel/camel-smime-context.h | 10 +++-
camel/camel-store-summary.h | 10 +++-
camel/camel-store.h | 6 ++-
camel/camel-stream-buffer.h | 6 ++-
camel/camel-stream-filter.h | 10 +++-
camel/camel-stream-fs.h | 6 ++-
camel/camel-stream-mem.h | 6 ++-
camel/camel-stream-null.h | 10 +++-
camel/camel-stream-process.h | 10 +++-
camel/camel-stream-vfs.h | 6 ++-
camel/camel-stream.h | 6 ++-
camel/camel-string-utils.h | 10 +++-
camel/camel-tcp-stream-raw.h | 4 ++
camel/camel-tcp-stream-ssl.h | 8 +++
camel/camel-tcp-stream.h | 4 ++
camel/camel-text-index.h | 10 +++-
camel/camel-transport.h | 6 ++-
camel/camel-trie.h | 4 ++
camel/camel-types.h | 6 ++-
camel/camel-uid-cache.h | 6 ++-
camel/camel-url-scanner.h | 10 +++-
camel/camel-url.h | 6 ++-
camel/camel-utf8.h | 10 +++-
camel/camel-vee-folder.h | 10 +++-
camel/camel-vee-store.h | 10 +++-
camel/camel-vee-summary.h | 10 +++-
camel/camel-vtrash-folder.h | 10 +++-
camel/camel.h | 10 +++-
camel/providers/groupwise/camel-groupwise-folder.c | 9 +---
camel/providers/groupwise/camel-groupwise-folder.h | 12 +----
.../providers/groupwise/camel-groupwise-journal.c | 6 --
.../providers/groupwise/camel-groupwise-journal.h | 12 ++---
.../providers/groupwise/camel-groupwise-private.h | 2 +-
.../providers/groupwise/camel-groupwise-provider.c | 5 --
.../groupwise/camel-groupwise-store-summary.c | 4 +-
.../groupwise/camel-groupwise-store-summary.h | 9 ++--
camel/providers/groupwise/camel-groupwise-store.c | 7 +--
camel/providers/groupwise/camel-groupwise-store.h | 6 +-
.../providers/groupwise/camel-groupwise-summary.c | 6 --
.../providers/groupwise/camel-groupwise-summary.h | 10 ++--
.../groupwise/camel-groupwise-transport.c | 9 ---
.../groupwise/camel-groupwise-transport.h | 4 +-
camel/providers/groupwise/camel-groupwise-utils.c | 8 ---
camel/providers/groupwise/camel-groupwise-utils.h | 8 +--
camel/providers/imap/Makefile.am | 1 -
camel/providers/imap/camel-imap-command.c | 6 +--
camel/providers/imap/camel-imap-command.h | 6 ++-
camel/providers/imap/camel-imap-folder.c | 25 +---------
camel/providers/imap/camel-imap-folder.h | 11 ++--
camel/providers/imap/camel-imap-journal.c | 7 ---
camel/providers/imap/camel-imap-journal.h | 13 ++---
camel/providers/imap/camel-imap-message-cache.c | 5 --
camel/providers/imap/camel-imap-message-cache.h | 16 +++---
camel/providers/imap/camel-imap-private.h | 2 +-
camel/providers/imap/camel-imap-provider.c | 6 +--
camel/providers/imap/camel-imap-search.c | 2 -
camel/providers/imap/camel-imap-search.h | 11 ++--
camel/providers/imap/camel-imap-store-summary.c | 5 +--
camel/providers/imap/camel-imap-store-summary.h | 9 ++--
camel/providers/imap/camel-imap-store.c | 19 +-------
camel/providers/imap/camel-imap-store.h | 18 +++---
camel/providers/imap/camel-imap-summary.c | 6 --
camel/providers/imap/camel-imap-summary.h | 11 ++--
camel/providers/imap/camel-imap-types.h | 39 ---------------
camel/providers/imap/camel-imap-utils.c | 4 --
camel/providers/imap/camel-imap-utils.h | 6 +-
camel/providers/imap/camel-imap-wrapper.c | 9 ---
camel/providers/imap/camel-imap-wrapper.h | 6 +-
camel/providers/imap4/camel-imap4-command.h | 6 +-
camel/providers/imap4/camel-imap4-engine.h | 6 +-
camel/providers/imap4/camel-imap4-folder.h | 6 +-
camel/providers/imap4/camel-imap4-journal.h | 6 +-
camel/providers/imap4/camel-imap4-search.h | 6 +-
camel/providers/imap4/camel-imap4-specials.h | 6 +-
camel/providers/imap4/camel-imap4-store-summary.h | 6 +-
camel/providers/imap4/camel-imap4-store.h | 6 +-
camel/providers/imap4/camel-imap4-stream.h | 6 +-
camel/providers/imap4/camel-imap4-summary.h | 6 +-
camel/providers/imap4/camel-imap4-utils.h | 6 +-
camel/providers/imapx/camel-imapx-exception.h | 6 +-
camel/providers/imapx/camel-imapx-folder.c | 11 ----
camel/providers/imapx/camel-imapx-folder.h | 6 +--
camel/providers/imapx/camel-imapx-provider.c | 6 +--
camel/providers/imapx/camel-imapx-server.c | 22 +--------
camel/providers/imapx/camel-imapx-server.h | 9 ++--
camel/providers/imapx/camel-imapx-store-summary.c | 6 +--
camel/providers/imapx/camel-imapx-store-summary.h | 9 ++--
camel/providers/imapx/camel-imapx-store.c | 17 +------
camel/providers/imapx/camel-imapx-store.h | 7 +--
camel/providers/imapx/camel-imapx-stream.c | 2 -
camel/providers/imapx/camel-imapx-stream.h | 8 ++--
camel/providers/imapx/camel-imapx-summary.c | 7 ---
camel/providers/imapx/camel-imapx-summary.h | 10 ++--
camel/providers/imapx/camel-imapx-utils.c | 7 ---
camel/providers/imapx/camel-imapx-utils.h | 8 ++--
camel/providers/imapx/camel-imapx-view-summary.h | 6 +-
camel/providers/imapx/test-imapx.c | 1 -
camel/providers/local/camel-local-folder.c | 9 +---
camel/providers/local/camel-local-folder.h | 8 +--
camel/providers/local/camel-local-private.h | 2 +-
camel/providers/local/camel-local-provider.c | 4 --
camel/providers/local/camel-local-store.c | 7 ---
camel/providers/local/camel-local-store.h | 4 +-
camel/providers/local/camel-local-summary.c | 6 --
camel/providers/local/camel-local-summary.h | 11 ++---
camel/providers/local/camel-maildir-folder.c | 5 --
camel/providers/local/camel-maildir-folder.h | 2 +-
camel/providers/local/camel-maildir-store.c | 5 --
camel/providers/local/camel-maildir-store.h | 2 +-
camel/providers/local/camel-maildir-summary.c | 8 ---
camel/providers/local/camel-maildir-summary.h | 9 +--
camel/providers/local/camel-mbox-folder.c | 12 -----
camel/providers/local/camel-mbox-folder.h | 2 +-
camel/providers/local/camel-mbox-store.c | 6 --
camel/providers/local/camel-mbox-store.h | 2 +-
camel/providers/local/camel-mbox-summary.c | 9 ---
camel/providers/local/camel-mbox-summary.h | 6 +-
camel/providers/local/camel-mh-folder.c | 4 --
camel/providers/local/camel-mh-folder.h | 2 +-
camel/providers/local/camel-mh-store.c | 6 --
camel/providers/local/camel-mh-store.h | 2 +-
camel/providers/local/camel-mh-summary.c | 5 +--
camel/providers/local/camel-mh-summary.h | 9 +--
camel/providers/local/camel-spool-folder.c | 11 ----
camel/providers/local/camel-spool-folder.h | 5 +--
camel/providers/local/camel-spool-store.c | 6 --
camel/providers/local/camel-spool-store.h | 2 +-
camel/providers/local/camel-spool-summary.c | 6 --
camel/providers/local/camel-spool-summary.h | 12 ++---
camel/providers/nntp/camel-nntp-auth.c | 3 -
camel/providers/nntp/camel-nntp-auth.h | 4 +-
camel/providers/nntp/camel-nntp-folder.c | 16 +------
camel/providers/nntp/camel-nntp-folder.h | 5 +-
camel/providers/nntp/camel-nntp-grouplist.c | 2 -
camel/providers/nntp/camel-nntp-grouplist.h | 2 +-
camel/providers/nntp/camel-nntp-newsrc.c | 2 -
camel/providers/nntp/camel-nntp-newsrc.h | 6 +-
camel/providers/nntp/camel-nntp-private.h | 2 +-
camel/providers/nntp/camel-nntp-provider.c | 2 -
camel/providers/nntp/camel-nntp-resp-codes.h | 2 +-
camel/providers/nntp/camel-nntp-store-summary.c | 4 +-
camel/providers/nntp/camel-nntp-store-summary.h | 9 ++--
camel/providers/nntp/camel-nntp-store.c | 13 +-----
camel/providers/nntp/camel-nntp-store.h | 4 +-
camel/providers/nntp/camel-nntp-stream.c | 2 -
camel/providers/nntp/camel-nntp-stream.h | 8 ++--
camel/providers/nntp/camel-nntp-summary.c | 9 ---
camel/providers/nntp/camel-nntp-summary.h | 8 ++--
camel/providers/nntp/camel-nntp-types.h | 2 +-
camel/providers/nntp/camel-nntp-utils.c | 4 --
camel/providers/nntp/camel-nntp-utils.h | 2 +-
camel/providers/pop3/camel-pop3-engine.c | 5 +-
camel/providers/pop3/camel-pop3-engine.h | 10 ++--
camel/providers/pop3/camel-pop3-folder.c | 6 --
camel/providers/pop3/camel-pop3-folder.h | 4 +-
camel/providers/pop3/camel-pop3-provider.c | 4 --
camel/providers/pop3/camel-pop3-store.c | 16 ------
camel/providers/pop3/camel-pop3-store.h | 6 +-
camel/providers/pop3/camel-pop3-stream.h | 8 ++--
camel/providers/sendmail/camel-sendmail-provider.c | 4 +-
.../providers/sendmail/camel-sendmail-transport.c | 6 --
.../providers/sendmail/camel-sendmail-transport.h | 4 +-
camel/providers/smtp/camel-smtp-provider.c | 5 +--
camel/providers/smtp/camel-smtp-transport.c | 24 +--------
camel/providers/smtp/camel-smtp-transport.h | 5 +-
camel/tests/lib/camel-test-provider.h | 4 +-
259 files changed, 968 insertions(+), 1034 deletions(-)
---
diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am
index 18150e6..fe58e29 100644
--- a/addressbook/libebook/Makefile.am
+++ b/addressbook/libebook/Makefile.am
@@ -14,7 +14,8 @@ libebook_1_2_la_CPPFLAGS = \
-I$(top_srcdir)/addressbook \
-I$(top_builddir)/addressbook \
-I$(top_builddir)/addressbook/libebook \
- $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS) \
+ $(CAMEL_CFLAGS)
libebook_1_2_la_SOURCES = \
$(MARSHAL_GENERATED) \
@@ -33,8 +34,9 @@ libebook_1_2_la_SOURCES = \
libebook_1_2_la_LIBADD = \
$(top_builddir)/camel/libcamel-1.2.la \
- $(top_builddir)/libedataserver/libedataserver-1.2.la \
- $(EVOLUTION_ADDRESSBOOK_LIBS)
+ $(top_builddir)/libedataserver/libedataserver-1.2.la \
+ $(EVOLUTION_ADDRESSBOOK_LIBS) \
+ $(CAMEL_LIBS)
libebook_1_2_la_LDFLAGS = \
-version-info $(LIBEBOOK_CURRENT):$(LIBEBOOK_REVISION):$(LIBEBOOK_AGE) $(NO_UNDEFINED)
diff --git a/addressbook/libebook/e-destination.c b/addressbook/libebook/e-destination.c
index 6ed9870..a3fdc25 100644
--- a/addressbook/libebook/e-destination.c
+++ b/addressbook/libebook/e-destination.c
@@ -44,7 +44,7 @@
#include <glib.h>
#include <libxml/xmlmemory.h>
#include <glib/gi18n-lib.h>
-#include <camel/camel-internet-address.h>
+#include <camel/camel.h>
#define d(x)
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 37d067e..ac860ea 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -30,15 +30,16 @@ camellibexec_PROGRAMS = $(LOCK_HELPER) camel-index-control-1.2
lib_LTLIBRARIES = libcamel-1.2.la libcamel-provider-1.2.la
libcamel_provider_1_2_la_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- -I$(srcdir) \
+ $(AM_CPPFLAGS) \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ -I$(srcdir) \
-DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\" \
- -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
- -DG_LOG_DOMAIN=\"camel\" \
+ -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
+ -DG_LOG_DOMAIN=\"camel\" \
-DE_DATA_SERVER_PREFIX=\"$(prefix)\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
+ -DCAMEL_COMPILATION \
$(CAMEL_CFLAGS) \
$(DBUS_GLIB_CFLAGS)
@@ -144,15 +145,16 @@ libcamel_provider_1_2_la_LIBADD = \
$(DBUS_GLIB_LIBS)
libcamel_1_2_la_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- -I$(srcdir) \
+ $(AM_CPPFLAGS) \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ -I$(srcdir) \
-DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\" \
- -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
- -DG_LOG_DOMAIN=\"camel\" \
+ -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
+ -DG_LOG_DOMAIN=\"camel\" \
-DE_DATA_SERVER_PREFIX=\"$(prefix)\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
+ -DCAMEL_COMPILATION \
$(CAMEL_CFLAGS)
libcamel_1_2_la_SOURCES = \
@@ -311,15 +313,16 @@ libcamel_1_2_la_LIBADD = \
$(REGEX_LIBS)
camel_lock_helper_1_2_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- -I$(srcdir) \
+ $(AM_CPPFLAGS) \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ -I$(srcdir) \
-DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\" \
- -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
- -DG_LOG_DOMAIN=\"camel\" \
+ -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
+ -DG_LOG_DOMAIN=\"camel\" \
-DE_DATA_SERVER_PREFIX=\"$(prefix)\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
+ -DCAMEL_COMPILATION \
$(CAMEL_CFLAGS)
camel_lock_helper_1_2_SOURCES = \
@@ -334,15 +337,16 @@ camel_lock_helper_1_2_LDADD = \
$(libcamel_1_2_la_LIBADD)
camel_index_control_1_2_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- -I$(srcdir) \
+ $(AM_CPPFLAGS) \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ -I$(srcdir) \
-DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\" \
- -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
- -DG_LOG_DOMAIN=\"camel\" \
+ -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
+ -DG_LOG_DOMAIN=\"camel\" \
-DE_DATA_SERVER_PREFIX=\"$(prefix)\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
+ -DCAMEL_COMPILATION \
$(CAMEL_CFLAGS)
camel_index_control_1_2_SOURCES = \
diff --git a/camel/camel-address.h b/camel/camel-address.h
index 8b571b0..d36c1aa 100644
--- a/camel/camel-address.h
+++ b/camel/camel-address.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_ADDRESS_H
-#define _CAMEL_ADDRESS_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_ADDRESS_H
+#define CAMEL_ADDRESS_H
#include <glib.h>
#include <camel/camel-object.h>
@@ -72,4 +76,4 @@ void camel_address_remove (CamelAddress *addr, gint index);
G_END_DECLS
-#endif /* _CAMEL_ADDRESS_H */
+#endif /* CAMEL_ADDRESS_H */
diff --git a/camel/camel-arg.h b/camel/camel-arg.h
index 4159b92..0923c9e 100644
--- a/camel/camel-arg.h
+++ b/camel/camel-arg.h
@@ -20,8 +20,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_ARG_H
-#define CAMEL_ARG_H 1
+#define CAMEL_ARG_H
#include <glib.h>
#include <stdarg.h>
diff --git a/camel/camel-block-file.h b/camel/camel-block-file.h
index 1bf1e5b..ac55fc0 100644
--- a/camel/camel-block-file.h
+++ b/camel/camel-block-file.h
@@ -18,8 +18,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_BLOCK_FILE_H
-#define _CAMEL_BLOCK_FILE_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_BLOCK_FILE_H
+#define CAMEL_BLOCK_FILE_H
#include <camel/camel-object.h>
#include <camel/camel-list-utils.h>
@@ -145,4 +149,4 @@ gint camel_key_file_read(CamelKeyFile *kf, camel_block_t *start, gsiz
G_END_DECLS
-#endif /* _CAMEL_BLOCK_FILE_H */
+#endif /* CAMEL_BLOCK_FILE_H */
diff --git a/camel/camel-certdb.h b/camel/camel-certdb.h
index 21b6168..3b907ff 100644
--- a/camel/camel-certdb.h
+++ b/camel/camel-certdb.h
@@ -20,8 +20,12 @@
*
*/
-#ifndef __CAMEL_CERTDB_H__
-#define __CAMEL_CERTDB_H__
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_CERTDB_H
+#define CAMEL_CERTDB_H
#include <stdio.h>
#include <camel/camel-object.h>
@@ -143,4 +147,4 @@ void camel_cert_set_trust (CamelCertDB *certdb, CamelCert *cert, CamelCertTrust
G_END_DECLS
-#endif /* __CAMEL_CERTDB_H__ */
+#endif /* CAMEL_CERTDB_H */
diff --git a/camel/camel-charset-map.h b/camel/camel-charset-map.h
index 3b6823c..119117b 100644
--- a/camel/camel-charset-map.h
+++ b/camel/camel-charset-map.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_CHARSET_MAP_H
-#define _CAMEL_CHARSET_MAP_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_CHARSET_MAP_H
+#define CAMEL_CHARSET_MAP_H
#include <glib.h>
@@ -45,4 +49,4 @@ const gchar *camel_charset_iso_to_windows (const gchar *isocharset);
G_END_DECLS
-#endif /* _CAMEL_CHARSET_MAP_H */
+#endif /* CAMEL_CHARSET_MAP_H */
diff --git a/camel/camel-cipher-context.h b/camel/camel-cipher-context.h
index 7364416..6f4069e 100644
--- a/camel/camel-cipher-context.h
+++ b/camel/camel-cipher-context.h
@@ -20,6 +20,10 @@
*
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_CIPHER_CONTEXT_H
#define CAMEL_CIPHER_CONTEXT_H
diff --git a/camel/camel-data-cache.h b/camel/camel-data-cache.h
index e4c0688..90cea47 100644
--- a/camel/camel-data-cache.h
+++ b/camel/camel-data-cache.h
@@ -20,8 +20,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_DATA_CACHE_H
-#define CAMEL_DATA_CACHE_H 1
+#define CAMEL_DATA_CACHE_H
#include <glib.h>
diff --git a/camel/camel-data-wrapper.h b/camel/camel-data-wrapper.h
index c1a33a7..6f6683d 100644
--- a/camel/camel-data-wrapper.h
+++ b/camel/camel-data-wrapper.h
@@ -22,8 +22,12 @@
*
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_DATA_WRAPPER_H
-#define CAMEL_DATA_WRAPPER_H 1
+#define CAMEL_DATA_WRAPPER_H
#include <glib.h>
#include <sys/types.h>
diff --git a/camel/camel-db.h b/camel/camel-db.h
index 27a59f8..56c40f4 100644
--- a/camel/camel-db.h
+++ b/camel/camel-db.h
@@ -1,7 +1,11 @@
/* Srinivasa Ragavan - <sragavan novell com> - GPL v2 or later */
-#ifndef __CAMEL_DB_H
-#define __CAMEL_DB_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_DB_H
+#define CAMEL_DB_H
#include <sqlite3.h>
#include <glib.h>
diff --git a/camel/camel-debug.h b/camel/camel-debug.h
index 988c4a3..da1556d 100644
--- a/camel/camel-debug.h
+++ b/camel/camel-debug.h
@@ -19,8 +19,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_DEBUG_H
-#define CAMEL_DEBUG_H 1
+#define CAMEL_DEBUG_H
#include <glib.h>
diff --git a/camel/camel-disco-diary.h b/camel/camel-disco-diary.h
index 4fff9ea..dbbfd6c 100644
--- a/camel/camel-disco-diary.h
+++ b/camel/camel-disco-diary.h
@@ -21,10 +21,14 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_DISABLE_DEPRECATED
#ifndef CAMEL_DISCO_DIARY_H
-#define CAMEL_DISCO_DIARY_H 1
+#define CAMEL_DISCO_DIARY_H
#include "camel-object.h"
#include <stdarg.h>
diff --git a/camel/camel-disco-folder.h b/camel/camel-disco-folder.h
index 5279bf3..fa661df 100644
--- a/camel/camel-disco-folder.h
+++ b/camel/camel-disco-folder.h
@@ -21,10 +21,14 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_DISABLE_DEPRECATED
#ifndef CAMEL_DISCO_FOLDER_H
-#define CAMEL_DISCO_FOLDER_H 1
+#define CAMEL_DISCO_FOLDER_H
#include "camel-folder.h"
diff --git a/camel/camel-disco-store.h b/camel/camel-disco-store.h
index b1477cf..5eb1054 100644
--- a/camel/camel-disco-store.h
+++ b/camel/camel-disco-store.h
@@ -21,10 +21,14 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_DISABLE_DEPRECATED
#ifndef CAMEL_DISCO_STORE_H
-#define CAMEL_DISCO_STORE_H 1
+#define CAMEL_DISCO_STORE_H
#include <camel/camel-store.h>
diff --git a/camel/camel-exception.h b/camel/camel-exception.h
index 5f41d66..fd605cb 100644
--- a/camel/camel-exception.h
+++ b/camel/camel-exception.h
@@ -23,8 +23,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_EXCEPTION_H
-#define CAMEL_EXCEPTION_H 1
+#define CAMEL_EXCEPTION_H
#include <camel/camel-types.h>
diff --git a/camel/camel-file-utils.h b/camel/camel-file-utils.h
index 5c8ac4b..4340a47 100644
--- a/camel/camel-file-utils.h
+++ b/camel/camel-file-utils.h
@@ -23,8 +23,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_FILE_UTILS_H
-#define CAMEL_FILE_UTILS_H 1
+#define CAMEL_FILE_UTILS_H
#include <glib.h>
#include <stdio.h>
diff --git a/camel/camel-filter-driver.h b/camel/camel-filter-driver.h
index e1d6116..47bb13a 100644
--- a/camel/camel-filter-driver.h
+++ b/camel/camel-filter-driver.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_FILTER_DRIVER_H
-#define _CAMEL_FILTER_DRIVER_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_FILTER_DRIVER_H
+#define CAMEL_FILTER_DRIVER_H
#include <glib.h>
#include <camel/camel-object.h>
@@ -102,4 +106,4 @@ gint camel_filter_driver_filter_folder (CamelFilterDriver *driver, Camel
G_END_DECLS
-#endif /* _CAMEL_FILTER_DRIVER_H */
+#endif /* CAMEL_FILTER_DRIVER_H */
diff --git a/camel/camel-filter-search.h b/camel/camel-filter-search.h
index ec83c3c..5567dff 100644
--- a/camel/camel-filter-search.h
+++ b/camel/camel-filter-search.h
@@ -21,6 +21,10 @@
*
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_FILTER_SEARCH_H
#define CAMEL_FILTER_SEARCH_H
diff --git a/camel/camel-folder-search.h b/camel/camel-folder-search.h
index fa3d982..ec0e4f3 100644
--- a/camel/camel-folder-search.h
+++ b/camel/camel-folder-search.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_FOLDER_SEARCH_H
-#define _CAMEL_FOLDER_SEARCH_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_FOLDER_SEARCH_H
+#define CAMEL_FOLDER_SEARCH_H
#include <libedataserver/e-sexp.h>
#include <camel/camel-folder.h>
@@ -147,4 +151,4 @@ void camel_folder_search_free_result(CamelFolderSearch *search, GPtrArray *);
G_END_DECLS
-#endif /* _CAMEL_FOLDER_SEARCH_H */
+#endif /* CAMEL_FOLDER_SEARCH_H */
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
index 98629b5..2d7fd2c 100644
--- a/camel/camel-folder-summary.h
+++ b/camel/camel-folder-summary.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_FOLDER_SUMMARY_H
-#define _CAMEL_FOLDER_SUMMARY_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_FOLDER_SUMMARY_H
+#define CAMEL_FOLDER_SUMMARY_H
#include <stdio.h>
#include <time.h>
@@ -516,4 +520,4 @@ gint camel_folder_summary_migrate_infos(CamelFolderSummary *s);
G_END_DECLS
-#endif /* _CAMEL_FOLDER_SUMMARY_H */
+#endif /* CAMEL_FOLDER_SUMMARY_H */
diff --git a/camel/camel-folder-thread.h b/camel/camel-folder-thread.h
index 4c0515d..9a72f55 100644
--- a/camel/camel-folder-thread.h
+++ b/camel/camel-folder-thread.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_FOLDER_THREAD_H
-#define _CAMEL_FOLDER_THREAD_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_FOLDER_THREAD_H
+#define CAMEL_FOLDER_THREAD_H
#include <camel/camel-folder-summary.h>
#include <camel/camel-folder.h>
@@ -65,4 +69,4 @@ gint camel_folder_threaded_messages_dump(CamelFolderThreadNode *c);
G_END_DECLS
-#endif /* _CAMEL_FOLDER_THREAD_H */
+#endif /* CAMEL_FOLDER_THREAD_H */
diff --git a/camel/camel-folder.h b/camel/camel-folder.h
index 26bc55c..aacdad4 100644
--- a/camel/camel-folder.h
+++ b/camel/camel-folder.h
@@ -22,8 +22,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_FOLDER_H
-#define CAMEL_FOLDER_H 1
+#define CAMEL_FOLDER_H
#include <glib.h>
#include <camel/camel-object.h>
diff --git a/camel/camel-gpg-context.h b/camel/camel-gpg-context.h
index 3c67c28..1cb0b78 100644
--- a/camel/camel-gpg-context.h
+++ b/camel/camel-gpg-context.h
@@ -20,8 +20,12 @@
*
*/
-#ifndef __CAMEL_GPG_CONTEXT_H__
-#define __CAMEL_GPG_CONTEXT_H__
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_GPG_CONTEXT_H
+#define CAMEL_GPG_CONTEXT_H
#include <camel/camel-cipher-context.h>
@@ -54,4 +58,4 @@ void camel_gpg_context_set_always_trust (CamelGpgContext *ctx, gboolean trust);
G_END_DECLS
-#endif /* __CAMEL_GPG_CONTEXT_H__ */
+#endif /* CAMEL_GPG_CONTEXT_H */
diff --git a/camel/camel-html-parser.h b/camel/camel-html-parser.h
index c792410..6a1863c 100644
--- a/camel/camel-html-parser.h
+++ b/camel/camel-html-parser.h
@@ -25,8 +25,12 @@
* IT IS SUBJECT TO CHANGE OR MAY VANISH AT ANY TIME
*/
-#ifndef _CAMEL_HTML_PARSER_H
-#define _CAMEL_HTML_PARSER_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_HTML_PARSER_H
+#define CAMEL_HTML_PARSER_H
#include <camel/camel-object.h>
@@ -79,4 +83,4 @@ const GPtrArray *camel_html_parser_attr_list(CamelHTMLParser *hp, const GPtrArra
G_END_DECLS
-#endif /* _CAMEL_HTML_PARSER_H */
+#endif /* CAMEL_HTML_PARSER_H */
diff --git a/camel/camel-http-stream.h b/camel/camel-http-stream.h
index 7e3703a..a064632 100644
--- a/camel/camel-http-stream.h
+++ b/camel/camel-http-stream.h
@@ -20,8 +20,12 @@
*
*/
-#ifndef __CAMEL_HTTP_STREAM_H__
-#define __CAMEL_HTTP_STREAM_H__
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_HTTP_STREAM_H
+#define CAMEL_HTTP_STREAM_H
#include <camel/camel-mime-parser.h>
#include <camel/camel-mime-utils.h>
@@ -95,4 +99,4 @@ CamelContentType *camel_http_stream_get_content_type (CamelHttpStream *http_stre
G_END_DECLS
-#endif /* __CAMEL_HTTP_STREAM_H__ */
+#endif /* CAMEL_HTTP_STREAM_H */
diff --git a/camel/camel-iconv.h b/camel/camel-iconv.h
index 1199bb5..85c3a36 100644
--- a/camel/camel-iconv.h
+++ b/camel/camel-iconv.h
@@ -20,8 +20,12 @@
*
*/
-#ifndef __CAMEL_ICONV_H__
-#define __CAMEL_ICONV_H__
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_ICONV_H
+#define CAMEL_ICONV_H
#include <sys/types.h>
#include <iconv.h>
@@ -46,4 +50,4 @@ void camel_iconv_close (iconv_t cd);
G_END_DECLS
-#endif /* __CAMEL_ICONV_H__ */
+#endif /* CAMEL_ICONV_H */
diff --git a/camel/camel-index.h b/camel/camel-index.h
index 3d4f0e2..c571cdd 100644
--- a/camel/camel-index.h
+++ b/camel/camel-index.h
@@ -18,8 +18,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_INDEX_H
-#define _CAMEL_INDEX_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_INDEX_H
+#define CAMEL_INDEX_H
#include <camel/camel-exception.h>
#include <camel/camel-object.h>
@@ -166,4 +170,4 @@ CamelIndexCursor *camel_index_names(CamelIndex *idx);
G_END_DECLS
-#endif /* _CAMEL_INDEX_H */
+#endif /* CAMEL_INDEX_H */
diff --git a/camel/camel-internet-address.h b/camel/camel-internet-address.h
index 3c69676..fe83cb2 100644
--- a/camel/camel-internet-address.h
+++ b/camel/camel-internet-address.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_INTERNET_ADDRESS_H
-#define _CAMEL_INTERNET_ADDRESS_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_INTERNET_ADDRESS_H
+#define CAMEL_INTERNET_ADDRESS_H
#include <camel/camel-address.h>
@@ -57,4 +61,4 @@ gchar * camel_internet_address_format_address(const gchar *name, const gchar *
G_END_DECLS
-#endif /* _CAMEL_INTERNET_ADDRESS_H */
+#endif /* CAMEL_INTERNET_ADDRESS_H */
diff --git a/camel/camel-junk-plugin.h b/camel/camel-junk-plugin.h
index 82924f1..da14ec1 100644
--- a/camel/camel-junk-plugin.h
+++ b/camel/camel-junk-plugin.h
@@ -20,8 +20,12 @@
* USA
*/
-#ifndef _CAMEL_JUNK_PLUGIN_H
-#define _CAMEL_JUNK_PLUGIN_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_JUNK_PLUGIN_H
+#define CAMEL_JUNK_PLUGIN_H
#define CAMEL_JUNK_PLUGIN(x) ((CamelJunkPlugin *) x)
diff --git a/camel/camel-list-utils.h b/camel/camel-list-utils.h
index a30b1f3..d04ac25 100644
--- a/camel/camel-list-utils.h
+++ b/camel/camel-list-utils.h
@@ -19,8 +19,12 @@
*
*/
-#ifndef _CAMEL_LIST_UTILS_H
-#define _CAMEL_LIST_UTILS_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_LIST_UTILS_H
+#define CAMEL_LIST_UTILS_H
#include <glib.h>
diff --git a/camel/camel-lock-client.h b/camel/camel-lock-client.h
index 0a99bed..f0e1c45 100644
--- a/camel/camel-lock-client.h
+++ b/camel/camel-lock-client.h
@@ -21,8 +21,12 @@
/* defines protocol for lock helper process ipc */
-#ifndef _CAMEL_LOCK_CLIENT_H
-#define _CAMEL_LOCK_CLIENT_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_LOCK_CLIENT_H
+#define CAMEL_LOCK_CLIENT_H
#include <camel/camel-exception.h>
@@ -33,4 +37,4 @@ gint camel_lock_helper_unlock(gint lockid);
G_END_DECLS
-#endif /* _CAMEL_LOCK_HELPER_H */
+#endif /* CAMEL_LOCK_HELPER_H */
diff --git a/camel/camel-lock-helper.h b/camel/camel-lock-helper.h
index 9582e58..e02490c 100644
--- a/camel/camel-lock-helper.h
+++ b/camel/camel-lock-helper.h
@@ -21,8 +21,12 @@
/* defines protocol for lock helper process ipc */
-#ifndef _CAMEL_LOCK_HELPER_H
-#define _CAMEL_LOCK_HELPER_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_LOCK_HELPER_H
+#define CAMEL_LOCK_HELPER_H
#include <glib.h>
@@ -61,4 +65,4 @@ enum {
G_END_DECLS
-#endif /* _CAMEL_LOCK_HELPER_H */
+#endif /* CAMEL_LOCK_HELPER_H */
diff --git a/camel/camel-lock.h b/camel/camel-lock.h
index 8e3e78f..28067e2 100644
--- a/camel/camel-lock.h
+++ b/camel/camel-lock.h
@@ -19,8 +19,12 @@
* USA
*/
-#ifndef _CAMEL_LOCK_H
-#define _CAMEL_LOCK_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_LOCK_H
+#define CAMEL_LOCK_H
#include <camel/camel-exception.h>
@@ -55,4 +59,4 @@ void camel_unlock_folder(const gchar *path, gint fd);
G_END_DECLS
-#endif /* _CAMEL_LOCK_H */
+#endif /* CAMEL_LOCK_H */
diff --git a/camel/camel-medium.h b/camel/camel-medium.h
index 096d67d..081d9df 100644
--- a/camel/camel-medium.h
+++ b/camel/camel-medium.h
@@ -23,8 +23,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_MEDIUM_H
-#define CAMEL_MEDIUM_H 1
+#define CAMEL_MEDIUM_H
#include <camel/camel-data-wrapper.h>
diff --git a/camel/camel-mempool.h b/camel/camel-mempool.h
index 5bb3cc0..be01cc1 100644
--- a/camel/camel-mempool.h
+++ b/camel/camel-mempool.h
@@ -18,6 +18,10 @@
*
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_MEMPOOL_H
#define CAMEL_MEMPOOL_H
diff --git a/camel/camel-mime-filter-basic.h b/camel/camel-mime-filter-basic.h
index 81ac4dd..b6d6a78 100644
--- a/camel/camel-mime-filter-basic.h
+++ b/camel/camel-mime-filter-basic.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MIME_FILTER_BASIC_H
-#define _CAMEL_MIME_FILTER_BASIC_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_MIME_FILTER_BASIC_H
+#define CAMEL_MIME_FILTER_BASIC_H
#include <camel/camel-mime-filter.h>
@@ -63,4 +67,4 @@ CamelMimeFilterBasic *camel_mime_filter_basic_new_type (CamelMimeFilterBasi
G_END_DECLS
-#endif /* _CAMEL_MIME_FILTER_BASIC_H */
+#endif /* CAMEL_MIME_FILTER_BASIC_H */
diff --git a/camel/camel-mime-filter-bestenc.h b/camel/camel-mime-filter-bestenc.h
index d978b35..22823a0 100644
--- a/camel/camel-mime-filter-bestenc.h
+++ b/camel/camel-mime-filter-bestenc.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MIME_FILTER_BESTENC_H
-#define _CAMEL_MIME_FILTER_BESTENC_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_MIME_FILTER_BESTENC_H
+#define CAMEL_MIME_FILTER_BESTENC_H
#include <camel/camel-mime-filter.h>
#include <camel/camel-mime-part.h>
@@ -90,4 +94,4 @@ void camel_mime_filter_bestenc_set_flags(CamelMimeFilterBestenc *filter, guint
G_END_DECLS
-#endif /* _CAMEL_MIME_FILTER_BESTENC_H */
+#endif /* CAMEL_MIME_FILTER_BESTENC_H */
diff --git a/camel/camel-mime-filter-canon.h b/camel/camel-mime-filter-canon.h
index edb661c..105ecca 100644
--- a/camel/camel-mime-filter-canon.h
+++ b/camel/camel-mime-filter-canon.h
@@ -20,8 +20,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MIME_FILTER_CANON_H
-#define _CAMEL_MIME_FILTER_CANON_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_MIME_FILTER_CANON_H
+#define CAMEL_MIME_FILTER_CANON_H
#include <camel/camel-mime-filter.h>
@@ -57,4 +61,4 @@ CamelMimeFilter *camel_mime_filter_canon_new(guint32 flags);
G_END_DECLS
-#endif /* _CAMEL_MIME_FILTER_CANON_H */
+#endif /* CAMEL_MIME_FILTER_CANON_H */
diff --git a/camel/camel-mime-filter-charset.h b/camel/camel-mime-filter-charset.h
index 9c2db10..653a146 100644
--- a/camel/camel-mime-filter-charset.h
+++ b/camel/camel-mime-filter-charset.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MIME_FILTER_CHARSET_H
-#define _CAMEL_MIME_FILTER_CHARSET_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_MIME_FILTER_CHARSET_H
+#define CAMEL_MIME_FILTER_CHARSET_H
#include <camel/camel-mime-filter.h>
#include <iconv.h>
@@ -54,4 +58,4 @@ CamelMimeFilterCharset *camel_mime_filter_charset_new_convert (const gchar
G_END_DECLS
-#endif /* _CAMEL_MIME_FILTER_CHARSET_H */
+#endif /* CAMEL_MIME_FILTER_CHARSET_H */
diff --git a/camel/camel-mime-filter-crlf.h b/camel/camel-mime-filter-crlf.h
index bb4b48d..002bbb1 100644
--- a/camel/camel-mime-filter-crlf.h
+++ b/camel/camel-mime-filter-crlf.h
@@ -20,8 +20,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MIME_FILTER_CRLF_H
-#define _CAMEL_MIME_FILTER_CRLF_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_MIME_FILTER_CRLF_H
+#define CAMEL_MIME_FILTER_CRLF_H
#include <camel/camel-mime-filter.h>
@@ -64,4 +68,4 @@ CamelMimeFilter *camel_mime_filter_crlf_new (CamelMimeFilterCRLFDirection direct
G_END_DECLS
-#endif /* _CAMEL_MIME_FILTER_CRLF_H */
+#endif /* CAMEL_MIME_FILTER_CRLF_H */
diff --git a/camel/camel-mime-filter-enriched.h b/camel/camel-mime-filter-enriched.h
index e1d2345..0ec03ec 100644
--- a/camel/camel-mime-filter-enriched.h
+++ b/camel/camel-mime-filter-enriched.h
@@ -20,8 +20,12 @@
*
*/
-#ifndef __CAMEL_MIME_FILTER_ENRICHED_H__
-#define __CAMEL_MIME_FILTER_ENRICHED_H__
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_MIME_FILTER_ENRICHED_H
+#define CAMEL_MIME_FILTER_ENRICHED_H
#include <camel/camel-mime-filter.h>
@@ -56,4 +60,4 @@ gchar *camel_enriched_to_html(const gchar *in, guint32 flags);
G_END_DECLS
-#endif /* __CAMEL_MIME_FILTER_ENRICHED_H__ */
+#endif /* CAMEL_MIME_FILTER_ENRICHED_H */
diff --git a/camel/camel-mime-filter-from.h b/camel/camel-mime-filter-from.h
index b4b3f0d..b3148ac 100644
--- a/camel/camel-mime-filter-from.h
+++ b/camel/camel-mime-filter-from.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MIME_FILTER_FROM_H
-#define _CAMEL_MIME_FILTER_FROM_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_MIME_FILTER_FROM_H
+#define CAMEL_MIME_FILTER_FROM_H
#include <camel/camel-mime-filter.h>
@@ -48,4 +52,4 @@ CamelMimeFilterFrom *camel_mime_filter_from_new (void);
G_END_DECLS
-#endif /* _CAMEL_MIME_FILTER_FROM_H */
+#endif /* CAMEL_MIME_FILTER_FROM_H */
diff --git a/camel/camel-mime-filter-gzip.h b/camel/camel-mime-filter-gzip.h
index e32269a..f81c506 100644
--- a/camel/camel-mime-filter-gzip.h
+++ b/camel/camel-mime-filter-gzip.h
@@ -20,8 +20,12 @@
*
*/
-#ifndef __CAMEL_MIME_FILTER_GZIP_H__
-#define __CAMEL_MIME_FILTER_GZIP_H__
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_MIME_FILTER_GZIP_H
+#define CAMEL_MIME_FILTER_GZIP_H
#include <camel/camel-mime-filter.h>
@@ -62,4 +66,4 @@ CamelMimeFilter *camel_mime_filter_gzip_new (CamelMimeFilterGZipMode mode, gint
G_END_DECLS
-#endif /* __CAMEL_MIME_FILTER_GZIP_H__ */
+#endif /* CAMEL_MIME_FILTER_GZIP_H */
diff --git a/camel/camel-mime-filter-html.h b/camel/camel-mime-filter-html.h
index 210d268..807931f 100644
--- a/camel/camel-mime-filter-html.h
+++ b/camel/camel-mime-filter-html.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MIME_FILTER_HTML_H
-#define _CAMEL_MIME_FILTER_HTML_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_MIME_FILTER_HTML_H
+#define CAMEL_MIME_FILTER_HTML_H
#include <camel/camel-mime-filter.h>
@@ -48,4 +52,4 @@ CamelMimeFilterHTML *camel_mime_filter_html_new (void);
G_END_DECLS
-#endif /* _CAMEL_MIME_FILTER_HTML_H */
+#endif /* CAMEL_MIME_FILTER_HTML_H */
diff --git a/camel/camel-mime-filter-index.h b/camel/camel-mime-filter-index.h
index a55ac36..8ee4396 100644
--- a/camel/camel-mime-filter-index.h
+++ b/camel/camel-mime-filter-index.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MIME_FILTER_INDEX_H
-#define _CAMEL_MIME_FILTER_INDEX_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_MIME_FILTER_INDEX_H
+#define CAMEL_MIME_FILTER_INDEX_H
#include <camel/camel-mime-filter.h>
@@ -56,4 +60,4 @@ void camel_mime_filter_index_set_index (CamelMimeFilterIndex *filter, struct _Ca
G_END_DECLS
-#endif /* _CAMEL_MIME_FILTER_INDEX_H */
+#endif /* CAMEL_MIME_FILTER_INDEX_H */
diff --git a/camel/camel-mime-filter-linewrap.h b/camel/camel-mime-filter-linewrap.h
index 302d86c..99fb285 100644
--- a/camel/camel-mime-filter-linewrap.h
+++ b/camel/camel-mime-filter-linewrap.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MIME_FILTER_LINEWRAP_H
-#define _CAMEL_MIME_FILTER_LINEWRAP_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_MIME_FILTER_LINEWRAP_H
+#define CAMEL_MIME_FILTER_LINEWRAP_H
#include <camel/camel-mime-filter.h>
@@ -58,4 +62,4 @@ CamelMimeFilter *camel_mime_filter_linewrap_new (guint preferred_len, guint max_
G_END_DECLS
-#endif /* _CAMEL_MIME_FILTER_LINEWRAP_H */
+#endif /* CAMEL_MIME_FILTER_LINEWRAP_H */
diff --git a/camel/camel-mime-filter-pgp.h b/camel/camel-mime-filter-pgp.h
index 2da1b15..a750614 100644
--- a/camel/camel-mime-filter-pgp.h
+++ b/camel/camel-mime-filter-pgp.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MIME_FILTER_PGP_H
-#define _CAMEL_MIME_FILTER_PGP_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_MIME_FILTER_PGP_H
+#define CAMEL_MIME_FILTER_PGP_H
#include <camel/camel-mime-filter.h>
@@ -46,4 +50,4 @@ CamelMimeFilter *camel_mime_filter_pgp_new(void);
G_END_DECLS
-#endif /* _CAMEL_MIME_FILTER_PGP_H */
+#endif /* CAMEL_MIME_FILTER_PGP_H */
diff --git a/camel/camel-mime-filter-progress.h b/camel/camel-mime-filter-progress.h
index 12d3608..2c89a67 100644
--- a/camel/camel-mime-filter-progress.h
+++ b/camel/camel-mime-filter-progress.h
@@ -20,8 +20,12 @@
*
*/
-#ifndef __CAMEL_MIME_FILTER_PROGRESS_H__
-#define __CAMEL_MIME_FILTER_PROGRESS_H__
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_MIME_FILTER_PROGRESS_H
+#define CAMEL_MIME_FILTER_PROGRESS_H
#include <camel/camel-operation.h>
#include <camel/camel-mime-filter.h>
@@ -59,4 +63,4 @@ CamelMimeFilter *camel_mime_filter_progress_new (CamelOperation *operation, gsiz
G_END_DECLS
-#endif /* __CAMEL_MIME_FILTER_PROGRESS_H__ */
+#endif /* CAMEL_MIME_FILTER_PROGRESS_H */
diff --git a/camel/camel-mime-filter-save.h b/camel/camel-mime-filter-save.h
index 2f63c99..7317e1d 100644
--- a/camel/camel-mime-filter-save.h
+++ b/camel/camel-mime-filter-save.h
@@ -20,8 +20,12 @@
*
*/
-#ifndef __CAMEL_MIME_FILTER_SAVE_H__
-#define __CAMEL_MIME_FILTER_SAVE_H__
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_MIME_FILTER_SAVE_H
+#define CAMEL_MIME_FILTER_SAVE_H
#include <camel/camel-mime-filter.h>
#include <camel/camel-seekable-stream.h>
@@ -52,4 +56,4 @@ CamelMimeFilter *camel_mime_filter_save_new_with_stream (CamelStream *stream);
G_END_DECLS
-#endif /* __CAMEL_MIME_FILTER_SAVE_H__ */
+#endif /* CAMEL_MIME_FILTER_SAVE_H */
diff --git a/camel/camel-mime-filter-tohtml.h b/camel/camel-mime-filter-tohtml.h
index f485536..8b0eea3 100644
--- a/camel/camel-mime-filter-tohtml.h
+++ b/camel/camel-mime-filter-tohtml.h
@@ -20,8 +20,12 @@
*
*/
-#ifndef __CAMEL_MIME_FILTER_TOHTML_H__
-#define __CAMEL_MIME_FILTER_TOHTML_H__
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_MIME_FILTER_TOHTML_H
+#define CAMEL_MIME_FILTER_TOHTML_H
#include <camel/camel-mime-filter.h>
@@ -71,4 +75,4 @@ gchar *camel_text_to_html (const gchar *in, guint32 flags, guint32 colour);
G_END_DECLS
-#endif /* __CAMEL_MIME_FILTER_TOHTML_H__ */
+#endif /* CAMEL_MIME_FILTER_TOHTML_H */
diff --git a/camel/camel-mime-filter-windows.h b/camel/camel-mime-filter-windows.h
index 355946c..dc79464 100644
--- a/camel/camel-mime-filter-windows.h
+++ b/camel/camel-mime-filter-windows.h
@@ -20,8 +20,12 @@
*
*/
-#ifndef __CAMEL_MIME_FILTER_WINDOWS_H__
-#define __CAMEL_MIME_FILTER_WINDOWS_H__
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_MIME_FILTER_WINDOWS_H
+#define CAMEL_MIME_FILTER_WINDOWS_H
#include <camel/camel-mime-filter.h>
@@ -55,4 +59,4 @@ const gchar *camel_mime_filter_windows_real_charset (CamelMimeFilterWindows *fil
G_END_DECLS
-#endif /* __CAMEL_MIME_FILTER_WINDOWS_H__ */
+#endif /* CAMEL_MIME_FILTER_WINDOWS_H */
diff --git a/camel/camel-mime-filter-yenc.h b/camel/camel-mime-filter-yenc.h
index 4a3ade1..a5ea287 100644
--- a/camel/camel-mime-filter-yenc.h
+++ b/camel/camel-mime-filter-yenc.h
@@ -20,8 +20,12 @@
*
*/
-#ifndef __CAMEL_MIME_FILTER_YENC_H__
-#define __CAMEL_MIME_FILTER_YENC_H__
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_MIME_FILTER_YENC_H
+#define CAMEL_MIME_FILTER_YENC_H
#include <camel/camel-mime-filter.h>
@@ -98,4 +102,4 @@ gsize camel_yencode_close (const guchar *in, gsize inlen, guchar *out,
G_END_DECLS
-#endif /* __CAMEL_MIME_FILTER_YENC_H__ */
+#endif /* CAMEL_MIME_FILTER_YENC_H */
diff --git a/camel/camel-mime-filter.h b/camel/camel-mime-filter.h
index b36b8d2..63b56ea 100644
--- a/camel/camel-mime-filter.h
+++ b/camel/camel-mime-filter.h
@@ -21,8 +21,12 @@
/* Abstract class for non-copying filters */
-#ifndef _CAMEL_MIME_FILTER_H
-#define _CAMEL_MIME_FILTER_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_MIME_FILTER_H
+#define CAMEL_MIME_FILTER_H
#include <sys/types.h>
#include <camel/camel-object.h>
@@ -86,4 +90,4 @@ void camel_mime_filter_set_size(CamelMimeFilter *filter, gsize size, gint keep);
G_END_DECLS
-#endif /* _CAMEL_MIME_FILTER_H */
+#endif /* CAMEL_MIME_FILTER_H */
diff --git a/camel/camel-mime-message.h b/camel/camel-mime-message.h
index 6016f89..01d5feb 100644
--- a/camel/camel-mime-message.h
+++ b/camel/camel-mime-message.h
@@ -21,8 +21,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_MIME_MESSAGE_H
-#define CAMEL_MIME_MESSAGE_H 1
+#define CAMEL_MIME_MESSAGE_H
#include <camel/camel-mime-part.h>
#include <camel/camel-mime-utils.h>
diff --git a/camel/camel-mime-parser.h b/camel/camel-mime-parser.h
index 8d3ad79..a9d9e9a 100644
--- a/camel/camel-mime-parser.h
+++ b/camel/camel-mime-parser.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MIME_PARSER_H
-#define _CAMEL_MIME_PARSER_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_MIME_PARSER_H
+#define CAMEL_MIME_PARSER_H
#include <camel/camel-object.h>
@@ -139,4 +143,4 @@ off_t camel_mime_parser_tell_start_boundary(CamelMimeParser *parser);
G_END_DECLS
-#endif /* _CAMEL_MIME_PARSER_H */
+#endif /* CAMEL_MIME_PARSER_H */
diff --git a/camel/camel-mime-part-utils.h b/camel/camel-mime-part-utils.h
index 45a5a6e..6691c9e 100644
--- a/camel/camel-mime-part-utils.h
+++ b/camel/camel-mime-part-utils.h
@@ -23,8 +23,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_MIME_PART_UTILS_H
-#define CAMEL_MIME_PART_UTILS_H 1
+#define CAMEL_MIME_PART_UTILS_H
#include <camel/camel-mime-part.h>
#include <camel/camel-folder-summary.h>
diff --git a/camel/camel-mime-part.h b/camel/camel-mime-part.h
index 379287b..a2b97b9 100644
--- a/camel/camel-mime-part.h
+++ b/camel/camel-mime-part.h
@@ -23,8 +23,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_MIME_PART_H
-#define CAMEL_MIME_PART_H 1
+#define CAMEL_MIME_PART_H
#include <camel/camel-medium.h>
#include <camel/camel-mime-utils.h>
diff --git a/camel/camel-mime-utils.h b/camel/camel-mime-utils.h
index 03be078..d83e411 100644
--- a/camel/camel-mime-utils.h
+++ b/camel/camel-mime-utils.h
@@ -20,8 +20,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MIME_UTILS_H
-#define _CAMEL_MIME_UTILS_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_MIME_UTILS_H
+#define CAMEL_MIME_UTILS_H
#include <time.h>
#include <glib.h>
@@ -270,4 +274,4 @@ extern unsigned short camel_mime_special_table[256];
G_END_DECLS
-#endif /* _CAMEL_MIME_UTILS_H */
+#endif /* CAMEL_MIME_UTILS_H */
diff --git a/camel/camel-movemail.h b/camel/camel-movemail.h
index a0cbb47..2923274 100644
--- a/camel/camel-movemail.h
+++ b/camel/camel-movemail.h
@@ -22,8 +22,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_MOVEMAIL_H
-#define CAMEL_MOVEMAIL_H 1
+#define CAMEL_MOVEMAIL_H
#include <camel/camel-exception.h>
diff --git a/camel/camel-msgport.h b/camel/camel-msgport.h
index 7c7a91c..975517b 100644
--- a/camel/camel-msgport.h
+++ b/camel/camel-msgport.h
@@ -18,6 +18,10 @@
*
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_MSGPORT_H
#define CAMEL_MSGPORT_H
diff --git a/camel/camel-multipart-encrypted.h b/camel/camel-multipart-encrypted.h
index 7068cd5..2a5c1b7 100644
--- a/camel/camel-multipart-encrypted.h
+++ b/camel/camel-multipart-encrypted.h
@@ -20,8 +20,12 @@
*
*/
-#ifndef __CAMEL_MULTIPART_ENCRYPTED_H__
-#define __CAMEL_MULTIPART_ENCRYPTED_H__
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_MULTIPART_ENCRYPTED_H
+#define CAMEL_MULTIPART_ENCRYPTED_H
#include <camel/camel-multipart.h>
@@ -62,4 +66,4 @@ CamelMultipartEncrypted *camel_multipart_encrypted_new (void);
G_END_DECLS
-#endif /* __CAMEL_MULTIPART_ENCRYPTED_H__ */
+#endif /* CAMEL_MULTIPART_ENCRYPTED_H */
diff --git a/camel/camel-multipart-signed.h b/camel/camel-multipart-signed.h
index 8e673dc..176ba5f 100644
--- a/camel/camel-multipart-signed.h
+++ b/camel/camel-multipart-signed.h
@@ -24,8 +24,12 @@
No, because we dont have different parts?
I'm not really sure yet ... ? */
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_MULTIPART_SIGNED_H
-#define CAMEL_MULTIPART_SIGNED_H 1
+#define CAMEL_MULTIPART_SIGNED_H
#include <camel/camel-multipart.h>
diff --git a/camel/camel-multipart.h b/camel/camel-multipart.h
index a711453..20a59c4 100644
--- a/camel/camel-multipart.h
+++ b/camel/camel-multipart.h
@@ -23,8 +23,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_MULTIPART_H
-#define CAMEL_MULTIPART_H 1
+#define CAMEL_MULTIPART_H
#include <camel/camel-data-wrapper.h>
diff --git a/camel/camel-net-utils-win32.h b/camel/camel-net-utils-win32.h
index a4f21f5..b1b7322 100644
--- a/camel/camel-net-utils-win32.h
+++ b/camel/camel-net-utils-win32.h
@@ -3,8 +3,8 @@
* This file is part of the w64 mingw-runtime package.
* No warranty is given; refer to the file DISCLAIMER within this package.
*/
-#ifndef _CAMEL_NET_UTILS_WIN32_H_
-#define _CAMEL_NET_UTILS_WIN32_H_
+#ifndef CAMEL_NET_UTILS_WIN32_H_
+#define CAMEL_NET_UTILS_WIN32_H_
#include <stdio.h>
#include <stdlib.h>
diff --git a/camel/camel-net-utils.h b/camel/camel-net-utils.h
index 10e8719..85e2469 100644
--- a/camel/camel-net-utils.h
+++ b/camel/camel-net-utils.h
@@ -20,8 +20,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_NET_UTILS_H
-#define CAMEL_NET_UTILS_H 1
+#define CAMEL_NET_UTILS_H
#include <sys/types.h>
diff --git a/camel/camel-nntp-address.h b/camel/camel-nntp-address.h
index 34ad9d3..3f20e10 100644
--- a/camel/camel-nntp-address.h
+++ b/camel/camel-nntp-address.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_NNTP_ADDRESS_H
-#define _CAMEL_NNTP_ADDRESS_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_NNTP_ADDRESS_H
+#define CAMEL_NNTP_ADDRESS_H
#include <camel/camel-address.h>
@@ -51,4 +55,4 @@ gboolean camel_nntp_address_get (const CamelNNTPAddress *a, gint index, const g
G_END_DECLS
-#endif /* _CAMEL_NNTP_ADDRESS_H */
+#endif /* CAMEL_NNTP_ADDRESS_H */
diff --git a/camel/camel-object.h b/camel/camel-object.h
index 61fb6aa..ea66295 100644
--- a/camel/camel-object.h
+++ b/camel/camel-object.h
@@ -22,8 +22,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_OBJECT_H
-#define CAMEL_OBJECT_H 1
+#define CAMEL_OBJECT_H
#include <glib.h>
#include <stdio.h> /* FILE */
diff --git a/camel/camel-offline-folder.h b/camel/camel-offline-folder.h
index 34fa881..01488f1 100644
--- a/camel/camel-offline-folder.h
+++ b/camel/camel-offline-folder.h
@@ -20,8 +20,12 @@
*
*/
-#ifndef __CAMEL_OFFLINE_FOLDER_H__
-#define __CAMEL_OFFLINE_FOLDER_H__
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_OFFLINE_FOLDER_H
+#define CAMEL_OFFLINE_FOLDER_H
#include <camel/camel-folder.h>
@@ -62,4 +66,4 @@ void camel_offline_folder_downsync (CamelOfflineFolder *offline, const gchar *ex
G_END_DECLS
-#endif /* __CAMEL_OFFLINE_FOLDER_H__ */
+#endif /* CAMEL_OFFLINE_FOLDER_H */
diff --git a/camel/camel-offline-journal.h b/camel/camel-offline-journal.h
index ca05e59..03a9951 100644
--- a/camel/camel-offline-journal.h
+++ b/camel/camel-offline-journal.h
@@ -20,8 +20,12 @@
*
*/
-#ifndef __CAMEL_OFFLINE_JOURNAL_H__
-#define __CAMEL_OFFLINE_JOURNAL_H__
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_OFFLINE_JOURNAL_H
+#define CAMEL_OFFLINE_JOURNAL_H
#include <stdio.h>
#include <stdarg.h>
@@ -75,4 +79,4 @@ gint camel_offline_journal_replay (CamelOfflineJournal *journal, CamelException
G_END_DECLS
-#endif /* __CAMEL_OFFLINE_JOURNAL_H__ */
+#endif /* CAMEL_OFFLINE_JOURNAL_H */
diff --git a/camel/camel-offline-store.h b/camel/camel-offline-store.h
index 3fe60d1..92bb46a 100644
--- a/camel/camel-offline-store.h
+++ b/camel/camel-offline-store.h
@@ -20,8 +20,12 @@
*
*/
-#ifndef __CAMEL_OFFLINE_STORE_H__
-#define __CAMEL_OFFLINE_STORE_H__
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_OFFLINE_STORE_H
+#define CAMEL_OFFLINE_STORE_H
#include <camel/camel-store.h>
@@ -67,4 +71,4 @@ void camel_offline_store_prepare_for_offline (CamelOfflineStore *store, CamelExc
G_END_DECLS
-#endif /* __CAMEL_OFFLINE_STORE_H__ */
+#endif /* CAMEL_OFFLINE_STORE_H */
diff --git a/camel/camel-operation.h b/camel/camel-operation.h
index 5fff2af..0557fbf 100644
--- a/camel/camel-operation.h
+++ b/camel/camel-operation.h
@@ -19,8 +19,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_OPERATION_H
-#define CAMEL_OPERATION_H 1
+#define CAMEL_OPERATION_H
#include <glib.h>
diff --git a/camel/camel-partition-table.h b/camel/camel-partition-table.h
index 4bfcd98..6281655 100644
--- a/camel/camel-partition-table.h
+++ b/camel/camel-partition-table.h
@@ -18,8 +18,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_PARTITION_TABLE_H
-#define _CAMEL_PARTITION_TABLE_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_PARTITION_TABLE_H
+#define CAMEL_PARTITION_TABLE_H
#include <camel/camel-object.h>
#include <glib.h>
@@ -153,4 +157,4 @@ camel_key_t camel_key_table_next(CamelKeyTable *ki, camel_key_t next, gchar **ke
G_END_DECLS
-#endif /* _CAMEL_PARTITION_TABLE_H */
+#endif /* CAMEL_PARTITION_TABLE_H */
diff --git a/camel/camel-private.h b/camel/camel-private.h
index b6afb52..42835fb 100644
--- a/camel/camel-private.h
+++ b/camel/camel-private.h
@@ -21,7 +21,7 @@
*/
#ifndef CAMEL_PRIVATE_H
-#define CAMEL_PRIVATE_H 1
+#define CAMEL_PRIVATE_H
/* need a way to configure and save this data, if this header is to
be installed. For now, dont install it */
@@ -30,6 +30,7 @@
#include "config.h"
#endif
+#include <glib.h>
#include <pthread.h>
G_BEGIN_DECLS
diff --git a/camel/camel-provider.h b/camel/camel-provider.h
index 36dc23b..5d3fef6 100644
--- a/camel/camel-provider.h
+++ b/camel/camel-provider.h
@@ -24,8 +24,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_PROVIDER_H
-#define CAMEL_PROVIDER_H 1
+#define CAMEL_PROVIDER_H
#include <camel/camel-types.h>
#include <camel/camel-object.h>
diff --git a/camel/camel-sasl-anonymous.h b/camel/camel-sasl-anonymous.h
index ce2e82f..fc6e736 100644
--- a/camel/camel-sasl-anonymous.h
+++ b/camel/camel-sasl-anonymous.h
@@ -20,6 +20,10 @@
*
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_SASL_ANONYMOUS_H
#define CAMEL_SASL_ANONYMOUS_H
diff --git a/camel/camel-sasl-cram-md5.h b/camel/camel-sasl-cram-md5.h
index 6c6e373..0613ff6 100644
--- a/camel/camel-sasl-cram-md5.h
+++ b/camel/camel-sasl-cram-md5.h
@@ -20,6 +20,10 @@
*
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_SASL_CRAM_MD5_H
#define CAMEL_SASL_CRAM_MD5_H
diff --git a/camel/camel-sasl-digest-md5.h b/camel/camel-sasl-digest-md5.h
index b305bfb..caf57d7 100644
--- a/camel/camel-sasl-digest-md5.h
+++ b/camel/camel-sasl-digest-md5.h
@@ -20,6 +20,10 @@
*
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_SASL_DIGEST_MD5_H
#define CAMEL_SASL_DIGEST_MD5_H
diff --git a/camel/camel-sasl-gssapi.h b/camel/camel-sasl-gssapi.h
index f575c0e..e62ea56 100644
--- a/camel/camel-sasl-gssapi.h
+++ b/camel/camel-sasl-gssapi.h
@@ -20,8 +20,12 @@
*
*/
-#ifndef __CAMEL_SASL_GSSAPI_H__
-#define __CAMEL_SASL_GSSAPI_H__
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_SASL_GSSAPI_H
+#define CAMEL_SASL_GSSAPI_H
#include <sys/types.h>
#include <camel/camel-sasl.h>
@@ -55,4 +59,4 @@ extern CamelServiceAuthType camel_sasl_gssapi_authtype;
G_END_DECLS
-#endif /* __CAMEL_SASL_GSSAPI_H__ */
+#endif /* CAMEL_SASL_GSSAPI_H */
diff --git a/camel/camel-sasl-login.h b/camel/camel-sasl-login.h
index 9725f8e..a67b485 100644
--- a/camel/camel-sasl-login.h
+++ b/camel/camel-sasl-login.h
@@ -20,6 +20,10 @@
*
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_SASL_LOGIN_H
#define CAMEL_SASL_LOGIN_H
diff --git a/camel/camel-sasl-ntlm.h b/camel/camel-sasl-ntlm.h
index 2b894d2..64ae8b1 100644
--- a/camel/camel-sasl-ntlm.h
+++ b/camel/camel-sasl-ntlm.h
@@ -18,6 +18,10 @@
*
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_SASL_NTLM_H
#define CAMEL_SASL_NTLM_H
diff --git a/camel/camel-sasl-plain.h b/camel/camel-sasl-plain.h
index 0ca11be..4ae4c10 100644
--- a/camel/camel-sasl-plain.h
+++ b/camel/camel-sasl-plain.h
@@ -20,6 +20,10 @@
*
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_SASL_PLAIN_H
#define CAMEL_SASL_PLAIN_H
diff --git a/camel/camel-sasl-popb4smtp.h b/camel/camel-sasl-popb4smtp.h
index 081c52f..d418328 100644
--- a/camel/camel-sasl-popb4smtp.h
+++ b/camel/camel-sasl-popb4smtp.h
@@ -20,6 +20,10 @@
*
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_SASL_POPB4SMTP_H
#define CAMEL_SASL_POPB4SMTP_H
diff --git a/camel/camel-sasl.h b/camel/camel-sasl.h
index 0f7872b..2c9a87b 100644
--- a/camel/camel-sasl.h
+++ b/camel/camel-sasl.h
@@ -20,6 +20,10 @@
*
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_SASL_H
#define CAMEL_SASL_H
diff --git a/camel/camel-search-private.c b/camel/camel-search-private.c
index 8a55049..dd31a34 100644
--- a/camel/camel-search-private.c
+++ b/camel/camel-search-private.c
@@ -44,43 +44,6 @@
#define d(x)
-static inline guint32
-camel_utf8_getc(const guchar **ptr)
-{
- register guchar *p = (guchar *)*ptr;
- register guchar c, r;
- register guint32 v, m;
-
-again:
- r = *p++;
-loop:
- if (r < 0x80) {
- *ptr = p;
- v = r;
- } else if (r < 0xfe) { /* valid start char? */
- v = r;
- m = 0x7f80; /* used to mask out the length bits */
- do {
- c = *p++;
- if ((c & 0xc0) != 0x80) {
- r = c;
- goto loop;
- }
- v = (v<<6) | (c & 0x3f);
- r<<=1;
- m<<=5;
- } while (r & 0x40);
-
- *ptr = p;
-
- v &= ~m;
- } else {
- goto again;
- }
-
- return v;
-}
-
/* builds the regex into pattern */
/* taken from camel-folder-search, with added isregex & exception parameter */
/* Basically, we build a new regex, either based on subset regex's, or substrings,
diff --git a/camel/camel-search-private.h b/camel/camel-search-private.h
index e927e41..17e9a6c 100644
--- a/camel/camel-search-private.h
+++ b/camel/camel-search-private.h
@@ -18,15 +18,16 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_SEARCH_PRIVATE_H
-#define _CAMEL_SEARCH_PRIVATE_H
+#ifndef CAMEL_SEARCH_PRIVATE_H
+#define CAMEL_SEARCH_PRIVATE_H
/* POSIX requires <sys/types.h> be included before <regex.h> */
#include <sys/types.h>
#include <regex.h>
-#include "camel-exception.h"
+#include <camel/camel.h>
+
#include "libedataserver/e-sexp.h"
G_BEGIN_DECLS
@@ -89,4 +90,4 @@ void camel_search_words_free(struct _camel_search_words *);
G_END_DECLS
-#endif /* _CAMEL_SEARCH_PRIVATE_H */
+#endif /* CAMEL_SEARCH_PRIVATE_H */
diff --git a/camel/camel-search-sql-sexp.h b/camel/camel-search-sql-sexp.h
index 56078ba..0365c78 100644
--- a/camel/camel-search-sql-sexp.h
+++ b/camel/camel-search-sql-sexp.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_SEARCH_SQL_SEXP_H
-#define _CAMEL_SEARCH_SQL_SEXP_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_SEARCH_SQL_SEXP_H
+#define CAMEL_SEARCH_SQL_SEXP_H
G_BEGIN_DECLS
@@ -29,4 +33,4 @@ gchar * camel_sexp_to_sql_sexp (const gchar *sexp);
G_END_DECLS
-#endif /* _CAMEL_SEARCH_SQL_H */
+#endif /* CAMEL_SEARCH_SQL_H */
diff --git a/camel/camel-search-sql.h b/camel/camel-search-sql.h
index ba741c1..fd198d6 100644
--- a/camel/camel-search-sql.h
+++ b/camel/camel-search-sql.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_SEARCH_SQL_H
-#define _CAMEL_SEARCH_SQL_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_SEARCH_SQL_H
+#define CAMEL_SEARCH_SQL_H
G_BEGIN_DECLS
@@ -28,4 +32,4 @@ gchar * camel_sexp_to_sql (const gchar *sexp);
G_END_DECLS
-#endif /* _CAMEL_SEARCH_SQL_H */
+#endif /* CAMEL_SEARCH_SQL_H */
diff --git a/camel/camel-seekable-stream.h b/camel/camel-seekable-stream.h
index d6d3002..948b36d 100644
--- a/camel/camel-seekable-stream.h
+++ b/camel/camel-seekable-stream.h
@@ -22,8 +22,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_SEEKABLE_STREAM_H
-#define CAMEL_SEEKABLE_STREAM_H 1
+#define CAMEL_SEEKABLE_STREAM_H
#include <sys/types.h>
#include <unistd.h>
diff --git a/camel/camel-seekable-substream.h b/camel/camel-seekable-substream.h
index 7ed8b94..688568f 100644
--- a/camel/camel-seekable-substream.h
+++ b/camel/camel-seekable-substream.h
@@ -22,8 +22,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_SEEKABLE_SUBSTREAM_H
-#define CAMEL_SEEKABLE_SUBSTREAM_H 1
+#define CAMEL_SEEKABLE_SUBSTREAM_H
#include <camel/camel-seekable-stream.h>
diff --git a/camel/camel-service.h b/camel/camel-service.h
index ad44173..2d2bebf 100644
--- a/camel/camel-service.h
+++ b/camel/camel-service.h
@@ -22,8 +22,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_SERVICE_H
-#define CAMEL_SERVICE_H 1
+#define CAMEL_SERVICE_H
#include <camel/camel-object.h>
#include <camel/camel-url.h>
diff --git a/camel/camel-session.h b/camel/camel-session.h
index e6d6455..ce9345f 100644
--- a/camel/camel-session.h
+++ b/camel/camel-session.h
@@ -23,8 +23,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_SESSION_H
-#define CAMEL_SESSION_H 1
+#define CAMEL_SESSION_H
#include <camel/camel-msgport.h>
#include <camel/camel-object.h>
diff --git a/camel/camel-smime-context.h b/camel/camel-smime-context.h
index 2275a64..2a560e1 100644
--- a/camel/camel-smime-context.h
+++ b/camel/camel-smime-context.h
@@ -21,8 +21,12 @@
*
*/
-#ifndef __CAMEL_SMIME_CONTEXT_H__
-#define __CAMEL_SMIME_CONTEXT_H__
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_SMIME_CONTEXT_H
+#define CAMEL_SMIME_CONTEXT_H
#include <camel/camel-cipher-context.h>
@@ -71,4 +75,4 @@ guint32 camel_smime_context_describe_part(CamelSMIMEContext *, struct _CamelMime
G_END_DECLS
-#endif /* __CAMEL_SMIME_CONTEXT_H__ */
+#endif /* CAMEL_SMIME_CONTEXT_H */
diff --git a/camel/camel-store-summary.h b/camel/camel-store-summary.h
index a042478..486fb51 100644
--- a/camel/camel-store-summary.h
+++ b/camel/camel-store-summary.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_STORE_SUMMARY_H
-#define _CAMEL_STORE_SUMMARY_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_STORE_SUMMARY_H
+#define CAMEL_STORE_SUMMARY_H
#include <stdio.h>
@@ -180,4 +184,4 @@ void camel_store_info_set_string(CamelStoreSummary *summary, CamelStoreInfo *inf
G_END_DECLS
-#endif /* _CAMEL_STORE_SUMMARY_H */
+#endif /* CAMEL_STORE_SUMMARY_H */
diff --git a/camel/camel-store.h b/camel/camel-store.h
index 3f688ea..9ddb2f8 100644
--- a/camel/camel-store.h
+++ b/camel/camel-store.h
@@ -24,8 +24,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_STORE_H
-#define CAMEL_STORE_H 1
+#define CAMEL_STORE_H
/* for mode_t */
#include <sys/types.h>
diff --git a/camel/camel-stream-buffer.h b/camel/camel-stream-buffer.h
index 9f3e48d..3e5d0e8 100644
--- a/camel/camel-stream-buffer.h
+++ b/camel/camel-stream-buffer.h
@@ -23,8 +23,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_STREAM_BUFFER_H
-#define CAMEL_STREAM_BUFFER_H 1
+#define CAMEL_STREAM_BUFFER_H
#include <stdio.h>
#include <camel/camel-seekable-stream.h>
diff --git a/camel/camel-stream-filter.h b/camel/camel-stream-filter.h
index 05ee7ff..8964eea 100644
--- a/camel/camel-stream-filter.h
+++ b/camel/camel-stream-filter.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_STREAM_FILTER_H
-#define _CAMEL_STREAM_FILTER_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_STREAM_FILTER_H
+#define CAMEL_STREAM_FILTER_H
#include <camel/camel-stream.h>
#include <camel/camel-mime-filter.h>
@@ -54,4 +58,4 @@ void camel_stream_filter_remove (CamelStreamFilter *stream, gint id);
G_END_DECLS
-#endif /* _CAMEL_STREAM_FILTER_H */
+#endif /* CAMEL_STREAM_FILTER_H */
diff --git a/camel/camel-stream-fs.h b/camel/camel-stream-fs.h
index 6811936..4ce3ca2 100644
--- a/camel/camel-stream-fs.h
+++ b/camel/camel-stream-fs.h
@@ -22,8 +22,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_STREAM_FS_H
-#define CAMEL_STREAM_FS_H 1
+#define CAMEL_STREAM_FS_H
/* for open flags */
#include <sys/types.h>
diff --git a/camel/camel-stream-mem.h b/camel/camel-stream-mem.h
index 2a5060b..1bf8dee 100644
--- a/camel/camel-stream-mem.h
+++ b/camel/camel-stream-mem.h
@@ -22,8 +22,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_STREAM_MEM_H
-#define CAMEL_STREAM_MEM_H 1
+#define CAMEL_STREAM_MEM_H
#include <sys/types.h>
#include <camel/camel-seekable-stream.h>
diff --git a/camel/camel-stream-null.h b/camel/camel-stream-null.h
index d443a9d..87ea9d0 100644
--- a/camel/camel-stream-null.h
+++ b/camel/camel-stream-null.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_STREAM_NULL_H
-#define _CAMEL_STREAM_NULL_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_STREAM_NULL_H
+#define CAMEL_STREAM_NULL_H
#include <camel/camel-stream.h>
@@ -48,4 +52,4 @@ CamelStream *camel_stream_null_new (void);
G_END_DECLS
-#endif /* _CAMEL_STREAM_NULL_H */
+#endif /* CAMEL_STREAM_NULL_H */
diff --git a/camel/camel-stream-process.h b/camel/camel-stream-process.h
index 68fa101..0227835 100644
--- a/camel/camel-stream-process.h
+++ b/camel/camel-stream-process.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_STREAM_NULL_H
-#define _CAMEL_STREAM_NULL_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_STREAM_PROCESS_H
+#define CAMEL_STREAM_PROCESS_H
#include <camel/camel-stream.h>
@@ -50,4 +54,4 @@ gint camel_stream_process_connect(CamelStreamProcess *, const gchar *, const gch
G_END_DECLS
-#endif /* _CAMEL_STREAM_PROCESS_H */
+#endif /* CAMEL_STREAM_PROCESS_H */
diff --git a/camel/camel-stream-vfs.h b/camel/camel-stream-vfs.h
index 822fefe..7788d7e 100644
--- a/camel/camel-stream-vfs.h
+++ b/camel/camel-stream-vfs.h
@@ -22,8 +22,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_STREAM_VFS_H
-#define CAMEL_STREAM_VFS_H 1
+#define CAMEL_STREAM_VFS_H
#include <glib.h>
#include <glib-object.h>
diff --git a/camel/camel-stream.h b/camel/camel-stream.h
index b44f181..ba3c553 100644
--- a/camel/camel-stream.h
+++ b/camel/camel-stream.h
@@ -22,8 +22,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_STREAM_H
-#define CAMEL_STREAM_H 1
+#define CAMEL_STREAM_H
#include <stdarg.h>
#include <unistd.h>
diff --git a/camel/camel-string-utils.h b/camel/camel-string-utils.h
index 10274ea..c32c4bd 100644
--- a/camel/camel-string-utils.h
+++ b/camel/camel-string-utils.h
@@ -20,8 +20,12 @@
*
*/
-#ifndef __CAMEL_STRING_UTILS_H__
-#define __CAMEL_STRING_UTILS_H__
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_STRING_UTILS_H
+#define CAMEL_STRING_UTILS_H
#include <glib.h>
@@ -45,4 +49,4 @@ const gchar * camel_pstring_peek (const gchar *str);
G_END_DECLS
-#endif /* __CAMEL_STRING_UTILS_H__ */
+#endif /* CAMEL_STRING_UTILS_H */
diff --git a/camel/camel-tcp-stream-raw.h b/camel/camel-tcp-stream-raw.h
index ebf13fb..7e1925d 100644
--- a/camel/camel-tcp-stream-raw.h
+++ b/camel/camel-tcp-stream-raw.h
@@ -20,6 +20,10 @@
*
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_TCP_STREAM_RAW_H
#define CAMEL_TCP_STREAM_RAW_H
diff --git a/camel/camel-tcp-stream-ssl.h b/camel/camel-tcp-stream-ssl.h
index f4060a3..8d46d11 100644
--- a/camel/camel-tcp-stream-ssl.h
+++ b/camel/camel-tcp-stream-ssl.h
@@ -20,9 +20,15 @@
*
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_TCP_STREAM_SSL_H
#define CAMEL_TCP_STREAM_SSL_H
+#ifdef HAVE_SSL
+
#include <camel/camel-tcp-stream.h>
#include <prio.h>
@@ -66,4 +72,6 @@ PRFileDesc * camel_tcp_stream_ssl_sockfd (CamelTcpStreamSSL *stream);
G_END_DECLS
+#endif /* HAVE_SSL */
+
#endif /* CAMEL_TCP_STREAM_SSL_H */
diff --git a/camel/camel-tcp-stream.h b/camel/camel-tcp-stream.h
index 238c0fa..825df2f 100644
--- a/camel/camel-tcp-stream.h
+++ b/camel/camel-tcp-stream.h
@@ -20,6 +20,10 @@
*
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_TCP_STREAM_H
#define CAMEL_TCP_STREAM_H
diff --git a/camel/camel-text-index.h b/camel/camel-text-index.h
index 187a156..00d0bde 100644
--- a/camel/camel-text-index.h
+++ b/camel/camel-text-index.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_TEXT_INDEX_H
-#define _CAMEL_TEXT_INDEX_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_TEXT_INDEX_H
+#define CAMEL_TEXT_INDEX_H
#include <camel/camel-exception.h>
#include <camel/camel-object.h>
@@ -114,4 +118,4 @@ void camel_text_index_validate(CamelTextIndex *idx);
G_END_DECLS
-#endif /* _CAMEL_TEXT_INDEX_H */
+#endif /* CAMEL_TEXT_INDEX_H */
diff --git a/camel/camel-transport.h b/camel/camel-transport.h
index 3c3bbac..7f2c9c9 100644
--- a/camel/camel-transport.h
+++ b/camel/camel-transport.h
@@ -23,8 +23,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_TRANSPORT_H
-#define CAMEL_TRANSPORT_H 1
+#define CAMEL_TRANSPORT_H
#include <glib.h>
#include <camel/camel-service.h>
diff --git a/camel/camel-trie.h b/camel/camel-trie.h
index a81a2cd..84d07ce 100644
--- a/camel/camel-trie.h
+++ b/camel/camel-trie.h
@@ -18,6 +18,10 @@
*
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_TRIE_H
#define CAMEL_TRIE_H
diff --git a/camel/camel-types.h b/camel/camel-types.h
index 0a84515..97896ef 100644
--- a/camel/camel-types.h
+++ b/camel/camel-types.h
@@ -18,8 +18,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_TYPES_H
-#define CAMEL_TYPES_H 1
+#define CAMEL_TYPES_H
#include <glib.h>
diff --git a/camel/camel-uid-cache.h b/camel/camel-uid-cache.h
index 9acc06b..ef0d477 100644
--- a/camel/camel-uid-cache.h
+++ b/camel/camel-uid-cache.h
@@ -22,8 +22,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_UID_CACHE_H
-#define CAMEL_UID_CACHE_H 1
+#define CAMEL_UID_CACHE_H
#include <glib.h>
diff --git a/camel/camel-url-scanner.h b/camel/camel-url-scanner.h
index 249f414..2a1d6b4 100644
--- a/camel/camel-url-scanner.h
+++ b/camel/camel-url-scanner.h
@@ -20,8 +20,12 @@
*
*/
-#ifndef __CAMEL_URL_SCANNER_H__
-#define __CAMEL_URL_SCANNER_H__
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_URL_SCANNER_H
+#define CAMEL_URL_SCANNER_H
#include <glib.h>
#include <sys/types.h>
@@ -63,4 +67,4 @@ gboolean camel_url_scanner_scan (CamelUrlScanner *scanner, const gchar *in, gsiz
G_END_DECLS
-#endif /* __CAMEL_URL_SCANNER_H__ */
+#endif /* CAMEL_URL_SCANNER_H */
diff --git a/camel/camel-url.h b/camel/camel-url.h
index afce4e2..88d8877 100644
--- a/camel/camel-url.h
+++ b/camel/camel-url.h
@@ -23,8 +23,12 @@
* USA
*/
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
#ifndef CAMEL_URL_H
-#define CAMEL_URL_H 1
+#define CAMEL_URL_H
#include <glib.h>
#include <camel/camel-types.h>
diff --git a/camel/camel-utf8.h b/camel/camel-utf8.h
index 63f251e..d454bcd 100644
--- a/camel/camel-utf8.h
+++ b/camel/camel-utf8.h
@@ -20,8 +20,12 @@
*
*/
-#ifndef _CAMEL_UTF8_H
-#define _CAMEL_UTF8_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_UTF8_H
+#define CAMEL_UTF8_H
G_BEGIN_DECLS
@@ -45,4 +49,4 @@ gchar *camel_utf8_make_valid (const gchar *text);
G_END_DECLS
-#endif /* _CAMEL_UTF8_H */
+#endif /* CAMEL_UTF8_H */
diff --git a/camel/camel-vee-folder.h b/camel/camel-vee-folder.h
index 0778f38..bc0b3e4 100644
--- a/camel/camel-vee-folder.h
+++ b/camel/camel-vee-folder.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_VEE_FOLDER_H
-#define _CAMEL_VEE_FOLDER_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_VEE_FOLDER_H
+#define CAMEL_VEE_FOLDER_H
#include <glib.h>
#include <camel/camel-folder.h>
@@ -94,4 +98,4 @@ void camel_vee_folder_sync_headers (CamelFolder *vf, CamelException *ex);
G_END_DECLS
-#endif /* _CAMEL_VEE_FOLDER_H */
+#endif /* CAMEL_VEE_FOLDER_H */
diff --git a/camel/camel-vee-store.h b/camel/camel-vee-store.h
index 7c45914..d2c0993 100644
--- a/camel/camel-vee-store.h
+++ b/camel/camel-vee-store.h
@@ -19,8 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_VEE_STORE_H
-#define _CAMEL_VEE_STORE_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_VEE_STORE_H
+#define CAMEL_VEE_STORE_H
#include <glib.h>
#include <camel/camel-store.h>
@@ -61,4 +65,4 @@ CamelVeeStore *camel_vee_store_new (void);
G_END_DECLS
-#endif /* _CAMEL_VEE_STORE_H */
+#endif /* CAMEL_VEE_STORE_H */
diff --git a/camel/camel-vee-summary.h b/camel/camel-vee-summary.h
index fcafadb..e24a425 100644
--- a/camel/camel-vee-summary.h
+++ b/camel/camel-vee-summary.h
@@ -20,8 +20,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_VEE_SUMMARY_H
-#define _CAMEL_VEE_SUMMARY_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_VEE_SUMMARY_H
+#define CAMEL_VEE_SUMMARY_H
#include <camel/camel-folder-summary.h>
#include <camel/camel-exception.h>
@@ -66,5 +70,5 @@ void camel_vee_summary_load_check_unread_vfolder (CamelVeeSummary *vs);
G_END_DECLS
-#endif /* _CAMEL_VEE_SUMMARY_H */
+#endif /* CAMEL_VEE_SUMMARY_H */
diff --git a/camel/camel-vtrash-folder.h b/camel/camel-vtrash-folder.h
index 0707190..02a1699 100644
--- a/camel/camel-vtrash-folder.h
+++ b/camel/camel-vtrash-folder.h
@@ -20,8 +20,12 @@
*
*/
-#ifndef _CAMEL_VTRASH_FOLDER_H
-#define _CAMEL_VTRASH_FOLDER_H
+#if !defined (__CAMEL_H_INSIDE__) && !defined (CAMEL_COMPILATION)
+#error "Only <camel/camel.h> can be included directly."
+#endif
+
+#ifndef CAMEL_VTRASH_FOLDER_H
+#define CAMEL_VTRASH_FOLDER_H
#include <camel/camel-folder.h>
#include <camel/camel-vee-folder.h>
@@ -62,4 +66,4 @@ CamelFolder *camel_vtrash_folder_new (CamelStore *parent_store, camel_vtrash
G_END_DECLS
-#endif /* _CAMEL_VTRASH_FOLDER_H */
+#endif /* CAMEL_VTRASH_FOLDER_H */
diff --git a/camel/camel.h b/camel/camel.h
index dac00c0..ef61c88 100644
--- a/camel/camel.h
+++ b/camel/camel.h
@@ -22,7 +22,9 @@
*/
#ifndef CAMEL_H
-#define CAMEL_H 1
+#define CAMEL_H
+
+#define __CAMEL_H_INSIDE__
#include <camel/camel-address.h>
#include <camel/camel-arg.h>
@@ -32,6 +34,8 @@
#include <camel/camel-cipher-context.h>
#include <camel/camel-data-cache.h>
#include <camel/camel-data-wrapper.h>
+#include <camel/camel-db.h>
+#include <camel/camel-debug.h>
#include <camel/camel-disco-diary.h>
#include <camel/camel-disco-folder.h>
#include <camel/camel-disco-store.h>
@@ -69,8 +73,10 @@
#include <camel/camel-mime-filter-index.h>
#include <camel/camel-mime-filter-linewrap.h>
#include <camel/camel-mime-filter-pgp.h>
+#include <camel/camel-mime-filter-progress.h>
#include <camel/camel-mime-filter-save.h>
#include <camel/camel-mime-filter-tohtml.h>
+#include <camel/camel-mime-filter-windows.h>
#include <camel/camel-mime-filter-yenc.h>
#include <camel/camel-mime-message.h>
#include <camel/camel-mime-parser.h>
@@ -132,6 +138,8 @@
#include <camel/camel-vee-summary.h>
#include <camel/camel-vtrash-folder.h>
+#undef __CAMEL_H_INSIDE__
+
#include <glib.h>
G_BEGIN_DECLS
diff --git a/camel/providers/groupwise/camel-groupwise-folder.c b/camel/providers/groupwise/camel-groupwise-folder.c
index 0b0d296..ae32cd6 100644
--- a/camel/providers/groupwise/camel-groupwise-folder.c
+++ b/camel/providers/groupwise/camel-groupwise-folder.c
@@ -48,21 +48,14 @@ which needs to be better organized via functions */
#include <e-gw-connection.h>
#include <e-gw-item.h>
-#include "camel-folder-search.h"
-#include "camel-folder.h"
-#include "camel-private.h"
-#include "camel-session.h"
-#include "camel-stream-mem.h"
-#include "camel-string-utils.h"
+#include <camel/camel-private.h>
#include "camel-groupwise-folder.h"
#include "camel-groupwise-journal.h"
#include "camel-groupwise-private.h"
#include "camel-groupwise-store.h"
-#include "camel-groupwise-store.h"
#include "camel-groupwise-summary.h"
#include "camel-groupwise-utils.h"
-#include "camel-groupwise-utils.h"
#define ADD_JUNK_ENTRY 1
#define REMOVE_JUNK_ENTRY -1
diff --git a/camel/providers/groupwise/camel-groupwise-folder.h b/camel/providers/groupwise/camel-groupwise-folder.h
index 7aa37ad..4e54448 100644
--- a/camel/providers/groupwise/camel-groupwise-folder.h
+++ b/camel/providers/groupwise/camel-groupwise-folder.h
@@ -25,17 +25,9 @@
*/
#ifndef CAMEL_GROUPWISE_FOLDER_H
-#define CAMEL_GROUPWISE_FOLDER_H 1
-
-#include <camel/camel-offline-folder.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-internet-address.h>
-#include <camel/camel-data-cache.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-multipart-signed.h>
-#include <camel/camel-multipart-encrypted.h>
-#include <camel/camel-offline-journal.h>
+#define CAMEL_GROUPWISE_FOLDER_H
+
+#include <camel/camel.h>
#include "camel-groupwise-summary.h"
diff --git a/camel/providers/groupwise/camel-groupwise-journal.c b/camel/providers/groupwise/camel-groupwise-journal.c
index 1068b34..171963e 100644
--- a/camel/providers/groupwise/camel-groupwise-journal.c
+++ b/camel/providers/groupwise/camel-groupwise-journal.c
@@ -36,12 +36,6 @@
#include <glib.h>
#include <glib/gi18n-lib.h>
-#include "camel-data-cache.h"
-#include "camel-file-utils.h"
-#include "camel-folder-summary.h"
-#include "camel-folder.h"
-#include "camel-string-utils.h"
-
#include "camel-groupwise-folder.h"
#include "camel-groupwise-journal.h"
#include "camel-groupwise-store.h"
diff --git a/camel/providers/groupwise/camel-groupwise-journal.h b/camel/providers/groupwise/camel-groupwise-journal.h
index a1901b2..f48221d 100644
--- a/camel/providers/groupwise/camel-groupwise-journal.h
+++ b/camel/providers/groupwise/camel-groupwise-journal.h
@@ -20,15 +20,11 @@
*
*/
-#ifndef __CAMEL_GROUPWISE_JOURNAL_H__
-#define __CAMEL_GROUPWISE_JOURNAL_H__
+#ifndef CAMEL_GROUPWISE_JOURNAL_H
+#define CAMEL_GROUPWISE_JOURNAL_H
#include <stdarg.h>
-
-#include <glib.h>
-
-#include <camel/camel-offline-journal.h>
-#include <camel/camel-mime-message.h>
+#include <camel/camel.h>
#define CAMEL_TYPE_GROUPWISE_JOURNAL (camel_groupwise_journal_get_type ())
#define CAMEL_GROUPWISE_JOURNAL(obj) (CAMEL_CHECK_CAST ((obj), CAMEL_TYPE_GROUPWISE_JOURNAL, CamelGroupwiseJournal))
@@ -82,4 +78,4 @@ void camel_groupwise_journal_transfer (CamelGroupwiseJournal *journal, CamelGrou
G_END_DECLS
-#endif /* __CAMEL_GROUPWISE_JOURNAL_H__ */
+#endif /* CAMEL_GROUPWISE_JOURNAL_H */
diff --git a/camel/providers/groupwise/camel-groupwise-private.h b/camel/providers/groupwise/camel-groupwise-private.h
index 3cfcf66..580a0a3 100644
--- a/camel/providers/groupwise/camel-groupwise-private.h
+++ b/camel/providers/groupwise/camel-groupwise-private.h
@@ -20,7 +20,7 @@
*/
#ifndef CAMEL_GROUPWISE_PRIVATE_H
-#define CAMEL_GROUPWISE_PRIVATE_H 1
+#define CAMEL_GROUPWISE_PRIVATE_H
/* need a way to configure and save this data, if this header is to
be installed. For now, dont install it */
diff --git a/camel/providers/groupwise/camel-groupwise-provider.c b/camel/providers/groupwise/camel-groupwise-provider.c
index 125a44f..73e8c61 100644
--- a/camel/providers/groupwise/camel-groupwise-provider.c
+++ b/camel/providers/groupwise/camel-groupwise-provider.c
@@ -34,11 +34,6 @@
#include <glib/gi18n-lib.h>
#include <gmodule.h>
-#include "camel-provider.h"
-#include "camel-sasl.h"
-#include "camel-session.h"
-#include "camel-url.h"
-
#include "camel-groupwise-store.h"
#include "camel-groupwise-transport.h"
diff --git a/camel/providers/groupwise/camel-groupwise-store-summary.c b/camel/providers/groupwise/camel-groupwise-store-summary.c
index 32b194e..6fb2a2e 100644
--- a/camel/providers/groupwise/camel-groupwise-store-summary.c
+++ b/camel/providers/groupwise/camel-groupwise-store-summary.c
@@ -31,9 +31,7 @@
#include <string.h>
#include <unistd.h>
-#include "camel-file-utils.h"
-#include "camel-private.h"
-#include "camel-utf8.h"
+#include <camel/camel-private.h>
#include "camel-groupwise-store-summary.h"
diff --git a/camel/providers/groupwise/camel-groupwise-store-summary.h b/camel/providers/groupwise/camel-groupwise-store-summary.h
index 642bf2a..958cf3a 100644
--- a/camel/providers/groupwise/camel-groupwise-store-summary.h
+++ b/camel/providers/groupwise/camel-groupwise-store-summary.h
@@ -19,11 +19,10 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_GW_STORE_SUMMARY_H
-#define _CAMEL_GW_STORE_SUMMARY_H
+#ifndef CAMEL_GW_STORE_SUMMARY_H
+#define CAMEL_GW_STORE_SUMMARY_H
-#include <camel/camel-object.h>
-#include <camel/camel-store-summary.h>
+#include <camel/camel.h>
#define CAMEL_GW_STORE_SUMMARY(obj) CAMEL_CHECK_CAST (obj, camel_groupwise_store_summary_get_type (), CamelGroupwiseStoreSummary)
#define CAMEL_GW_STORE_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_groupwise_store_summary_get_type (), CamelGroupwiseStoreSummaryClass)
@@ -86,4 +85,4 @@ void camel_groupwise_store_summary_namespace_set(CamelGroupwiseStoreSummary *s,
G_END_DECLS
-#endif /* _CAMEL_IMAP_STORE_SUMMARY_H */
+#endif /* CAMEL_IMAP_STORE_SUMMARY_H */
diff --git a/camel/providers/groupwise/camel-groupwise-store.c b/camel/providers/groupwise/camel-groupwise-store.c
index 0e70bed..767a10f 100644
--- a/camel/providers/groupwise/camel-groupwise-store.c
+++ b/camel/providers/groupwise/camel-groupwise-store.c
@@ -38,12 +38,7 @@
#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
-#include "camel-debug.h"
-#include "camel-folder.h"
-#include "camel-net-utils.h"
-#include "camel-private.h"
-#include "camel-session.h"
-#include "camel-types.h"
+#include <camel/camel-private.h>
#include "camel-groupwise-folder.h"
#include "camel-groupwise-store-summary.h"
diff --git a/camel/providers/groupwise/camel-groupwise-store.h b/camel/providers/groupwise/camel-groupwise-store.h
index 0f80127..8a2c1df 100644
--- a/camel/providers/groupwise/camel-groupwise-store.h
+++ b/camel/providers/groupwise/camel-groupwise-store.h
@@ -22,10 +22,10 @@
*/
#ifndef CAMEL_GROUPWISE_STORE_H
-#define CAMEL_GROUPWISE_STORE_H 1
+#define CAMEL_GROUPWISE_STORE_H
+
+#include <camel/camel.h>
-#include <camel/camel-store.h>
-#include <camel/camel-offline-store.h>
#include "camel-groupwise-store-summary.h"
#include <e-gw-connection.h>
diff --git a/camel/providers/groupwise/camel-groupwise-summary.c b/camel/providers/groupwise/camel-groupwise-summary.c
index 3ac986b..94872ae 100644
--- a/camel/providers/groupwise/camel-groupwise-summary.c
+++ b/camel/providers/groupwise/camel-groupwise-summary.c
@@ -33,12 +33,6 @@
#include <unistd.h>
#include <sys/stat.h>
-#include "camel-db.h"
-#include "camel-data-cache.h"
-#include "camel-file-utils.h"
-#include "camel-folder.h"
-#include "camel-string-utils.h"
-
#include "camel-groupwise-folder.h"
#include "camel-groupwise-summary.h"
diff --git a/camel/providers/groupwise/camel-groupwise-summary.h b/camel/providers/groupwise/camel-groupwise-summary.h
index b5d61ad..1056af5 100644
--- a/camel/providers/groupwise/camel-groupwise-summary.h
+++ b/camel/providers/groupwise/camel-groupwise-summary.h
@@ -19,12 +19,10 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_GW_SUMMARY_H
-#define _CAMEL_GW_SUMMARY_H
+#ifndef CAMEL_GW_SUMMARY_H
+#define CAMEL_GW_SUMMARY_H
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
#define CAMEL_GROUPWISE_SUMMARY(obj) CAMEL_CHECK_CAST (obj, camel_groupwise_summary_get_type (), CamelGroupwiseSummary)
#define CAMEL_GROUPWISE_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_groupwise_summary_get_type (), CamelGroupwiseSummaryClass)
@@ -76,4 +74,4 @@ void groupwise_summary_clear (CamelFolderSummary *summary, gboolean uncache);
G_END_DECLS
-#endif /*_CAMEL_GW_SUMMARY_H*/
+#endif /* CAMEL_GW_SUMMARY_H */
diff --git a/camel/providers/groupwise/camel-groupwise-transport.c b/camel/providers/groupwise/camel-groupwise-transport.c
index af7ff93..3b2a0eb 100644
--- a/camel/providers/groupwise/camel-groupwise-transport.c
+++ b/camel/providers/groupwise/camel-groupwise-transport.c
@@ -31,15 +31,6 @@
#include <glib.h>
#include <glib/gi18n-lib.h>
-#include "camel-data-wrapper.h"
-#include "camel-medium.h"
-#include "camel-mime-message.h"
-#include "camel-mime-utils.h"
-#include "camel-multipart.h"
-#include "camel-session.h"
-#include "camel-stream-mem.h"
-#include "camel-stream.h"
-
#include "camel-groupwise-store.h"
#include "camel-groupwise-transport.h"
#include "camel-groupwise-utils.h"
diff --git a/camel/providers/groupwise/camel-groupwise-transport.h b/camel/providers/groupwise/camel-groupwise-transport.h
index 53f69f4..fdc504e 100644
--- a/camel/providers/groupwise/camel-groupwise-transport.h
+++ b/camel/providers/groupwise/camel-groupwise-transport.h
@@ -22,9 +22,9 @@
*/
#ifndef CAMEL_GROUPWISE_TRANSPORT_H
-#define CAMEL_GROUPWISE_TRANSPORT_H 1
+#define CAMEL_GROUPWISE_TRANSPORT_H
-#include <camel/camel-transport.h>
+#include <camel/camel.h>
#define CAMEL_GROUPWISE_TRANSPORT_TYPE (camel_groupwise_transport_get_type ())
#define CAMEL_GROUPWISE_TRANSPORT(obj) (CAMEL_CHECK_CAST((obj), CAMEL_GROUPWISE_TRANSPORT_TYPE, CamelGroupwiseTransport))
diff --git a/camel/providers/groupwise/camel-groupwise-utils.c b/camel/providers/groupwise/camel-groupwise-utils.c
index 2d282dd..628b97c 100644
--- a/camel/providers/groupwise/camel-groupwise-utils.c
+++ b/camel/providers/groupwise/camel-groupwise-utils.c
@@ -30,14 +30,6 @@
#include <glib.h>
#include <glib/gstdio.h>
-#include "camel/camel-address.h"
-#include "camel/camel-mime-filter-charset.h"
-#include "camel/camel-mime-message.h"
-#include "camel/camel-multipart.h"
-#include "camel/camel-service.h"
-#include "camel/camel-stream-filter.h"
-#include "camel/camel-stream-mem.h"
-
#include "camel-groupwise-utils.h"
#define SUBFOLDER_DIR_NAME "subfolders"
diff --git a/camel/providers/groupwise/camel-groupwise-utils.h b/camel/providers/groupwise/camel-groupwise-utils.h
index 8093444..1eed1a2 100644
--- a/camel/providers/groupwise/camel-groupwise-utils.h
+++ b/camel/providers/groupwise/camel-groupwise-utils.h
@@ -17,12 +17,10 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __CAMEL_GROUPWISE_UTILS__
-#define __CAMEL_GROUPWISE_UTILS__
+#ifndef CAMEL_GROUPWISE_UTILS
+#define CAMEL_GROUPWISE_UTILS
-#include <glib.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-string-utils.h>
+#include <camel/camel.h>
#include <e-gw-connection.h>
#include <e-gw-container.h>
#include <e-gw-item.h>
diff --git a/camel/providers/imap/Makefile.am b/camel/providers/imap/Makefile.am
index 103471f..bef9a83 100644
--- a/camel/providers/imap/Makefile.am
+++ b/camel/providers/imap/Makefile.am
@@ -34,7 +34,6 @@ noinst_HEADERS = \
camel-imap-store-summary.h \
camel-imap-summary.h \
camel-imap-journal.h \
- camel-imap-types.h \
camel-imap-utils.h \
camel-imap-wrapper.h \
camel-imap-private.h
diff --git a/camel/providers/imap/camel-imap-command.c b/camel/providers/imap/camel-imap-command.c
index 7a4c0a2..49175e7 100644
--- a/camel/providers/imap/camel-imap-command.c
+++ b/camel/providers/imap/camel-imap-command.c
@@ -35,11 +35,7 @@
#include <glib/gi18n-lib.h>
-#include "camel-debug.h"
-#include "camel-exception.h"
-#include "camel-private.h"
-#include "camel-session.h"
-#include "camel-utf8.h"
+#include <camel/camel-private.h>
#include "camel-imap-command.h"
#include "camel-imap-folder.h"
diff --git a/camel/providers/imap/camel-imap-command.h b/camel/providers/imap/camel-imap-command.h
index 391684d..ebf107c 100644
--- a/camel/providers/imap/camel-imap-command.h
+++ b/camel/providers/imap/camel-imap-command.h
@@ -24,13 +24,15 @@
*/
#ifndef CAMEL_IMAP_COMMAND_H
-#define CAMEL_IMAP_COMMAND_H 1
+#define CAMEL_IMAP_COMMAND_H
#include <glib.h>
-#include "camel-imap-types.h"
+#include "camel-imap-store.h"
G_BEGIN_DECLS
+typedef struct _CamelImapResponse CamelImapResponse;
+
typedef enum {
CAMEL_IMAP_RESPONSE_ERROR,
CAMEL_IMAP_RESPONSE_CONTINUATION,
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 4c3ebaf..a5aba31 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -38,32 +38,11 @@
#include <libedataserver/e-time-utils.h>
-#include "camel-db.h"
-#include "camel-data-wrapper.h"
-#include "camel-debug.h"
-#include "camel-imap-journal.h"
-#include "camel-exception.h"
-#include "camel-file-utils.h"
-#include "camel-mime-filter-crlf.h"
-#include "camel-mime-filter-from.h"
-#include "camel-mime-message.h"
-#include "camel-mime-utils.h"
-#include "camel-mime-part-utils.h"
-#include "camel-multipart-encrypted.h"
-#include "camel-multipart-signed.h"
-#include "camel-multipart.h"
-#include "camel-operation.h"
-#include "camel-private.h"
-#include "camel-session.h"
-#include "camel-store-summary.h"
-#include "camel-stream-buffer.h"
-#include "camel-stream-filter.h"
-#include "camel-stream-mem.h"
-#include "camel-stream.h"
-#include "camel-string-utils.h"
+#include <camel/camel-private.h>
#include "camel-imap-command.h"
#include "camel-imap-folder.h"
+#include "camel-imap-journal.h"
#include "camel-imap-message-cache.h"
#include "camel-imap-private.h"
#include "camel-imap-search.h"
diff --git a/camel/providers/imap/camel-imap-folder.h b/camel/providers/imap/camel-imap-folder.h
index 8071df1..932022e 100644
--- a/camel/providers/imap/camel-imap-folder.h
+++ b/camel/providers/imap/camel-imap-folder.h
@@ -24,12 +24,12 @@
*/
#ifndef CAMEL_IMAP_FOLDER_H
-#define CAMEL_IMAP_FOLDER_H 1
+#define CAMEL_IMAP_FOLDER_H
-#include "camel-imap-types.h"
-#include <camel/camel-offline-folder.h>
-#include <camel/camel-folder-search.h>
-#include <camel/camel-offline-journal.h>
+#include <camel/camel.h>
+
+#include "camel-imap-command.h"
+#include "camel-imap-message-cache.h"
#define CAMEL_IMAP_FOLDER_TYPE (camel_imap_folder_get_type ())
#define CAMEL_IMAP_FOLDER(obj) (CAMEL_CHECK_CAST((obj), CAMEL_IMAP_FOLDER_TYPE, CamelImapFolder))
@@ -49,6 +49,7 @@ enum {
CAMEL_IMAP_FOLDER_CHECK_FOLDER = CAMEL_IMAP_FOLDER_ARG_CHECK_FOLDER | CAMEL_ARG_BOO
};
+typedef struct _CamelImapFolder CamelImapFolder;
typedef struct _CamelImapFolderClass CamelImapFolderClass;
typedef struct _CamelImapFolderPrivate CamelImapFolderPrivate;
diff --git a/camel/providers/imap/camel-imap-journal.c b/camel/providers/imap/camel-imap-journal.c
index b164a27..da83a57 100644
--- a/camel/providers/imap/camel-imap-journal.c
+++ b/camel/providers/imap/camel-imap-journal.c
@@ -36,13 +36,6 @@
#include <glib/gi18n-lib.h>
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-data-cache.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-store.h>
-#include <camel/camel-session.h>
-
#include "camel-imap-journal.h"
#include "camel-imap-folder.h"
diff --git a/camel/providers/imap/camel-imap-journal.h b/camel/providers/imap/camel-imap-journal.h
index d6d31e4..3c717b5 100644
--- a/camel/providers/imap/camel-imap-journal.h
+++ b/camel/providers/imap/camel-imap-journal.h
@@ -21,16 +21,11 @@
*
*/
-#ifndef __CAMEL_IMAP_JOURNAL_H__
-#define __CAMEL_IMAP_JOURNAL_H__
+#ifndef CAMEL_IMAP_JOURNAL_H
+#define CAMEL_IMAP_JOURNAL_H
#include <stdarg.h>
-
-#include <glib.h>
-
-#include <camel/camel-list-utils.h>
-#include <camel/camel-offline-journal.h>
-#include <camel/camel-mime-message.h>
+#include <camel/camel.h>
#define CAMEL_TYPE_IMAP_JOURNAL (camel_imap_journal_get_type ())
#define CAMEL_IMAP_JOURNAL(obj) (CAMEL_CHECK_CAST ((obj), CAMEL_TYPE_IMAP_JOURNAL, CamelIMAPJournal))
@@ -88,4 +83,4 @@ void camel_imap_journal_close_folders (CamelIMAPJournal *journal);
G_END_DECLS
-#endif /* __CAMEL_IMAP_JOURNAL_H__ */
+#endif /* CAMEL_IMAP_JOURNAL_H */
diff --git a/camel/providers/imap/camel-imap-message-cache.c b/camel/providers/imap/camel-imap-message-cache.c
index 484ff7b..35a66ad 100644
--- a/camel/providers/imap/camel-imap-message-cache.c
+++ b/camel/providers/imap/camel-imap-message-cache.c
@@ -32,11 +32,6 @@
#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
-#include "camel-data-wrapper.h"
-#include "camel-exception.h"
-#include "camel-stream-fs.h"
-#include "camel-string-utils.h"
-
#include "camel-imap-message-cache.h"
#ifndef O_BINARY
diff --git a/camel/providers/imap/camel-imap-message-cache.h b/camel/providers/imap/camel-imap-message-cache.h
index ac7d35f..bc3d166 100644
--- a/camel/providers/imap/camel-imap-message-cache.h
+++ b/camel/providers/imap/camel-imap-message-cache.h
@@ -23,11 +23,9 @@
*/
#ifndef CAMEL_IMAP_MESSAGE_CACHE_H
-#define CAMEL_IMAP_MESSAGE_CACHE_H 1
+#define CAMEL_IMAP_MESSAGE_CACHE_H
-#include "camel-imap-types.h"
-#include "camel-folder.h"
-#include <camel/camel-folder-search.h>
+#include <camel/camel.h>
#define CAMEL_IMAP_MESSAGE_CACHE_TYPE (camel_imap_message_cache_get_type ())
#define CAMEL_IMAP_MESSAGE_CACHE(obj) (CAMEL_CHECK_CAST((obj), CAMEL_IMAP_MESSAGE_CACHE_TYPE, CamelImapFolder))
@@ -36,6 +34,9 @@
G_BEGIN_DECLS
+typedef struct _CamelImapMessageCache CamelImapMessageCache;
+typedef struct _CamelImapMessageCacheClass CamelImapMessageCacheClass;
+
struct _CamelImapMessageCache {
CamelObject parent_object;
@@ -51,12 +52,9 @@ struct _CamelImapMessageCache {
guint32 max_uid;
};
-typedef struct {
+struct _CamelImapMessageCacheClass {
CamelFolderClass parent_class;
-
- /* Virtual methods */
-
-} CamelImapMessageCacheClass;
+};
/* public methods */
CamelImapMessageCache *camel_imap_message_cache_new (const gchar *path,
diff --git a/camel/providers/imap/camel-imap-private.h b/camel/providers/imap/camel-imap-private.h
index 7d09c83..c2a4901 100644
--- a/camel/providers/imap/camel-imap-private.h
+++ b/camel/providers/imap/camel-imap-private.h
@@ -1,5 +1,5 @@
#ifndef CAMEL_IMAP_PRIVATE_H
-#define CAMEL_IMAP_PRIVATE_H 1
+#define CAMEL_IMAP_PRIVATE_H
/* need a way to configure and save this data, if this header is to
be installed. For now, dont install it */
diff --git a/camel/providers/imap/camel-imap-provider.c b/camel/providers/imap/camel-imap-provider.c
index d5c9ef8..aa5028c 100644
--- a/camel/providers/imap/camel-imap-provider.c
+++ b/camel/providers/imap/camel-imap-provider.c
@@ -25,14 +25,10 @@
#include <config.h>
#include <string.h>
-
+#include <camel/camel.h>
#include <glib/gi18n-lib.h>
#include "camel-imap-store.h"
-#include "camel-provider.h"
-#include "camel-sasl.h"
-#include "camel-session.h"
-#include "camel-url.h"
static void add_hash (guint *hash, gchar *s);
static guint imap_url_hash (gconstpointer key);
diff --git a/camel/providers/imap/camel-imap-search.c b/camel/providers/imap/camel-imap-search.c
index 7d3c1ba..ffde28a 100644
--- a/camel/providers/imap/camel-imap-search.c
+++ b/camel/providers/imap/camel-imap-search.c
@@ -30,9 +30,7 @@
#include <string.h>
-#include "camel-mime-utils.h" /* base64 encoding */
#include "camel-search-private.h"
-#include "camel-seekable-stream.h"
#include "camel-imap-command.h"
#include "camel-imap-folder.h"
diff --git a/camel/providers/imap/camel-imap-search.h b/camel/providers/imap/camel-imap-search.h
index 039db8a..5959ce9 100644
--- a/camel/providers/imap/camel-imap-search.h
+++ b/camel/providers/imap/camel-imap-search.h
@@ -23,12 +23,10 @@
*
*/
-#ifndef _CAMEL_IMAP_SEARCH_H
-#define _CAMEL_IMAP_SEARCH_H
+#ifndef CAMEL_IMAP_SEARCH_H
+#define CAMEL_IMAP_SEARCH_H
-#include <camel/camel-folder-search.h>
-#include <camel/camel-list-utils.h>
-#include <camel/camel-data-cache.h>
+#include <camel/camel.h>
#define CAMEL_IMAP_SEARCH_TYPE (camel_imap_search_get_type ())
#define CAMEL_IMAP_SEARCH(obj) CAMEL_CHECK_CAST (obj, camel_imap_search_get_type (), CamelImapSearch)
@@ -37,6 +35,7 @@
G_BEGIN_DECLS
+typedef struct _CamelImapSearch CamelImapSearch;
typedef struct _CamelImapSearchClass CamelImapSearchClass;
struct _CamelImapSearch {
@@ -63,4 +62,4 @@ CamelFolderSearch *camel_imap_search_new (const gchar *cachedir);
G_END_DECLS
-#endif /* _CAMEL_IMAP_SEARCH_H */
+#endif /* CAMEL_IMAP_SEARCH_H */
diff --git a/camel/providers/imap/camel-imap-store-summary.c b/camel/providers/imap/camel-imap-store-summary.c
index 3b1c5d2..5de3f45 100644
--- a/camel/providers/imap/camel-imap-store-summary.c
+++ b/camel/providers/imap/camel-imap-store-summary.c
@@ -29,10 +29,7 @@
#include <string.h>
#include <unistd.h>
-#include "camel-file-utils.h"
-#include "camel-private.h"
-#include "camel-store.h"
-#include "camel-utf8.h"
+#include <camel/camel-private.h>
#include "camel-imap-store-summary.h"
diff --git a/camel/providers/imap/camel-imap-store-summary.h b/camel/providers/imap/camel-imap-store-summary.h
index b3f4a32..fff3c3c 100644
--- a/camel/providers/imap/camel-imap-store-summary.h
+++ b/camel/providers/imap/camel-imap-store-summary.h
@@ -19,11 +19,10 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_IMAP_STORE_SUMMARY_H
-#define _CAMEL_IMAP_STORE_SUMMARY_H
+#ifndef CAMEL_IMAP_STORE_SUMMARY_H
+#define CAMEL_IMAP_STORE_SUMMARY_H
-#include <camel/camel-object.h>
-#include <camel/camel-store-summary.h>
+#include <camel/camel.h>
#define CAMEL_IMAP_STORE_SUMMARY(obj) CAMEL_CHECK_CAST (obj, camel_imap_store_summary_get_type (), CamelImapStoreSummary)
#define CAMEL_IMAP_STORE_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_imap_store_summary_get_type (), CamelImapStoreSummaryClass)
@@ -95,4 +94,4 @@ gchar *camel_imap_store_summary_full_from_path(CamelImapStoreSummary *s, const g
G_END_DECLS
-#endif /* _CAMEL_IMAP_STORE_SUMMARY_H */
+#endif /* CAMEL_IMAP_STORE_SUMMARY_H */
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 9239305..9d0f6d6 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -36,24 +36,7 @@
#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
-#include "camel/camel-db.h"
-#include "camel/camel-debug.h"
-#include "camel/camel-exception.h"
-#include "camel/camel-file-utils.h"
-#include "camel/camel-folder.h"
-#include "camel/camel-net-utils.h"
-#include "camel/camel-private.h"
-#include "camel/camel-sasl.h"
-#include "camel/camel-session.h"
-#include "camel/camel-stream-buffer.h"
-#include "camel/camel-stream-fs.h"
-#include "camel/camel-stream-process.h"
-#include "camel/camel-stream.h"
-#include "camel/camel-string-utils.h"
-#include "camel/camel-tcp-stream-raw.h"
-#include "camel/camel-tcp-stream-ssl.h"
-#include "camel/camel-url.h"
-#include "camel/camel-utf8.h"
+#include <camel/camel-private.h>
#include "camel-imap-command.h"
#include "camel-imap-folder.h"
diff --git a/camel/providers/imap/camel-imap-store.h b/camel/providers/imap/camel-imap-store.h
index 03d8da8..cb523d3 100644
--- a/camel/providers/imap/camel-imap-store.h
+++ b/camel/providers/imap/camel-imap-store.h
@@ -22,17 +22,18 @@
*/
#ifndef CAMEL_IMAP_STORE_H
-#define CAMEL_IMAP_STORE_H 1
+#define CAMEL_IMAP_STORE_H
-#include "camel-imap-types.h"
-#include <camel/camel-msgport.h>
-#include <camel/camel-offline-store.h>
#include <sys/time.h>
-
-#ifdef ENABLE_THREADS
+#include <camel/camel.h>
G_BEGIN_DECLS
+typedef struct _CamelImapStore CamelImapStore;
+typedef struct _CamelImapStoreClass CamelImapStoreClass;
+
+#ifdef ENABLE_THREADS
+
typedef struct _CamelImapMsg CamelImapMsg;
struct _CamelImapMsg {
@@ -147,10 +148,9 @@ struct _CamelImapStore {
gchar *custom_headers;
};
-typedef struct {
+struct _CamelImapStoreClass {
CamelOfflineStoreClass parent_class;
-
-} CamelImapStoreClass;
+};
/* Standard Camel function */
CamelType camel_imap_store_get_type (void);
diff --git a/camel/providers/imap/camel-imap-summary.c b/camel/providers/imap/camel-imap-summary.c
index a75b784..d5ef241 100644
--- a/camel/providers/imap/camel-imap-summary.c
+++ b/camel/providers/imap/camel-imap-summary.c
@@ -31,12 +31,6 @@
#include <unistd.h>
#include <sys/stat.h>
-#include "camel-db.h"
-#include "camel-folder.h"
-#include "camel-file-utils.h"
-#include "camel-string-utils.h"
-#include "camel-store.h"
-
#include "camel-imap-summary.h"
#include "camel-imap-utils.h"
diff --git a/camel/providers/imap/camel-imap-summary.h b/camel/providers/imap/camel-imap-summary.h
index 2de45be..276c22d 100644
--- a/camel/providers/imap/camel-imap-summary.h
+++ b/camel/providers/imap/camel-imap-summary.h
@@ -20,12 +20,10 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_IMAP_SUMMARY_H
-#define _CAMEL_IMAP_SUMMARY_H
+#ifndef CAMEL_IMAP_SUMMARY_H
+#define CAMEL_IMAP_SUMMARY_H
-#include "camel-imap-types.h"
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-exception.h>
+#include <camel/camel.h>
#define CAMEL_IMAP_SUMMARY(obj) CAMEL_CHECK_CAST (obj, camel_imap_summary_get_type (), CamelImapSummary)
#define CAMEL_IMAP_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_imap_summary_get_type (), CamelImapSummaryClass)
@@ -43,6 +41,7 @@ enum {
CAMEL_IMAP_MESSAGE_RECENT = 1<<17
};
+typedef struct _CamelImapSummary CamelImapSummary;
typedef struct _CamelImapSummaryClass CamelImapSummaryClass;
typedef struct _CamelImapMessageContentInfo {
@@ -82,4 +81,4 @@ void camel_imap_summary_add_offline_uncached (CamelFolderSummary *summary,
G_END_DECLS
-#endif /* _CAMEL_IMAP_SUMMARY_H */
+#endif /* CAMEL_IMAP_SUMMARY_H */
diff --git a/camel/providers/imap/camel-imap-utils.c b/camel/providers/imap/camel-imap-utils.c
index e9d89ae..2309e3f 100644
--- a/camel/providers/imap/camel-imap-utils.c
+++ b/camel/providers/imap/camel-imap-utils.c
@@ -36,10 +36,6 @@
#include <glib.h>
#include <glib/gstdio.h>
-#include "camel-folder.h"
-#include "camel-string-utils.h"
-#include "camel-utf8.h"
-
#include "camel-imap-store.h"
#include "camel-imap-summary.h"
#include "camel-imap-store-summary.h"
diff --git a/camel/providers/imap/camel-imap-utils.h b/camel/providers/imap/camel-imap-utils.h
index 70c8ca8..d81c205 100644
--- a/camel/providers/imap/camel-imap-utils.h
+++ b/camel/providers/imap/camel-imap-utils.h
@@ -21,12 +21,12 @@
*/
#ifndef CAMEL_IMAP_UTILS_H
-#define CAMEL_IMAP_UTILS_H 1
+#define CAMEL_IMAP_UTILS_H
#include <sys/types.h>
+#include <camel/camel.h>
-#include "camel-folder-summary.h"
-#include "camel-imap-types.h"
+#include "camel-imap-store.h"
G_BEGIN_DECLS
diff --git a/camel/providers/imap/camel-imap-wrapper.c b/camel/providers/imap/camel-imap-wrapper.c
index c7c7f17..cf0bd9b 100644
--- a/camel/providers/imap/camel-imap-wrapper.c
+++ b/camel/providers/imap/camel-imap-wrapper.c
@@ -28,15 +28,6 @@
#include <errno.h>
#include <string.h>
-#include "camel-exception.h"
-#include "camel-mime-filter-basic.h"
-#include "camel-mime-filter-charset.h"
-#include "camel-mime-filter-crlf.h"
-#include "camel-mime-part.h"
-#include "camel-stream-filter.h"
-#include "camel-service.h"
-#include "camel-url.h"
-
#include "camel-imap-folder.h"
#include "camel-imap-wrapper.h"
diff --git a/camel/providers/imap/camel-imap-wrapper.h b/camel/providers/imap/camel-imap-wrapper.h
index c746243..6dce878 100644
--- a/camel/providers/imap/camel-imap-wrapper.h
+++ b/camel/providers/imap/camel-imap-wrapper.h
@@ -20,10 +20,9 @@
*/
#ifndef CAMEL_IMAP_WRAPPER_H
-#define CAMEL_IMAP_WRAPPER_H 1
+#define CAMEL_IMAP_WRAPPER_H
-#include <camel/camel-data-wrapper.h>
-#include "camel-imap-types.h"
+#include <camel/camel.h>
#define CAMEL_IMAP_WRAPPER_TYPE (camel_imap_wrapper_get_type ())
#define CAMEL_IMAP_WRAPPER(obj) (CAMEL_CHECK_CAST((obj), CAMEL_IMAP_WRAPPER_TYPE, CamelImapWrapper))
@@ -32,6 +31,7 @@
G_BEGIN_DECLS
+typedef struct _CamelImapWrapper CamelImapWrapper;
typedef struct _CamelImapWrapperClass CamelImapWrapperClass;
typedef struct _CamelImapWrapperPrivate CamelImapWrapperPrivate;
diff --git a/camel/providers/imap4/camel-imap4-command.h b/camel/providers/imap4/camel-imap4-command.h
index e072f38..7b6e504 100644
--- a/camel/providers/imap4/camel-imap4-command.h
+++ b/camel/providers/imap4/camel-imap4-command.h
@@ -19,8 +19,8 @@
* Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __CAMEL_IMAP4_COMMAND_H__
-#define __CAMEL_IMAP4_COMMAND_H__
+#ifndef CAMEL_IMAP4_COMMAND_H
+#define CAMEL_IMAP4_COMMAND_H
#include <stdarg.h>
@@ -139,4 +139,4 @@ void camel_imap4_command_reset (CamelIMAP4Command *ic);
G_END_DECLS
-#endif /* __CAMEL_IMAP4_COMMAND_H__ */
+#endif /* CAMEL_IMAP4_COMMAND_H */
diff --git a/camel/providers/imap4/camel-imap4-engine.h b/camel/providers/imap4/camel-imap4-engine.h
index 9390720..72db19d 100644
--- a/camel/providers/imap4/camel-imap4-engine.h
+++ b/camel/providers/imap4/camel-imap4-engine.h
@@ -19,8 +19,8 @@
* Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __CAMEL_IMAP4_ENGINE_H__
-#define __CAMEL_IMAP4_ENGINE_H__
+#ifndef CAMEL_IMAP4_ENGINE_H
+#define CAMEL_IMAP4_ENGINE_H
#include <stdarg.h>
@@ -230,4 +230,4 @@ void camel_imap4_resp_code_free (CamelIMAP4RespCode *rcode);
G_END_DECLS
-#endif /* __CAMEL_IMAP4_ENGINE_H__ */
+#endif /* CAMEL_IMAP4_ENGINE_H */
diff --git a/camel/providers/imap4/camel-imap4-folder.h b/camel/providers/imap4/camel-imap4-folder.h
index 8d1a614..08f7f64 100644
--- a/camel/providers/imap4/camel-imap4-folder.h
+++ b/camel/providers/imap4/camel-imap4-folder.h
@@ -19,8 +19,8 @@
* Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __CAMEL_IMAP4_FOLDER_H__
-#define __CAMEL_IMAP4_FOLDER_H__
+#ifndef CAMEL_IMAP4_FOLDER_H
+#define CAMEL_IMAP4_FOLDER_H
#include <camel/camel-store.h>
#include <camel/camel-folder.h>
@@ -83,4 +83,4 @@ const gchar *camel_imap4_folder_utf7_name (CamelIMAP4Folder *folder);
G_END_DECLS
-#endif /* __CAMEL_IMAP4_FOLDER_H__ */
+#endif /* CAMEL_IMAP4_FOLDER_H */
diff --git a/camel/providers/imap4/camel-imap4-journal.h b/camel/providers/imap4/camel-imap4-journal.h
index 3b204cf..0a5e267 100644
--- a/camel/providers/imap4/camel-imap4-journal.h
+++ b/camel/providers/imap4/camel-imap4-journal.h
@@ -19,8 +19,8 @@
* Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __CAMEL_IMAP4_JOURNAL_H__
-#define __CAMEL_IMAP4_JOURNAL_H__
+#ifndef CAMEL_IMAP4_JOURNAL_H
+#define CAMEL_IMAP4_JOURNAL_H
#include <stdarg.h>
@@ -81,4 +81,4 @@ void camel_imap4_journal_append (CamelIMAP4Journal *journal, CamelMimeMessage *m
G_END_DECLS
-#endif /* __CAMEL_IMAP4_JOURNAL_H__ */
+#endif /* CAMEL_IMAP4_JOURNAL_H */
diff --git a/camel/providers/imap4/camel-imap4-search.h b/camel/providers/imap4/camel-imap4-search.h
index 75f7e18..2f9ba9e 100644
--- a/camel/providers/imap4/camel-imap4-search.h
+++ b/camel/providers/imap4/camel-imap4-search.h
@@ -20,8 +20,8 @@
* Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __CAMEL_IMAP4_SEARCH_H__
-#define __CAMEL_IMAP4_SEARCH_H__
+#ifndef CAMEL_IMAP4_SEARCH_H
+#define CAMEL_IMAP4_SEARCH_H
#include <camel/camel-data-cache.h>
#include <camel/camel-folder-search.h>
@@ -66,4 +66,4 @@ CamelFolderSearch *camel_imap4_search_new (struct _CamelIMAP4Engine *engine, con
G_END_DECLS
-#endif /* __CAMEL_IMAP4_SEARCH_H__ */
+#endif /* CAMEL_IMAP4_SEARCH_H */
diff --git a/camel/providers/imap4/camel-imap4-specials.h b/camel/providers/imap4/camel-imap4-specials.h
index 02e87ad..3672ca1 100644
--- a/camel/providers/imap4/camel-imap4-specials.h
+++ b/camel/providers/imap4/camel-imap4-specials.h
@@ -19,8 +19,8 @@
* Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __CAMEL_IMAP4_SPECIALS_H__
-#define __CAMEL_IMAP4_SPECIALS_H__
+#ifndef CAMEL_IMAP4_SPECIALS_H
+#define CAMEL_IMAP4_SPECIALS_H
#include <glib.h>
@@ -48,4 +48,4 @@ void camel_imap4_specials_init (void);
G_END_DECLS
-#endif /* __CAMEL_IMAP4_SPECIALS_H__ */
+#endif /* CAMEL_IMAP4_SPECIALS_H */
diff --git a/camel/providers/imap4/camel-imap4-store-summary.h b/camel/providers/imap4/camel-imap4-store-summary.h
index 21a32e5..ce1e5f0 100644
--- a/camel/providers/imap4/camel-imap4-store-summary.h
+++ b/camel/providers/imap4/camel-imap4-store-summary.h
@@ -19,8 +19,8 @@
* Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __CAMEL_IMAP_STORE_SUMMARY_H__
-#define __CAMEL_IMAP_STORE_SUMMARY_H__
+#ifndef CAMEL_IMAP_STORE_SUMMARY_H
+#define CAMEL_IMAP_STORE_SUMMARY_H
#include <camel/camel-store-summary.h>
#include "camel-imap4-engine.h"
@@ -79,4 +79,4 @@ struct _CamelFolderInfo *camel_imap4_store_summary_get_folder_info (CamelIMAP4St
G_END_DECLS
-#endif /* __CAMEL_IMAP4_STORE_SUMMARY_H__ */
+#endif /* CAMEL_IMAP4_STORE_SUMMARY_H */
diff --git a/camel/providers/imap4/camel-imap4-store.h b/camel/providers/imap4/camel-imap4-store.h
index 3773574..b1fded3 100644
--- a/camel/providers/imap4/camel-imap4-store.h
+++ b/camel/providers/imap4/camel-imap4-store.h
@@ -19,8 +19,8 @@
* Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __CAMEL_IMAP4_STORE_H__
-#define __CAMEL_IMAP4_STORE_H__
+#ifndef CAMEL_IMAP4_STORE_H
+#define CAMEL_IMAP4_STORE_H
#include <camel/camel-offline-store.h>
@@ -55,4 +55,4 @@ CamelType camel_imap4_store_get_type (void);
G_END_DECLS
-#endif /* __CAMEL_IMAP4_STORE_H__ */
+#endif /* CAMEL_IMAP4_STORE_H */
diff --git a/camel/providers/imap4/camel-imap4-stream.h b/camel/providers/imap4/camel-imap4-stream.h
index 350acca..770be3f 100644
--- a/camel/providers/imap4/camel-imap4-stream.h
+++ b/camel/providers/imap4/camel-imap4-stream.h
@@ -19,8 +19,8 @@
* Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __CAMEL_IMAP4_STREAM_H__
-#define __CAMEL_IMAP4_STREAM_H__
+#ifndef CAMEL_IMAP4_STREAM_H
+#define CAMEL_IMAP4_STREAM_H
#include <camel/camel-stream.h>
@@ -117,4 +117,4 @@ gint camel_imap4_stream_literal (CamelIMAP4Stream *stream, guchar **literal, gsi
G_END_DECLS
-#endif /* __CAMEL_IMAP4_STREAM_H__ */
+#endif /* CAMEL_IMAP4_STREAM_H */
diff --git a/camel/providers/imap4/camel-imap4-summary.h b/camel/providers/imap4/camel-imap4-summary.h
index 6514557..2203646 100644
--- a/camel/providers/imap4/camel-imap4-summary.h
+++ b/camel/providers/imap4/camel-imap4-summary.h
@@ -19,8 +19,8 @@
* Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __CAMEL_IMAP4_SUMMARY_H__
-#define __CAMEL_IMAP4_SUMMARY_H__
+#ifndef CAMEL_IMAP4_SUMMARY_H
+#define CAMEL_IMAP4_SUMMARY_H
#include <sys/types.h>
@@ -96,4 +96,4 @@ gint camel_imap4_summary_flush_updates (CamelFolderSummary *summary, CamelExcept
G_END_DECLS
-#endif /* __CAMEL_IMAP4_SUMMARY_H__ */
+#endif /* CAMEL_IMAP4_SUMMARY_H */
diff --git a/camel/providers/imap4/camel-imap4-utils.h b/camel/providers/imap4/camel-imap4-utils.h
index 5f44951..ecf0d19 100644
--- a/camel/providers/imap4/camel-imap4-utils.h
+++ b/camel/providers/imap4/camel-imap4-utils.h
@@ -19,8 +19,8 @@
* Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __CAMEL_IMAP4_UTILS_H__
-#define __CAMEL_IMAP4_UTILS_H__
+#ifndef CAMEL_IMAP4_UTILS_H
+#define CAMEL_IMAP4_UTILS_H
#include <glib.h>
@@ -101,4 +101,4 @@ gint camel_imap4_untagged_status (struct _CamelIMAP4Engine *engine, struct _Came
G_END_DECLS
-#endif /* __CAMEL_IMAP4_UTILS_H__ */
+#endif /* CAMEL_IMAP4_UTILS_H */
diff --git a/camel/providers/imapx/camel-imapx-exception.h b/camel/providers/imapx/camel-imapx-exception.h
index a27183f..a445632 100644
--- a/camel/providers/imapx/camel-imapx-exception.h
+++ b/camel/providers/imapx/camel-imapx-exception.h
@@ -3,11 +3,11 @@
/* Still experimental code */
-#ifndef __CAMEL_IMAPX_EXCEPTION_H
-#define __CAMEL_IMAPX_EXCEPTION_H
+#ifndef CAMEL_IMAPX_EXCEPTION_H
+#define CAMEL_IMAPX_EXCEPTION_H
#include <setjmp.h>
-#include "camel/camel-exception.h"
+#include <camel/camel.h>
struct _CamelExceptionEnv {
struct _CamelExceptionEnv *parent;
diff --git a/camel/providers/imapx/camel-imapx-folder.c b/camel/providers/imapx/camel-imapx-folder.c
index 35468d8..2838db1 100644
--- a/camel/providers/imapx/camel-imapx-folder.c
+++ b/camel/providers/imapx/camel-imapx-folder.c
@@ -28,17 +28,6 @@
#include <errno.h>
#include <glib/gi18n-lib.h>
-#include "camel/camel-exception.h"
-#include "camel/camel-stream-mem.h"
-#include "camel/camel-stream-filter.h"
-#include "camel/camel-mime-message.h"
-#include "camel/camel-operation.h"
-#include "camel/camel-data-cache.h"
-#include "camel/camel-session.h"
-#include "camel/camel-file-utils.h"
-#include "camel/camel-string-utils.h"
-#include "camel-folder-search.h"
-
#include "camel-imapx-store.h"
#include "camel-imapx-folder.h"
#include "camel-imapx-summary.h"
diff --git a/camel/providers/imapx/camel-imapx-folder.h b/camel/providers/imapx/camel-imapx-folder.h
index f01932f..1e5d9c6 100644
--- a/camel/providers/imapx/camel-imapx-folder.h
+++ b/camel/providers/imapx/camel-imapx-folder.h
@@ -22,16 +22,14 @@
*/
#ifndef CAMEL_IMAPX_FOLDER_H
-#define CAMEL_IMAPX_FOLDER_H 1
+#define CAMEL_IMAPX_FOLDER_H
#ifdef __cplusplus
extern "C" {
#pragma }
#endif /* __cplusplus }*/
-#include <camel/camel-offline-folder.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-data-cache.h>
+#include <camel/camel.h>
#define CAMEL_IMAPX_FOLDER_TYPE (camel_imapx_folder_get_type ())
#define CAMEL_IMAPX_FOLDER(obj) (CAMEL_CHECK_CAST((obj), CAMEL_IMAPX_FOLDER_TYPE, CamelIMAPXFolder))
diff --git a/camel/providers/imapx/camel-imapx-provider.c b/camel/providers/imapx/camel-imapx-provider.c
index e393ec0..92bb19c 100644
--- a/camel/providers/imapx/camel-imapx-provider.c
+++ b/camel/providers/imapx/camel-imapx-provider.c
@@ -28,13 +28,9 @@
#endif
#include <string.h>
+#include <camel/camel.h>
#include <glib/gi18n-lib.h>
-#include "camel/camel-provider.h"
-#include "camel/camel-session.h"
-#include "camel/camel-url.h"
-#include "camel/camel-sasl.h"
-
#include "camel-imapx-store.h"
static guint imapx_url_hash (gconstpointer key);
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index fd587df..7d27ae5 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -19,27 +19,7 @@
#include <prerr.h>
#endif
-#include <camel/camel-list-utils.h>
-#include <camel/camel-msgport.h>
-#include <camel/camel-object.h>
-#include <camel/camel-url.h>
-#include <camel/camel-session.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-null.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-mime-filter-canon.h>
-#include <camel/camel-mime-message.h>
-#include "camel/camel-string-utils.h"
-#include <camel/camel-net-utils.h>
-#include "camel/camel-private.h"
-#include <camel/camel-tcp-stream-ssl.h>
-#include <camel/camel-tcp-stream-raw.h>
-#include <camel/camel-db.h>
-
-#include <camel/camel-sasl.h>
-#include <camel/camel-utf8.h>
-#include <camel/camel-file-utils.h>
+#include <camel/camel-private.h>
#include "camel-imapx-utils.h"
#include "camel-imapx-exception.h"
diff --git a/camel/providers/imapx/camel-imapx-server.h b/camel/providers/imapx/camel-imapx-server.h
index 037d653..382cfa2 100644
--- a/camel/providers/imapx/camel-imapx-server.h
+++ b/camel/providers/imapx/camel-imapx-server.h
@@ -19,11 +19,10 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef _CAMEL_IMAPX_SERVER_H
-#define _CAMEL_IMAPX_SERVER_H
+#ifndef CAMEL_IMAPX_SERVER_H
+#define CAMEL_IMAPX_SERVER_H
-#include <camel/camel-msgport.h>
-#include <camel/camel-list-utils.h>
+#include <camel/camel.h>
#include <libedataserver/e-flag.h>
struct _CamelFolder;
@@ -134,4 +133,4 @@ void camel_imapx_server_create_folder (CamelIMAPXServer *is, const gchar *folder
void camel_imapx_server_delete_folder (CamelIMAPXServer *is, const gchar *folder_name, CamelException *ex);
void camel_imapx_server_rename_folder (CamelIMAPXServer *is, const gchar *old_name, const gchar *new_name, CamelException *ex);
-#endif /* _CAMEL_IMAPX_SERVER_H */
+#endif /* CAMEL_IMAPX_SERVER_H */
diff --git a/camel/providers/imapx/camel-imapx-store-summary.c b/camel/providers/imapx/camel-imapx-store-summary.c
index bc0854f..892bfa8 100644
--- a/camel/providers/imapx/camel-imapx-store-summary.c
+++ b/camel/providers/imapx/camel-imapx-store-summary.c
@@ -29,10 +29,8 @@
#include <string.h>
#include <unistd.h>
-#include "camel-file-utils.h"
-#include "camel-private.h"
-#include "camel-store.h"
-#include "camel-utf8.h"
+#include <camel/camel-private.h>
+
#include "camel-imapx-utils.h"
#include "camel-imapx-store-summary.h"
diff --git a/camel/providers/imapx/camel-imapx-store-summary.h b/camel/providers/imapx/camel-imapx-store-summary.h
index 1da5b2c..cf78e88 100644
--- a/camel/providers/imapx/camel-imapx-store-summary.h
+++ b/camel/providers/imapx/camel-imapx-store-summary.h
@@ -19,11 +19,10 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_IMAPX_STORE_SUMMARY_H
-#define _CAMEL_IMAPX_STORE_SUMMARY_H
+#ifndef CAMEL_IMAPX_STORE_SUMMARY_H
+#define CAMEL_IMAPX_STORE_SUMMARY_H
-#include <camel/camel-object.h>
-#include <camel/camel-store-summary.h>
+#include <camel/camel.h>
#define CAMEL_IMAPX_STORE_SUMMARY(obj) CAMEL_CHECK_CAST (obj, camel_imapx_store_summary_get_type (), CamelIMAPXStoreSummary)
#define CAMEL_IMAPX_STORE_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_imapx_store_summary_get_type (), CamelIMAPXStoreSummaryClass)
@@ -102,4 +101,4 @@ void camel_imapx_store_summary_set_namespaces (CamelIMAPXStoreSummary *summary,
G_END_DECLS
-#endif /* _CAMEL_IMAP_STORE_SUMMARY_H */
+#endif /* CAMEL_IMAP_STORE_SUMMARY_H */
diff --git a/camel/providers/imapx/camel-imapx-store.c b/camel/providers/imapx/camel-imapx-store.c
index 8fb5686..d3266db 100644
--- a/camel/providers/imapx/camel-imapx-store.c
+++ b/camel/providers/imapx/camel-imapx-store.c
@@ -41,20 +41,7 @@
#include <glib/gstdio.h>
#include <glib/gi18n-lib.h>
-#include "camel/camel-operation.h"
-
-#include "camel/camel-stream-buffer.h"
-#include "camel/camel-session.h"
-#include "camel/camel-exception.h"
-#include "camel/camel-url.h"
-#include "camel/camel-sasl.h"
-#include "camel/camel-data-cache.h"
-#include "camel/camel-tcp-stream.h"
-#include "camel/camel-tcp-stream-raw.h"
-#include "camel/camel-db.h"
-#ifdef HAVE_SSL
-#include "camel/camel-tcp-stream-ssl.h"
-#endif
+#include <camel/camel-private.h>
#include "camel-imapx-store.h"
#include "camel-imapx-folder.h"
@@ -62,8 +49,6 @@
#include "camel-imapx-utils.h"
#include "camel-imapx-server.h"
#include "camel-imapx-summary.h"
-#include "camel-net-utils.h"
-#include "camel/camel-private.h"
/* Specified in RFC 2060 section 2.1 */
#define IMAP_PORT 143
diff --git a/camel/providers/imapx/camel-imapx-store.h b/camel/providers/imapx/camel-imapx-store.h
index 652a795..a90588c 100644
--- a/camel/providers/imapx/camel-imapx-store.h
+++ b/camel/providers/imapx/camel-imapx-store.h
@@ -22,17 +22,16 @@
*/
#ifndef CAMEL_IMAPX_STORE_H
-#define CAMEL_IMAPX_STORE_H 1
+#define CAMEL_IMAPX_STORE_H
#ifdef __cplusplus
extern "C" {
#pragma }
#endif /* __cplusplus }*/
-#include <camel/camel-types.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
+
#include "camel-imapx-store-summary.h"
-#include <camel/camel-offline-store.h>
#define CAMEL_IMAPX_STORE_TYPE (camel_imapx_store_get_type ())
#define CAMEL_IMAPX_STORE(obj) (CAMEL_CHECK_CAST((obj), CAMEL_IMAPX_STORE_TYPE, CamelIMAPXStore))
diff --git a/camel/providers/imapx/camel-imapx-stream.c b/camel/providers/imapx/camel-imapx-stream.c
index 076bbea..653a42b 100644
--- a/camel/providers/imapx/camel-imapx-stream.c
+++ b/camel/providers/imapx/camel-imapx-stream.c
@@ -31,8 +31,6 @@
#include <glib.h>
-#include <camel/camel-stream-mem.h>
-
#include "camel-imapx-utils.h"
#include "camel-imapx-stream.h"
#include "camel-imapx-exception.h"
diff --git a/camel/providers/imapx/camel-imapx-stream.h b/camel/providers/imapx/camel-imapx-stream.h
index 174c2cf..0416c56 100644
--- a/camel/providers/imapx/camel-imapx-stream.h
+++ b/camel/providers/imapx/camel-imapx-stream.h
@@ -18,10 +18,10 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef _CAMEL_IMAPX_STREAM_H
-#define _CAMEL_IMAPX_STREAM_H
+#ifndef CAMEL_IMAPX_STREAM_H
+#define CAMEL_IMAPX_STREAM_H
-#include <camel/camel-stream.h>
+#include <camel/camel.h>
#define CAMEL_IMAPX_STREAM(obj) CAMEL_CHECK_CAST (obj, camel_imapx_stream_get_type (), CamelIMAPXStream)
#define CAMEL_IMAPX_STREAM_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_imapx_stream_get_type (), CamelIMAPXStreamClass)
@@ -92,4 +92,4 @@ guint32 camel_imapx_stream_number(CamelIMAPXStream *is, CamelException *ex);
/* skips the rest of a line, including literals, etc */
gint camel_imapx_stream_skip(CamelIMAPXStream *is, CamelException *ex);
-#endif /* _CAMEL_IMAPX_STREAM_H */
+#endif /* CAMEL_IMAPX_STREAM_H */
diff --git a/camel/providers/imapx/camel-imapx-summary.c b/camel/providers/imapx/camel-imapx-summary.c
index b000c13..0f9204a 100644
--- a/camel/providers/imapx/camel-imapx-summary.c
+++ b/camel/providers/imapx/camel-imapx-summary.c
@@ -31,14 +31,7 @@
#include <unistd.h>
#include <sys/stat.h>
-#include "camel-db.h"
-#include "camel-folder.h"
-#include "camel-file-utils.h"
-#include "camel-string-utils.h"
-#include "camel-store.h"
-
#include "camel-imapx-summary.h"
-//#include "camel-imap-utils.h"
#define CAMEL_IMAPX_SUMMARY_VERSION (3)
diff --git a/camel/providers/imapx/camel-imapx-summary.h b/camel/providers/imapx/camel-imapx-summary.h
index f6078b6..e78651f 100644
--- a/camel/providers/imapx/camel-imapx-summary.h
+++ b/camel/providers/imapx/camel-imapx-summary.h
@@ -20,12 +20,10 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_IMAPX_SUMMARY_H
-#define _CAMEL_IMAPX_SUMMARY_H
+#ifndef CAMEL_IMAPX_SUMMARY_H
+#define CAMEL_IMAPX_SUMMARY_H
-//#include "camel-imap-types.h"
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-exception.h>
+#include <camel/camel.h>
#define CAMEL_IMAPX_SUMMARY(obj) CAMEL_CHECK_CAST (obj, camel_imapx_summary_get_type (), CamelIMAPXSummary)
#define CAMEL_IMAPX_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_imapx_summary_get_type (), CamelIMAPXSummaryClass)
@@ -80,4 +78,4 @@ void camel_imapx_summary_add_offline_uncached (CamelFolderSummary *summary,
G_END_DECLS
-#endif /* _CAMEL_IMAPX_SUMMARY_H */
+#endif /* CAMEL_IMAPX_SUMMARY_H */
diff --git a/camel/providers/imapx/camel-imapx-utils.c b/camel/providers/imapx/camel-imapx-utils.c
index 777f14c..f2c1211 100644
--- a/camel/providers/imapx/camel-imapx-utils.c
+++ b/camel/providers/imapx/camel-imapx-utils.c
@@ -3,11 +3,6 @@
#include <errno.h>
#include <string.h>
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-store.h>
-#include <camel/camel-utf8.h>
-#include <camel/camel-string-utils.h>
-
#include "camel-imapx-folder.h"
#include "camel-imapx-stream.h"
#include "camel-imapx-summary.h"
@@ -1302,8 +1297,6 @@ imapx_free_fetch(struct _fetch_info *finfo)
g_free(finfo);
}
-#include <camel/camel-stream-fs.h>
-
/* debug, dump one out */
void
imapx_dump_fetch(struct _fetch_info *finfo)
diff --git a/camel/providers/imapx/camel-imapx-utils.h b/camel/providers/imapx/camel-imapx-utils.h
index cc73d9f..91b9761 100644
--- a/camel/providers/imapx/camel-imapx-utils.h
+++ b/camel/providers/imapx/camel-imapx-utils.h
@@ -1,9 +1,9 @@
-#ifndef _CAMEL_IMAPX_UTILS_H
-#define _CAMEL_IMAPX_UTILS_H
+#ifndef CAMEL_IMAPX_UTILS_H
+#define CAMEL_IMAPX_UTILS_H
+
+#include <camel/camel.h>
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-folder-summary.h>
#include "camel-imapx-store.h"
struct _CamelIMAPXStream;
diff --git a/camel/providers/imapx/camel-imapx-view-summary.h b/camel/providers/imapx/camel-imapx-view-summary.h
index eb33ccd..53917c4 100644
--- a/camel/providers/imapx/camel-imapx-view-summary.h
+++ b/camel/providers/imapx/camel-imapx-view-summary.h
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef _CAMEL_IMAPX_VIEW_SUMMARY_H
-#define _CAMEL_IMAPX_VIEW_SUMMARY_H
+#ifndef CAMEL_IMAPX_VIEW_SUMMARY_H
+#define CAMEL_IMAPX_VIEW_SUMMARY_H
#include "camel-view-summary-disk.h"
@@ -59,5 +59,5 @@ CamelIMAPXViewSummary *camel_imapx_view_summary_new (const gchar *base, Cam
guint32 camel_imapx_view_next_uid(CamelIMAPXView *view);
void camel_imapx_view_last_uid(CamelIMAPXView *view, guint32 uid);
-#endif /* _CAMEL_IMAPX_VIEW_SUMMARY_H */
+#endif /* CAMEL_IMAPX_VIEW_SUMMARY_H */
diff --git a/camel/providers/imapx/test-imapx.c b/camel/providers/imapx/test-imapx.c
index 2f139d7..cc2df88 100644
--- a/camel/providers/imapx/test-imapx.c
+++ b/camel/providers/imapx/test-imapx.c
@@ -2,7 +2,6 @@
#include "camel-imapx-store.h"
#include "camel-imapx-folder.h"
#include <camel/camel.h>
-#include <camel/camel-session.h>
gint
main (gint argc, gchar *argv [])
diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c
index 5736aac..5fbbb94 100644
--- a/camel/providers/local/camel-local-folder.c
+++ b/camel/providers/local/camel-local-folder.c
@@ -41,14 +41,7 @@
#include <posix1_lim.h>
#endif
-#include "camel-data-wrapper.h"
-#include "camel-exception.h"
-#include "camel-mime-filter-from.h"
-#include "camel-mime-message.h"
-#include "camel-private.h"
-#include "camel-stream-filter.h"
-#include "camel-stream-fs.h"
-#include "camel-text-index.h"
+#include <camel/camel-private.h>
#include "camel-local-folder.h"
#include "camel-local-private.h"
diff --git a/camel/providers/local/camel-local-folder.h b/camel/providers/local/camel-local-folder.h
index d51a83f..2274b3e 100644
--- a/camel/providers/local/camel-local-folder.h
+++ b/camel/providers/local/camel-local-folder.h
@@ -20,13 +20,11 @@
*/
#ifndef CAMEL_LOCAL_FOLDER_H
-#define CAMEL_LOCAL_FOLDER_H 1
+#define CAMEL_LOCAL_FOLDER_H
+
+#include <camel/camel.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-folder-search.h>
-#include <camel/camel-index.h>
#include "camel-local-summary.h"
-#include "camel-lock.h"
/* #include "camel-store.h" */
diff --git a/camel/providers/local/camel-local-private.h b/camel/providers/local/camel-local-private.h
index 68f2503..c958e92 100644
--- a/camel/providers/local/camel-local-private.h
+++ b/camel/providers/local/camel-local-private.h
@@ -21,7 +21,7 @@
*/
#ifndef CAMEL_LOCAL_PRIVATE_H
-#define CAMEL_LOCAL_PRIVATE_H 1
+#define CAMEL_LOCAL_PRIVATE_H
/* need a way to configure and save this data, if this header is to
be installed. For now, dont install it */
diff --git a/camel/providers/local/camel-local-provider.c b/camel/providers/local/camel-local-provider.c
index b5d85e1..d26734c 100644
--- a/camel/providers/local/camel-local-provider.c
+++ b/camel/providers/local/camel-local-provider.c
@@ -28,10 +28,6 @@
#include <glib/gi18n-lib.h>
-#include "camel-provider.h"
-#include "camel-session.h"
-#include "camel-url.h"
-
#include "camel-maildir-store.h"
#include "camel-mbox-store.h"
#include "camel-mh-store.h"
diff --git a/camel/providers/local/camel-local-store.c b/camel/providers/local/camel-local-store.c
index 3ab2ad2..613ad57 100644
--- a/camel/providers/local/camel-local-store.c
+++ b/camel/providers/local/camel-local-store.c
@@ -33,13 +33,6 @@
#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
-#include "camel/camel-exception.h"
-#include "camel/camel-file-utils.h"
-#include "camel/camel-private.h"
-#include "camel/camel-text-index.h"
-#include "camel/camel-url.h"
-#include "camel/camel-vtrash-folder.h"
-
#include "camel-local-folder.h"
#include "camel-local-store.h"
diff --git a/camel/providers/local/camel-local-store.h b/camel/providers/local/camel-local-store.h
index 410c80b..43b73c5 100644
--- a/camel/providers/local/camel-local-store.h
+++ b/camel/providers/local/camel-local-store.h
@@ -21,9 +21,9 @@
*/
#ifndef CAMEL_LOCAL_STORE_H
-#define CAMEL_LOCAL_STORE_H 1
+#define CAMEL_LOCAL_STORE_H
-#include "camel-store.h"
+#include <camel/camel.h>
#define CAMEL_LOCAL_STORE_TYPE (camel_local_store_get_type ())
#define CAMEL_LOCAL_STORE(obj) (CAMEL_CHECK_CAST((obj), CAMEL_LOCAL_STORE_TYPE, CamelLocalStore))
diff --git a/camel/providers/local/camel-local-summary.c b/camel/providers/local/camel-local-summary.c
index b3fd143..9a946e5 100644
--- a/camel/providers/local/camel-local-summary.c
+++ b/camel/providers/local/camel-local-summary.c
@@ -34,12 +34,6 @@
#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
-#include "camel-db.h"
-#include "camel-file-utils.h"
-#include "camel-mime-message.h"
-#include "camel-stream-null.h"
-#include "camel-string-utils.h"
-
#include "camel-local-summary.h"
#define w(x)
diff --git a/camel/providers/local/camel-local-summary.h b/camel/providers/local/camel-local-summary.h
index 0cd8a3a..5cf79a9 100644
--- a/camel/providers/local/camel-local-summary.h
+++ b/camel/providers/local/camel-local-summary.h
@@ -18,13 +18,10 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_LOCAL_SUMMARY_H
-#define _CAMEL_LOCAL_SUMMARY_H
+#ifndef CAMEL_LOCAL_SUMMARY_H
+#define CAMEL_LOCAL_SUMMARY_H
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-index.h>
+#include <camel/camel.h>
#define CAMEL_LOCAL_SUMMARY(obj) CAMEL_CHECK_CAST (obj, camel_local_summary_get_type (), CamelLocalSummary)
#define CAMEL_LOCAL_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_local_summary_get_type (), CamelLocalSummaryClass)
@@ -97,4 +94,4 @@ gint camel_local_summary_write_headers(gint fd, struct _camel_header_raw *header
G_END_DECLS
-#endif /* _CAMEL_LOCAL_SUMMARY_H */
+#endif /* CAMEL_LOCAL_SUMMARY_H */
diff --git a/camel/providers/local/camel-maildir-folder.c b/camel/providers/local/camel-maildir-folder.c
index d07baa9..aedc3ee 100644
--- a/camel/providers/local/camel-maildir-folder.c
+++ b/camel/providers/local/camel-maildir-folder.c
@@ -35,11 +35,6 @@
#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
-#include "camel-data-wrapper.h"
-#include "camel-exception.h"
-#include "camel-mime-message.h"
-#include "camel-stream-fs.h"
-
#include "camel-maildir-folder.h"
#include "camel-maildir-store.h"
#include "camel-maildir-summary.h"
diff --git a/camel/providers/local/camel-maildir-folder.h b/camel/providers/local/camel-maildir-folder.h
index 86aa707..19ae2c4 100644
--- a/camel/providers/local/camel-maildir-folder.h
+++ b/camel/providers/local/camel-maildir-folder.h
@@ -21,7 +21,7 @@
*/
#ifndef CAMEL_MAILDIR_FOLDER_H
-#define CAMEL_MAILDIR_FOLDER_H 1
+#define CAMEL_MAILDIR_FOLDER_H
#include "camel-local-folder.h"
diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c
index c1ca64a..80436fc 100644
--- a/camel/providers/local/camel-maildir-store.c
+++ b/camel/providers/local/camel-maildir-store.c
@@ -32,11 +32,6 @@
#include <glib/gi18n-lib.h>
-#include "camel-exception.h"
-#include "camel-list-utils.h"
-#include "camel-private.h"
-#include "camel-url.h"
-
#include "camel-maildir-folder.h"
#include "camel-maildir-store.h"
#include "camel-maildir-summary.h"
diff --git a/camel/providers/local/camel-maildir-store.h b/camel/providers/local/camel-maildir-store.h
index e4f4647..606fa85 100644
--- a/camel/providers/local/camel-maildir-store.h
+++ b/camel/providers/local/camel-maildir-store.h
@@ -20,7 +20,7 @@
*/
#ifndef CAMEL_MAILDIR_STORE_H
-#define CAMEL_MAILDIR_STORE_H 1
+#define CAMEL_MAILDIR_STORE_H
#include "camel-local-store.h"
diff --git a/camel/providers/local/camel-maildir-summary.c b/camel/providers/local/camel-maildir-summary.c
index 0b3535e..963eadc 100644
--- a/camel/providers/local/camel-maildir-summary.c
+++ b/camel/providers/local/camel-maildir-summary.c
@@ -31,18 +31,10 @@
#include <unistd.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <sys/types.h>
#include <sys/uio.h>
#include <glib/gi18n-lib.h>
-#include "camel-db.h"
-#include "camel-mempool.h"
-#include "camel-mime-message.h"
-#include "camel-operation.h"
-#include "camel-private.h"
-#include "camel-store.h"
-#include "camel-string-utils.h"
#include "camel-maildir-summary.h"
#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
diff --git a/camel/providers/local/camel-maildir-summary.h b/camel/providers/local/camel-maildir-summary.h
index 1ce6e74..3840cff 100644
--- a/camel/providers/local/camel-maildir-summary.h
+++ b/camel/providers/local/camel-maildir-summary.h
@@ -18,13 +18,10 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MAILDIR_SUMMARY_H
-#define _CAMEL_MAILDIR_SUMMARY_H
+#ifndef CAMEL_MAILDIR_SUMMARY_H
+#define CAMEL_MAILDIR_SUMMARY_H
#include "camel-local-summary.h"
-#include <camel/camel-folder.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-index.h>
#define CAMEL_MAILDIR_SUMMARY(obj) CAMEL_CHECK_CAST (obj, camel_maildir_summary_get_type (), CamelMaildirSummary)
#define CAMEL_MAILDIR_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_maildir_summary_get_type (), CamelMaildirSummaryClass)
@@ -76,4 +73,4 @@ gint camel_maildir_summary_name_to_info(CamelMaildirMessageInfo *info, const gch
G_END_DECLS
-#endif /* _CAMEL_MAILDIR_SUMMARY_H */
+#endif /* CAMEL_MAILDIR_SUMMARY_H */
diff --git a/camel/providers/local/camel-mbox-folder.c b/camel/providers/local/camel-mbox-folder.c
index 8429368..5b40576 100644
--- a/camel/providers/local/camel-mbox-folder.c
+++ b/camel/providers/local/camel-mbox-folder.c
@@ -37,18 +37,6 @@
#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
-#include "camel/camel-data-wrapper.h"
-#include "camel/camel-exception.h"
-#include "camel/camel-mime-filter-from.h"
-#include "camel/camel-mime-message.h"
-#include "camel/camel-mime-part-utils.h"
-#include "camel/camel-private.h"
-#include "camel/camel-stream-filter.h"
-#include "camel/camel-stream-fs.h"
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-stream-buffer.h>
-#include <camel/camel-multipart.h>
-
#include "camel-mbox-folder.h"
#include "camel-mbox-store.h"
#include "camel-mbox-summary.h"
diff --git a/camel/providers/local/camel-mbox-folder.h b/camel/providers/local/camel-mbox-folder.h
index e442133..6a5285e 100644
--- a/camel/providers/local/camel-mbox-folder.h
+++ b/camel/providers/local/camel-mbox-folder.h
@@ -20,7 +20,7 @@
*/
#ifndef CAMEL_MBOX_FOLDER_H
-#define CAMEL_MBOX_FOLDER_H 1
+#define CAMEL_MBOX_FOLDER_H
#include "camel-local-folder.h"
#include "camel-mbox-summary.h"
diff --git a/camel/providers/local/camel-mbox-store.c b/camel/providers/local/camel-mbox-store.c
index c7a7ef7..85026e1 100644
--- a/camel/providers/local/camel-mbox-store.c
+++ b/camel/providers/local/camel-mbox-store.c
@@ -34,12 +34,6 @@
#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
-#include "camel/camel-exception.h"
-#include "camel/camel-file-utils.h"
-#include "camel/camel-private.h"
-#include "camel/camel-text-index.h"
-#include "camel/camel-url.h"
-
#include "camel-mbox-folder.h"
#include "camel-mbox-store.h"
diff --git a/camel/providers/local/camel-mbox-store.h b/camel/providers/local/camel-mbox-store.h
index d697562..e0f1bed 100644
--- a/camel/providers/local/camel-mbox-store.h
+++ b/camel/providers/local/camel-mbox-store.h
@@ -20,7 +20,7 @@
*/
#ifndef CAMEL_MBOX_STORE_H
-#define CAMEL_MBOX_STORE_H 1
+#define CAMEL_MBOX_STORE_H
#include "camel-local-store.h"
diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c
index bd2bb9a..98e00db 100644
--- a/camel/providers/local/camel-mbox-summary.c
+++ b/camel/providers/local/camel-mbox-summary.c
@@ -36,16 +36,7 @@
#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
-#include "camel-db.h"
-#include "camel-file-utils.h"
-#include "camel-mime-message.h"
-#include "camel-operation.h"
-#include "camel-private.h"
-
#include "camel-mbox-summary.h"
-#include "camel-string-utils.h"
-#include "camel-store.h"
-#include "camel-folder.h"
#include "camel-local-private.h"
#define io(x)
diff --git a/camel/providers/local/camel-mbox-summary.h b/camel/providers/local/camel-mbox-summary.h
index 4bd3a92..aa31677 100644
--- a/camel/providers/local/camel-mbox-summary.h
+++ b/camel/providers/local/camel-mbox-summary.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MBOX_SUMMARY_H
-#define _CAMEL_MBOX_SUMMARY_H
+#ifndef CAMEL_MBOX_SUMMARY_H
+#define CAMEL_MBOX_SUMMARY_H
#include "camel-local-summary.h"
@@ -76,4 +76,4 @@ gint camel_mbox_summary_sync_mbox(CamelMboxSummary *cls, guint32 flags, CamelFol
G_END_DECLS
-#endif /* _CAMEL_MBOX_SUMMARY_H */
+#endif /* CAMEL_MBOX_SUMMARY_H */
diff --git a/camel/providers/local/camel-mh-folder.c b/camel/providers/local/camel-mh-folder.c
index e93e673..d6c226e 100644
--- a/camel/providers/local/camel-mh-folder.c
+++ b/camel/providers/local/camel-mh-folder.c
@@ -34,13 +34,9 @@
#include <glib/gi18n-lib.h>
-#include "camel-data-wrapper.h"
-#include "camel-exception.h"
#include "camel-mh-folder.h"
#include "camel-mh-store.h"
#include "camel-mh-summary.h"
-#include "camel-mime-message.h"
-#include "camel-stream-fs.h"
#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
diff --git a/camel/providers/local/camel-mh-folder.h b/camel/providers/local/camel-mh-folder.h
index 08f8f2c..b11d711 100644
--- a/camel/providers/local/camel-mh-folder.h
+++ b/camel/providers/local/camel-mh-folder.h
@@ -21,7 +21,7 @@
*/
#ifndef CAMEL_MH_FOLDER_H
-#define CAMEL_MH_FOLDER_H 1
+#define CAMEL_MH_FOLDER_H
#include "camel-local-folder.h"
diff --git a/camel/providers/local/camel-mh-store.c b/camel/providers/local/camel-mh-store.c
index 7d2a6b1..22d9597 100644
--- a/camel/providers/local/camel-mh-store.c
+++ b/camel/providers/local/camel-mh-store.c
@@ -31,12 +31,6 @@
#include <glib/gi18n-lib.h>
-#include "camel-exception.h"
-#include "camel-private.h"
-#include "camel-stream-buffer.h"
-#include "camel-stream-fs.h"
-#include "camel-url.h"
-
#include "camel-mh-folder.h"
#include "camel-mh-store.h"
#include "camel-mh-summary.h"
diff --git a/camel/providers/local/camel-mh-store.h b/camel/providers/local/camel-mh-store.h
index d86ba55..54372b4 100644
--- a/camel/providers/local/camel-mh-store.h
+++ b/camel/providers/local/camel-mh-store.h
@@ -20,7 +20,7 @@
*/
#ifndef CAMEL_MH_STORE_H
-#define CAMEL_MH_STORE_H 1
+#define CAMEL_MH_STORE_H
#include "camel-local-store.h"
diff --git a/camel/providers/local/camel-mh-summary.c b/camel/providers/local/camel-mh-summary.c
index 2150bc2..4b4c9e0 100644
--- a/camel/providers/local/camel-mh-summary.c
+++ b/camel/providers/local/camel-mh-summary.c
@@ -34,10 +34,7 @@
#include <glib/gi18n-lib.h>
-#include "camel-db.h"
-#include "camel-store.h"
-#include "camel-mime-message.h"
-#include "camel-private.h"
+#include <camel/camel-private.h>
#include "camel-mh-summary.h"
#include "camel-local-private.h"
diff --git a/camel/providers/local/camel-mh-summary.h b/camel/providers/local/camel-mh-summary.h
index 9b82734..b778a73 100644
--- a/camel/providers/local/camel-mh-summary.h
+++ b/camel/providers/local/camel-mh-summary.h
@@ -18,13 +18,10 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_MH_SUMMARY_H
-#define _CAMEL_MH_SUMMARY_H
+#ifndef CAMEL_MH_SUMMARY_H
+#define CAMEL_MH_SUMMARY_H
#include "camel-local-summary.h"
-#include <camel/camel-folder.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-index.h>
#define CAMEL_MH_SUMMARY(obj) CAMEL_CHECK_CAST (obj, camel_mh_summary_get_type (), CamelMhSummary)
#define CAMEL_MH_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mh_summary_get_type (), CamelMhSummaryClass)
@@ -53,4 +50,4 @@ CamelMhSummary *camel_mh_summary_new(struct _CamelFolder *, const gchar *filenam
G_END_DECLS
-#endif /* _CAMEL_MH_SUMMARY_H */
+#endif /* CAMEL_MH_SUMMARY_H */
diff --git a/camel/providers/local/camel-spool-folder.c b/camel/providers/local/camel-spool-folder.c
index 0c28410..1e9b3a3 100644
--- a/camel/providers/local/camel-spool-folder.c
+++ b/camel/providers/local/camel-spool-folder.c
@@ -34,17 +34,6 @@
#include <glib/gi18n-lib.h>
-#include "camel-data-wrapper.h"
-#include "camel-exception.h"
-#include "camel-file-utils.h"
-#include "camel-local-private.h"
-#include "camel-lock-client.h"
-#include "camel-mime-filter-from.h"
-#include "camel-mime-message.h"
-#include "camel-session.h"
-#include "camel-stream-filter.h"
-#include "camel-stream-fs.h"
-
#include "camel-spool-folder.h"
#include "camel-spool-store.h"
#include "camel-spool-summary.h"
diff --git a/camel/providers/local/camel-spool-folder.h b/camel/providers/local/camel-spool-folder.h
index ce057b8..1b85078 100644
--- a/camel/providers/local/camel-spool-folder.h
+++ b/camel/providers/local/camel-spool-folder.h
@@ -20,13 +20,10 @@
*/
#ifndef CAMEL_SPOOL_FOLDER_H
-#define CAMEL_SPOOL_FOLDER_H 1
+#define CAMEL_SPOOL_FOLDER_H
#include "camel-mbox-folder.h"
-#include <camel/camel-folder-search.h>
-#include <camel/camel-index.h>
#include "camel-spool-summary.h"
-#include "camel-lock.h"
/* #include "camel-store.h" */
diff --git a/camel/providers/local/camel-spool-store.c b/camel/providers/local/camel-spool-store.c
index d82a031..53f8d80 100644
--- a/camel/providers/local/camel-spool-store.c
+++ b/camel/providers/local/camel-spool-store.c
@@ -38,12 +38,6 @@
#include <glib/gi18n-lib.h>
-#include "camel-exception.h"
-#include "camel-file-utils.h"
-#include "camel-private.h"
-#include "camel-session.h"
-#include "camel-url.h"
-
#include "camel-spool-folder.h"
#include "camel-spool-store.h"
diff --git a/camel/providers/local/camel-spool-store.h b/camel/providers/local/camel-spool-store.h
index d56c937..768d705 100644
--- a/camel/providers/local/camel-spool-store.h
+++ b/camel/providers/local/camel-spool-store.h
@@ -20,7 +20,7 @@
*/
#ifndef CAMEL_SPOOL_STORE_H
-#define CAMEL_SPOOL_STORE_H 1
+#define CAMEL_SPOOL_STORE_H
#include "camel-mbox-store.h"
diff --git a/camel/providers/local/camel-spool-summary.c b/camel/providers/local/camel-spool-summary.c
index e774ee9..2df96c9 100644
--- a/camel/providers/local/camel-spool-summary.c
+++ b/camel/providers/local/camel-spool-summary.c
@@ -34,12 +34,6 @@
#include <glib/gi18n-lib.h>
-#include "camel-db.h"
-#include "camel-file-utils.h"
-#include "camel-mime-message.h"
-#include "camel-operation.h"
-#include "camel-store.h"
-
#include "camel-spool-summary.h"
#include "camel-local-private.h"
diff --git a/camel/providers/local/camel-spool-summary.h b/camel/providers/local/camel-spool-summary.h
index 2cae902..b5c4d63 100644
--- a/camel/providers/local/camel-spool-summary.h
+++ b/camel/providers/local/camel-spool-summary.h
@@ -18,13 +18,11 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_SPOOL_SUMMARY_H
-#define _CAMEL_SPOOL_SUMMARY_H
+#ifndef CAMEL_SPOOL_SUMMARY_H
+#define CAMEL_SPOOL_SUMMARY_H
+
+#include <camel/camel.h>
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-index.h>
#include "camel-mbox-summary.h"
#define CAMEL_SPOOL_SUMMARY(obj) CAMEL_CHECK_CAST (obj, camel_spool_summary_get_type (), CamelSpoolSummary)
@@ -69,4 +67,4 @@ gint camel_spool_summary_write_headers(gint fd, struct _camel_header_raw *header
G_END_DECLS
-#endif /* _CAMEL_SPOOL_SUMMARY_H */
+#endif /* CAMEL_SPOOL_SUMMARY_H */
diff --git a/camel/providers/nntp/camel-nntp-auth.c b/camel/providers/nntp/camel-nntp-auth.c
index f015f09..c11321c 100644
--- a/camel/providers/nntp/camel-nntp-auth.c
+++ b/camel/providers/nntp/camel-nntp-auth.c
@@ -26,9 +26,6 @@
#include <string.h>
-#include "camel-exception.h"
-#include "camel-session.h"
-
#include "camel-nntp-auth.h"
#include "camel-nntp-store.h"
#include "camel-nntp-resp-codes.h"
diff --git a/camel/providers/nntp/camel-nntp-auth.h b/camel/providers/nntp/camel-nntp-auth.h
index 4958fa3..c74869a 100644
--- a/camel/providers/nntp/camel-nntp-auth.h
+++ b/camel/providers/nntp/camel-nntp-auth.h
@@ -23,9 +23,9 @@
*/
#ifndef CAMEL_NNTP_AUTH_H
-#define CAMEL_NNTP_AUTH_H 1
+#define CAMEL_NNTP_AUTH_H
-#include <camel-nntp-store.h>
+#include "camel-nntp-store.h"
G_BEGIN_DECLS
diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index b20ccff..a304ae4 100644
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -33,21 +33,7 @@
#include <glib/gi18n-lib.h>
-#include "camel/camel-data-cache.h"
-#include "camel/camel-data-wrapper.h"
-#include "camel/camel-exception.h"
-#include "camel/camel-file-utils.h"
-#include "camel/camel-folder-search.h"
-#include "camel/camel-mime-filter-crlf.h"
-#include "camel/camel-mime-message.h"
-#include "camel/camel-mime-message.h"
-#include "camel/camel-mime-part.h"
-#include "camel/camel-multipart.h"
-#include "camel/camel-private.h"
-#include "camel/camel-session.h"
-#include "camel/camel-stream-buffer.h"
-#include "camel/camel-stream-filter.h"
-#include "camel/camel-stream-mem.h"
+#include <camel/camel-private.h>
#include "camel-nntp-folder.h"
#include "camel-nntp-private.h"
diff --git a/camel/providers/nntp/camel-nntp-folder.h b/camel/providers/nntp/camel-nntp-folder.h
index 7d43231..3e1cade 100644
--- a/camel/providers/nntp/camel-nntp-folder.h
+++ b/camel/providers/nntp/camel-nntp-folder.h
@@ -23,10 +23,9 @@
*/
#ifndef CAMEL_NNTP_FOLDER_H
-#define CAMEL_NNTP_FOLDER_H 1
+#define CAMEL_NNTP_FOLDER_H
-#include "camel/camel-folder.h"
-#include "camel/camel-disco-folder.h"
+#include <camel/camel.h>
/* #include "camel-store.h" */
diff --git a/camel/providers/nntp/camel-nntp-grouplist.c b/camel/providers/nntp/camel-nntp-grouplist.c
index c74bae4..e1590e0 100644
--- a/camel/providers/nntp/camel-nntp-grouplist.c
+++ b/camel/providers/nntp/camel-nntp-grouplist.c
@@ -31,8 +31,6 @@
#include <glib.h>
#include <glib/gstdio.h>
-#include "camel-exception.h"
-
#include "camel-nntp-grouplist.h"
#include "camel-nntp-resp-codes.h"
diff --git a/camel/providers/nntp/camel-nntp-grouplist.h b/camel/providers/nntp/camel-nntp-grouplist.h
index 036b135..b1e5997 100644
--- a/camel/providers/nntp/camel-nntp-grouplist.h
+++ b/camel/providers/nntp/camel-nntp-grouplist.h
@@ -22,7 +22,7 @@
*/
#ifndef CAMEL_NNTP_GROUPLIST_H
-#define CAMEL_NNTP_GROUPLIST_H 1
+#define CAMEL_NNTP_GROUPLIST_H
#include <time.h>
#include "camel-nntp-store.h"
diff --git a/camel/providers/nntp/camel-nntp-newsrc.c b/camel/providers/nntp/camel-nntp-newsrc.c
index 05281a8..0167ea4 100644
--- a/camel/providers/nntp/camel-nntp-newsrc.c
+++ b/camel/providers/nntp/camel-nntp-newsrc.c
@@ -35,8 +35,6 @@
#include <glib.h>
#include <glib/gstdio.h>
-#include "camel-folder-summary.h"
-
#include "camel-nntp-newsrc.h"
#define NEWSRC_LOCK(f, l) (g_mutex_lock(((CamelNNTPNewsrc *)f)->l))
diff --git a/camel/providers/nntp/camel-nntp-newsrc.h b/camel/providers/nntp/camel-nntp-newsrc.h
index 3160b7f..16093d3 100644
--- a/camel/providers/nntp/camel-nntp-newsrc.h
+++ b/camel/providers/nntp/camel-nntp-newsrc.h
@@ -1,6 +1,6 @@
-#ifndef _CAMEL_NNTP_NEWSRC_H_
-#define _CAMEL_NNTP_NEWSRC_H_
+#ifndef CAMEL_NNTP_NEWSRC_H
+#define CAMEL_NNTP_NEWSRC_H
#include <stdio.h>
#include "glib.h"
@@ -33,4 +33,4 @@ CamelNNTPNewsrc *camel_nntp_newsrc_read_for_server (const gchar *serv
G_END_DECLS
-#endif /* _CAMEL_NNTP_NEWSRC_H_ */
+#endif /* CAMEL_NNTP_NEWSRC_H */
diff --git a/camel/providers/nntp/camel-nntp-private.h b/camel/providers/nntp/camel-nntp-private.h
index e60daf9..a4d8744 100644
--- a/camel/providers/nntp/camel-nntp-private.h
+++ b/camel/providers/nntp/camel-nntp-private.h
@@ -21,7 +21,7 @@
*/
#ifndef CAMEL_NNTP_PRIVATE_H
-#define CAMEL_NNTP_PRIVATE_H 1
+#define CAMEL_NNTP_PRIVATE_H
/* need a way to configure and save this data, if this header is to
be installed. For now, dont install it */
diff --git a/camel/providers/nntp/camel-nntp-provider.c b/camel/providers/nntp/camel-nntp-provider.c
index be8e29e..09efcb4 100644
--- a/camel/providers/nntp/camel-nntp-provider.c
+++ b/camel/providers/nntp/camel-nntp-provider.c
@@ -31,8 +31,6 @@
#include <glib/gi18n-lib.h>
#include "camel-nntp-store.h"
-#include "camel-provider.h"
-#include "camel-session.h"
static void add_hash (guint *hash, gchar *s);
static guint nntp_url_hash (gconstpointer key);
diff --git a/camel/providers/nntp/camel-nntp-resp-codes.h b/camel/providers/nntp/camel-nntp-resp-codes.h
index d1beb81..1cfe517 100644
--- a/camel/providers/nntp/camel-nntp-resp-codes.h
+++ b/camel/providers/nntp/camel-nntp-resp-codes.h
@@ -21,7 +21,7 @@
*/
#ifndef CAMEL_NNTP_RESP_CODES_H
-#define CAMEL_NNTP_RESP_CODES_H 1
+#define CAMEL_NNTP_RESP_CODES_H
#define CAMEL_NNTP_OK(x) ((x) < 400)
#define CAMEL_NNTP_ERR(x) (!CAMEL_NNTP_OK(x) && (x) < 500)
diff --git a/camel/providers/nntp/camel-nntp-store-summary.c b/camel/providers/nntp/camel-nntp-store-summary.c
index 5fc5757..1d5a806 100644
--- a/camel/providers/nntp/camel-nntp-store-summary.c
+++ b/camel/providers/nntp/camel-nntp-store-summary.c
@@ -29,9 +29,7 @@
#include <string.h>
#include <unistd.h>
-#include "camel-file-utils.h"
-#include "camel-private.h"
-#include "camel-utf8.h"
+#include <camel/camel-private.h>
#include "camel-nntp-store-summary.h"
diff --git a/camel/providers/nntp/camel-nntp-store-summary.h b/camel/providers/nntp/camel-nntp-store-summary.h
index 10725f5..26be244 100644
--- a/camel/providers/nntp/camel-nntp-store-summary.h
+++ b/camel/providers/nntp/camel-nntp-store-summary.h
@@ -21,11 +21,10 @@
/* currently, this is just a straigt s/imap/nntp from the IMAP file*/
-#ifndef _CAMEL_NNTP_STORE_SUMMARY_H
-#define _CAMEL_NNTP_STORE_SUMMARY_H
+#ifndef CAMEL_NNTP_STORE_SUMMARY_H
+#define CAMEL_NNTP_STORE_SUMMARY_H
-#include <camel/camel-object.h>
-#include <camel/camel-store-summary.h>
+#include <camel/camel.h>
#define CAMEL_NNTP_STORE_SUMMARY(obj) CAMEL_CHECK_CAST (obj, camel_nntp_store_summary_get_type (), CamelNNTPStoreSummary)
#define CAMEL_NNTP_STORE_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_nntp_store_summary_get_type (), CamelNNTPStoreSummaryClass)
@@ -92,4 +91,4 @@ gchar *camel_nntp_store_summary_full_from_path(CamelNNTPStoreSummary *s, const g
G_END_DECLS
-#endif /* _CAMEL_NNTP_STORE_SUMMARY_H */
+#endif /* CAMEL_NNTP_STORE_SUMMARY_H */
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index 6e20bff..9dcde39 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -34,18 +34,7 @@
#include <glib/gi18n-lib.h>
-#include "camel/camel-data-cache.h"
-#include "camel/camel-debug.h"
-#include "camel/camel-disco-diary.h"
-#include "camel/camel-disco-store.h"
-#include "camel/camel-net-utils.h"
-#include "camel/camel-private.h"
-#include "camel/camel-session.h"
-#include "camel/camel-stream-mem.h"
-#include "camel/camel-string-utils.h"
-#include "camel/camel-tcp-stream-raw.h"
-#include "camel/camel-tcp-stream-ssl.h"
-#include "camel/camel-url.h"
+#include <camel/camel-private.h>
#include "camel-nntp-summary.h"
#include "camel-nntp-store.h"
diff --git a/camel/providers/nntp/camel-nntp-store.h b/camel/providers/nntp/camel-nntp-store.h
index 73ec19f..100b33a 100644
--- a/camel/providers/nntp/camel-nntp-store.h
+++ b/camel/providers/nntp/camel-nntp-store.h
@@ -21,9 +21,9 @@
*/
#ifndef CAMEL_NNTP_STORE_H
-#define CAMEL_NNTP_STORE_H 1
+#define CAMEL_NNTP_STORE_H
-#include <camel/camel-disco-store.h>
+#include <camel/camel.h>
#include "camel-nntp-stream.h"
#include "camel-nntp-store-summary.h"
diff --git a/camel/providers/nntp/camel-nntp-stream.c b/camel/providers/nntp/camel-nntp-stream.c
index 4f2ade1..5a4d47e 100644
--- a/camel/providers/nntp/camel-nntp-stream.c
+++ b/camel/providers/nntp/camel-nntp-stream.c
@@ -30,8 +30,6 @@
#include <glib.h>
-#include "camel-debug.h"
-
#include "camel-nntp-stream.h"
#define dd(x) (camel_debug("nntp:stream";)?(x):0)
diff --git a/camel/providers/nntp/camel-nntp-stream.h b/camel/providers/nntp/camel-nntp-stream.h
index 0014211..6058600 100644
--- a/camel/providers/nntp/camel-nntp-stream.h
+++ b/camel/providers/nntp/camel-nntp-stream.h
@@ -18,10 +18,10 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_NNTP_STREAM_H
-#define _CAMEL_NNTP_STREAM_H
+#ifndef CAMEL_NNTP_STREAM_H
+#define CAMEL_NNTP_STREAM_H
-#include <camel/camel-stream.h>
+#include <camel/camel.h>
#define CAMEL_NNTP_STREAM(obj) CAMEL_CHECK_CAST (obj, camel_nntp_stream_get_type (), CamelNNTPStream)
#define CAMEL_NNTP_STREAM_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_nntp_stream_get_type (), CamelNNTPStreamClass)
@@ -66,4 +66,4 @@ gint camel_nntp_stream_getd (CamelNNTPStream *is, guchar **start, guint *len)
G_END_DECLS
-#endif /* _CAMEL_NNTP_STREAM_H */
+#endif /* CAMEL_NNTP_STREAM_H */
diff --git a/camel/providers/nntp/camel-nntp-summary.c b/camel/providers/nntp/camel-nntp-summary.c
index fbbb3c9..063eb52 100644
--- a/camel/providers/nntp/camel-nntp-summary.c
+++ b/camel/providers/nntp/camel-nntp-summary.c
@@ -32,19 +32,10 @@
#include <glib/gi18n-lib.h>
-#include "camel/camel-data-cache.h"
-#include "camel/camel-db.h"
-#include "camel/camel-debug.h"
-#include "camel/camel-file-utils.h"
-#include "camel/camel-mime-message.h"
-#include "camel/camel-operation.h"
-#include "camel/camel-stream-null.h"
-
#include "camel-nntp-folder.h"
#include "camel-nntp-store.h"
#include "camel-nntp-stream.h"
#include "camel-nntp-summary.h"
-#include "camel-string-utils.h"
#define w(x)
#define io(x)
diff --git a/camel/providers/nntp/camel-nntp-summary.h b/camel/providers/nntp/camel-nntp-summary.h
index 606e861..6c0333c 100644
--- a/camel/providers/nntp/camel-nntp-summary.h
+++ b/camel/providers/nntp/camel-nntp-summary.h
@@ -18,10 +18,10 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_NNTP_SUMMARY_H
-#define _CAMEL_NNTP_SUMMARY_H
+#ifndef CAMEL_NNTP_SUMMARY_H
+#define CAMEL_NNTP_SUMMARY_H
-#include <camel/camel-folder-summary.h>
+#include <camel/camel.h>
#define CAMEL_NNTP_SUMMARY(obj) CAMEL_CHECK_CAST (obj, camel_nntp_summary_get_type (), CamelNNTPSummary)
#define CAMEL_NNTP_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_nntp_summary_get_type (), CamelNNTPSummaryClass)
@@ -56,5 +56,5 @@ gint camel_nntp_summary_check(CamelNNTPSummary *cns, struct _CamelNNTPStore *sto
G_END_DECLS
-#endif /* _CAMEL_NNTP_SUMMARY_H */
+#endif /* CAMEL_NNTP_SUMMARY_H */
diff --git a/camel/providers/nntp/camel-nntp-types.h b/camel/providers/nntp/camel-nntp-types.h
index c7b3352..b31eb0d 100644
--- a/camel/providers/nntp/camel-nntp-types.h
+++ b/camel/providers/nntp/camel-nntp-types.h
@@ -22,7 +22,7 @@
*/
#ifndef CAMEL_NNTP_TYPES_H
-#define CAMEL_NNTP_TYPES_H 1
+#define CAMEL_NNTP_TYPES_H
G_BEGIN_DECLS
diff --git a/camel/providers/nntp/camel-nntp-utils.c b/camel/providers/nntp/camel-nntp-utils.c
index f524c6f..3a307de 100644
--- a/camel/providers/nntp/camel-nntp-utils.c
+++ b/camel/providers/nntp/camel-nntp-utils.c
@@ -24,10 +24,6 @@
#include <stdlib.h>
#include <string.h>
-#include "camel-folder-summary.h"
-#include "camel-stream-mem.h"
-#include "camel-exception.h"
-
#include "camel-nntp-resp-codes.h"
#include "camel-nntp-folder.h"
#include "camel-nntp-store.h"
diff --git a/camel/providers/nntp/camel-nntp-utils.h b/camel/providers/nntp/camel-nntp-utils.h
index fca72dd..986b3a5 100644
--- a/camel/providers/nntp/camel-nntp-utils.h
+++ b/camel/providers/nntp/camel-nntp-utils.h
@@ -23,7 +23,7 @@
*/
#ifndef CAMEL_NNTP_UTILS_H
-#define CAMEL_NNTP_UTILS_H 1
+#define CAMEL_NNTP_UTILS_H
G_BEGIN_DECLS
diff --git a/camel/providers/pop3/camel-pop3-engine.c b/camel/providers/pop3/camel-pop3-engine.c
index 1888c14..bb73ee8 100644
--- a/camel/providers/pop3/camel-pop3-engine.c
+++ b/camel/providers/pop3/camel-pop3-engine.c
@@ -31,10 +31,10 @@
#include <glib.h>
#include <glib/gi18n-lib.h>
+#include <camel/camel-private.h>
+
#include "camel-pop3-engine.h"
#include "camel-pop3-stream.h"
-#include "camel-sasl.h"
-#include "camel-service.h"
/* max 'outstanding' bytes in output stream, so we can't deadlock waiting
for the server to accept our data when pipelining */
@@ -43,7 +43,6 @@
extern CamelServiceAuthType camel_pop3_password_authtype;
extern CamelServiceAuthType camel_pop3_apop_authtype;
-extern gint camel_verbose_debug;
#define dd(x) (camel_verbose_debug?(x):0)
static void get_capabilities(CamelPOP3Engine *pe);
diff --git a/camel/providers/pop3/camel-pop3-engine.h b/camel/providers/pop3/camel-pop3-engine.h
index 8ebd465..e450c27 100644
--- a/camel/providers/pop3/camel-pop3-engine.h
+++ b/camel/providers/pop3/camel-pop3-engine.h
@@ -18,11 +18,11 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _CAMEL_POP3_ENGINE_H
-#define _CAMEL_POP3_ENGINE_H
+#ifndef CAMEL_POP3_ENGINE_H
+#define CAMEL_POP3_ENGINE_H
+
+#include <camel/camel.h>
-#include <camel/camel-object.h>
-#include <camel/camel-list-utils.h>
#include "camel-pop3-stream.h"
#define CAMEL_POP3_ENGINE(obj) CAMEL_CHECK_CAST (obj, camel_pop3_engine_get_type (), CamelPOP3Engine)
@@ -135,4 +135,4 @@ CamelPOP3Command *camel_pop3_engine_command_new (CamelPOP3Engine *pe, guint32 fl
G_END_DECLS
-#endif /* _CAMEL_POP3_ENGINE_H */
+#endif /* CAMEL_POP3_ENGINE_H */
diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index da2b588..733d89d 100644
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.c
@@ -33,14 +33,8 @@
#include <glib/gi18n-lib.h>
-#include "camel-data-cache.h"
-#include "camel-exception.h"
-#include "camel-mime-message.h"
-#include "camel-operation.h"
#include "camel-pop3-folder.h"
#include "camel-pop3-store.h"
-#include "camel-stream-filter.h"
-#include "camel-stream-mem.h"
#define d(x)
diff --git a/camel/providers/pop3/camel-pop3-folder.h b/camel/providers/pop3/camel-pop3-folder.h
index 16fde5c..fadddea 100644
--- a/camel/providers/pop3/camel-pop3-folder.h
+++ b/camel/providers/pop3/camel-pop3-folder.h
@@ -24,9 +24,9 @@
*/
#ifndef CAMEL_POP3_FOLDER_H
-#define CAMEL_POP3_FOLDER_H 1
+#define CAMEL_POP3_FOLDER_H
-#include "camel-folder.h"
+#include <camel/camel.h>
#define CAMEL_POP3_FOLDER_TYPE (camel_pop3_folder_get_type ())
#define CAMEL_POP3_FOLDER(obj) (CAMEL_CHECK_CAST((obj), CAMEL_POP3_FOLDER_TYPE, CamelPOP3Folder))
diff --git a/camel/providers/pop3/camel-pop3-provider.c b/camel/providers/pop3/camel-pop3-provider.c
index 379ae52..1ca578c 100644
--- a/camel/providers/pop3/camel-pop3-provider.c
+++ b/camel/providers/pop3/camel-pop3-provider.c
@@ -30,10 +30,6 @@
#include <glib/gi18n-lib.h>
#include "camel-pop3-store.h"
-#include "camel-provider.h"
-#include "camel-sasl.h"
-#include "camel-session.h"
-#include "camel-url.h"
static guint pop3_url_hash (gconstpointer key);
static gint pop3_url_equal (gconstpointer a, gconstpointer b);
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index 367e4dc..d7927a3 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -37,24 +37,8 @@
#include <glib/gi18n-lib.h>
-#include "camel-data-cache.h"
-#include "camel-exception.h"
-#include "camel-net-utils.h"
-#include "camel-operation.h"
-#include "camel-pop3-engine.h"
#include "camel-pop3-folder.h"
#include "camel-pop3-store.h"
-#include "camel-sasl.h"
-#include "camel-session.h"
-#include "camel-stream-buffer.h"
-#include "camel-tcp-stream-raw.h"
-#include "camel-tcp-stream.h"
-#include "camel-url.h"
-#include "camel-utf8.h"
-
-#ifdef HAVE_SSL
-#include "camel-tcp-stream-ssl.h"
-#endif
/* Specified in RFC 1939 */
#define POP3_PORT "110"
diff --git a/camel/providers/pop3/camel-pop3-store.h b/camel/providers/pop3/camel-pop3-store.h
index 3fa141f..a61e974 100644
--- a/camel/providers/pop3/camel-pop3-store.h
+++ b/camel/providers/pop3/camel-pop3-store.h
@@ -24,10 +24,10 @@
*/
#ifndef CAMEL_POP3_STORE_H
-#define CAMEL_POP3_STORE_H 1
+#define CAMEL_POP3_STORE_H
+
+#include <camel/camel.h>
-#include <camel/camel-types.h>
-#include <camel/camel-store.h>
#include "camel-pop3-engine.h"
#define CAMEL_POP3_STORE_TYPE (camel_pop3_store_get_type ())
diff --git a/camel/providers/pop3/camel-pop3-stream.h b/camel/providers/pop3/camel-pop3-stream.h
index 52511f9..faddc9f 100644
--- a/camel/providers/pop3/camel-pop3-stream.h
+++ b/camel/providers/pop3/camel-pop3-stream.h
@@ -21,10 +21,10 @@
/* This is *identical* to the camel-nntp-stream, so should probably
work out a way to merge them */
-#ifndef _CAMEL_POP3_STREAM_H
-#define _CAMEL_POP3_STREAM_H
+#ifndef CAMEL_POP3_STREAM_H
+#define CAMEL_POP3_STREAM_H
-#include <camel/camel-stream.h>
+#include <camel/camel.h>
#define CAMEL_POP3_STREAM(obj) CAMEL_CHECK_CAST (obj, camel_pop3_stream_get_type (), CamelPOP3Stream)
#define CAMEL_POP3_STREAM_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_pop3_stream_get_type (), CamelPOP3StreamClass)
@@ -69,4 +69,4 @@ gint camel_pop3_stream_getd (CamelPOP3Stream *is, guchar **start, guint *len)
G_END_DECLS
-#endif /* _CAMEL_POP3_STREAM_H */
+#endif /* CAMEL_POP3_STREAM_H */
diff --git a/camel/providers/sendmail/camel-sendmail-provider.c b/camel/providers/sendmail/camel-sendmail-provider.c
index 9858e70..766546d 100644
--- a/camel/providers/sendmail/camel-sendmail-provider.c
+++ b/camel/providers/sendmail/camel-sendmail-provider.c
@@ -26,12 +26,10 @@
#include <config.h>
#endif
+#include <camel/camel.h>
#include <glib/gi18n-lib.h>
-#include "camel-provider.h"
#include "camel-sendmail-transport.h"
-#include "camel-session.h"
-#include "camel-url.h"
static CamelProvider sendmail_provider = {
"sendmail",
diff --git a/camel/providers/sendmail/camel-sendmail-transport.c b/camel/providers/sendmail/camel-sendmail-transport.c
index 7038f7c..7600444 100644
--- a/camel/providers/sendmail/camel-sendmail-transport.c
+++ b/camel/providers/sendmail/camel-sendmail-transport.c
@@ -35,13 +35,7 @@
#include <glib/gi18n-lib.h>
-#include "camel-data-wrapper.h"
-#include "camel-exception.h"
-#include "camel-mime-filter-crlf.h"
-#include "camel-mime-message.h"
#include "camel-sendmail-transport.h"
-#include "camel-stream-filter.h"
-#include "camel-stream-fs.h"
static gchar *get_name (CamelService *service, gboolean brief);
diff --git a/camel/providers/sendmail/camel-sendmail-transport.h b/camel/providers/sendmail/camel-sendmail-transport.h
index 0f963d2..872d33f 100644
--- a/camel/providers/sendmail/camel-sendmail-transport.h
+++ b/camel/providers/sendmail/camel-sendmail-transport.h
@@ -24,9 +24,9 @@
*/
#ifndef CAMEL_SENDMAIL_TRANSPORT_H
-#define CAMEL_SENDMAIL_TRANSPORT_H 1
+#define CAMEL_SENDMAIL_TRANSPORT_H
-#include "camel-transport.h"
+#include <camel/camel.h>
#define CAMEL_SENDMAIL_TRANSPORT_TYPE (camel_sendmail_transport_get_type ())
#define CAMEL_SENDMAIL_TRANSPORT(obj) (CAMEL_CHECK_CAST((obj), CAMEL_SENDMAIL_TRANSPORT_TYPE, CamelSendmailTransport))
diff --git a/camel/providers/smtp/camel-smtp-provider.c b/camel/providers/smtp/camel-smtp-provider.c
index 1daec9c..0136828 100644
--- a/camel/providers/smtp/camel-smtp-provider.c
+++ b/camel/providers/smtp/camel-smtp-provider.c
@@ -25,13 +25,10 @@
#include <config.h>
#endif
+#include <camel/camel.h>
#include <glib/gi18n-lib.h>
-#include "camel-provider.h"
-#include "camel-sasl.h"
-#include "camel-session.h"
#include "camel-smtp-transport.h"
-#include "camel-url.h"
static guint smtp_url_hash (gconstpointer key);
static gint smtp_url_equal (gconstpointer a, gconstpointer b);
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index 41d398b..5022483 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -36,31 +36,13 @@
#include <glib/gi18n-lib.h>
-#undef MIN
-#undef MAX
+#include <camel/camel-private.h>
-#include "camel-exception.h"
-#include "camel-mime-filter-progress.h"
-#include "camel-mime-filter-crlf.h"
-#include "camel-mime-message.h"
-#include "camel-mime-part.h"
-#include "camel-multipart.h"
-#include "camel-net-utils.h"
-#include "camel-operation.h"
-#include "camel-sasl.h"
-#include "camel-session.h"
#include "camel-smtp-transport.h"
-#include "camel-stream-buffer.h"
-#include "camel-stream-filter.h"
-#include "camel-stream-null.h"
-#include "camel-tcp-stream-raw.h"
-#include "camel-tcp-stream.h"
-#ifdef HAVE_SSL
-#include "camel-tcp-stream-ssl.h"
-#endif
+#undef MIN
+#undef MAX
-extern gint camel_verbose_debug;
#define d(x) (camel_verbose_debug ? (x) : 0)
/* Specified in RFC 821 */
diff --git a/camel/providers/smtp/camel-smtp-transport.h b/camel/providers/smtp/camel-smtp-transport.h
index 1390f26..cab550f 100644
--- a/camel/providers/smtp/camel-smtp-transport.h
+++ b/camel/providers/smtp/camel-smtp-transport.h
@@ -23,10 +23,9 @@
*/
#ifndef CAMEL_SMTP_TRANSPORT_H
-#define CAMEL_SMTP_TRANSPORT_H 1
+#define CAMEL_SMTP_TRANSPORT_H
-#include "camel-transport.h"
-#include "camel-tcp-stream.h"
+#include <camel/camel.h>
#define CAMEL_SMTP_TRANSPORT_TYPE (camel_smtp_transport_get_type ())
#define CAMEL_SMTP_TRANSPORT(obj) (CAMEL_CHECK_CAST((obj), CAMEL_SMTP_TRANSPORT_TYPE, CamelSmtpTransport))
diff --git a/camel/tests/lib/camel-test-provider.h b/camel/tests/lib/camel-test-provider.h
index f9f19ba..2ab7ba1 100644
--- a/camel/tests/lib/camel-test-provider.h
+++ b/camel/tests/lib/camel-test-provider.h
@@ -1,6 +1,6 @@
-#ifndef _CAMEL_TEST_PROVIDER_H
-#define _CAMEL_TEST_PROVIDER_H
+#ifndef CAMEL_TEST_PROVIDER_H
+#define CAMEL_TEST_PROVIDER_H
#include <glib.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
