2005-12-01 Tor Lillqvist <tml@novell.com>
+ * camel-index.c
+ * camel-mime-filter-basic.c
+ * camel-mime-filter-charset.c
+ * camel-mime-filter-from.c
+ * camel-mime-filter-index.c
+ * camel-mime-filter-windows.c
+ * camel-mime-filter.c
+ * camel-mime-part-utils.c
+ * camel-multipart-encrypted.c
+ * camel-multipart-signed.c
+ * camel-multipart.c
+ * camel-offline-folder.c
+ * camel-offline-store.c
+ * camel-operation.c
+ * camel-sasl-anonymous.c
+ * camel-sasl-cram-md5.c
+ * camel-sasl-digest-md5.c
+ * camel-sasl-kerberos4.c
+ * camel-sasl-login.c
+ * camel-sasl-ntlm.c
+ * camel-sasl-plain.c
+ * camel-sasl.c
+ * camel-search-private.c
+ * camel-service.c
+ * camel-smime-context.c
+ * camel-store.c
+ * camel-stream-buffer.c
+ * camel-stream-filter.c
+ * camel-stream-process.c
+ * camel-stream.c
+ * camel-transport.c
+ * camel-url-scanner.c
+ * camel-vee-folder.c
+ * camel-vee-summary.c
+ * camel-vtrash-folder.c
+ * camel.c: Unify header inclusion order and style purely for
+ cosmetic reasons.
+
* camel-private.h: If building against a GLib older than 2.8, map
those gstdio wrappers that were introduced only in 2.8 to their
normal counterparts here. (When building for Win32, we require
#include <stdlib.h>
#include "camel-index.h"
-#include "camel/camel-object.h"
+#include "camel-object.h"
#define w(x)
#define io(x)
* Boston, MA 02111-1307, USA.
*/
-#include "camel-mime-filter-basic.h"
+#include <string.h>
+#include "camel-mime-filter-basic.h"
#include "camel-mime-utils.h"
-#include <string.h>
static void reset(CamelMimeFilter *mf);
static void complete(CamelMimeFilter *mf, char *in, size_t len,
#include <string.h>
#include <errno.h>
-#include <libedataserver/e-iconv.h>
+#include "libedataserver/e-iconv.h"
#include "camel-mime-filter-charset.h"
#include "camel-charset-map.h"
#endif
#include <string.h>
+
#include "camel-mime-filter-from.h"
#define d(x)
*/
#include "camel-mime-filter-index.h"
-
#include "camel-text-index.h"
static void camel_mime_filter_index_class_init (CamelMimeFilterIndexClass *klass);
#include <string.h>
#include <ctype.h>
-#include "camel-mime-filter-windows.h"
-
#include "camel-charset-map.h"
+#include "camel-mime-filter-windows.h"
#define d(x)
#define w(x)
*/
#include <string.h>
+
#include "camel-mime-filter.h"
/*#define MALLOC_CHECK */ /* for some malloc checking, requires mcheck enabled */
#include <ctype.h>
#include <errno.h>
-#include <libedataserver/e-iconv.h>
+#include "libedataserver/e-iconv.h"
#include "camel-charset-map.h"
-#include "camel-mime-part-utils.h"
+#include "camel-html-parser.h"
+#include "camel-mime-filter-basic.h"
+#include "camel-mime-filter-charset.h"
+#include "camel-mime-filter-crlf.h"
+#include "camel-mime-filter-save.h"
#include "camel-mime-message.h"
-#include "camel-multipart.h"
-#include "camel-multipart-signed.h"
+#include "camel-mime-part-utils.h"
#include "camel-multipart-encrypted.h"
+#include "camel-multipart-signed.h"
+#include "camel-multipart.h"
#include "camel-seekable-substream.h"
-#include "camel-stream-fs.h"
#include "camel-stream-filter.h"
+#include "camel-stream-fs.h"
#include "camel-stream-mem.h"
-#include "camel-mime-filter-basic.h"
-#include "camel-mime-filter-charset.h"
-#include "camel-mime-filter-crlf.h"
-#include "camel-mime-filter-save.h"
-#include "camel-html-parser.h"
#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))
#include <stdio.h>*/
#include <stdio.h>
#include <string.h>
-#include "camel-multipart-encrypted.h"
+#include "camel-i18n.h"
#include "camel-mime-filter-crlf.h"
+#include "camel-mime-part.h"
+#include "camel-mime-utils.h"
+#include "camel-multipart-encrypted.h"
#include "camel-stream-filter.h"
-#include "camel-stream-mem.h"
#include "camel-stream-fs.h"
-#include "camel-mime-utils.h"
-#include "camel-mime-part.h"
-#include "camel-i18n.h"
+#include "camel-stream-mem.h"
static void camel_multipart_encrypted_class_init (CamelMultipartEncryptedClass *klass);
static void camel_multipart_encrypted_init (gpointer object, gpointer klass);
#endif
#include <stdio.h>
-
#include <string.h>
#include <unistd.h>
#include <time.h>
-
#include <errno.h>
-#include "camel-mime-part.h"
+#include "libedataserver/md5-utils.h"
+
+#include "camel-exception.h"
+#include "camel-i18n.h"
+#include "camel-mime-filter-canon.h"
+#include "camel-mime-filter-crlf.h"
#include "camel-mime-message.h"
#include "camel-mime-parser.h"
-#include "camel-stream-mem.h"
-#include "camel-multipart-signed.h"
#include "camel-mime-part.h"
-#include "camel-exception.h"
-#include "libedataserver/md5-utils.h"
-
-#include "camel-stream-filter.h"
+#include "camel-mime-part.h"
+#include "camel-multipart-signed.h"
#include "camel-seekable-substream.h"
-#include "camel-mime-filter-crlf.h"
-#include "camel-mime-filter-canon.h"
-#include "camel-i18n.h"
+#include "camel-stream-filter.h"
+#include "camel-stream-mem.h"
#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))
#include <stdio.h>;*/
#include <time.h> /* for time */
#include <errno.h>
+#include "libedataserver/md5-utils.h"
+
#include "camel-stream-mem.h"
#include "camel-multipart.h"
-#include "camel-mime-part.h"
#include "camel-exception.h"
-#include "libedataserver/md5-utils.h"
+#include "camel-mime-part.h"
#define d(x)
#include <config.h>
#endif
-#include <camel/camel-i18n.h>
-#include <camel/camel-service.h>
-#include <camel/camel-session.h>
-#include <camel/camel-operation.h>
-
+#include "camel-i18n.h"
#include "camel-offline-folder.h"
+#include "camel-operation.h"
+#include "camel-service.h"
+#include "camel-session.h"
#define CAMEL_OFFLINE_FOLDER_GET_CLASS(f) (CAMEL_OFFLINE_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS (f)))
#include <config.h>
#endif
-#include <camel/camel-i18n.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-session.h>
-
-#include "camel-offline-store.h"
+#include "camel-folder.h"
+#include "camel-i18n.h"
#include "camel-offline-folder.h"
+#include "camel-offline-store.h"
+#include "camel-session.h"
static void camel_offline_store_class_init (CamelOfflineStoreClass *klass);
#include <nspr.h>
#endif
-#include "camel-operation.h"
#include "libedataserver/e-msgport.h"
+#include "camel-operation.h"
+
#define d(x)
/* ********************************************************************** */
#endif
#include <string.h>
-#include "camel-sasl-anonymous.h"
-#include "camel-internet-address.h"
-#include <string.h>
+
#include "camel-i18n.h"
+#include "camel-internet-address.h"
+#include "camel-sasl-anonymous.h"
CamelServiceAuthType camel_sasl_anonymous_authtype = {
N_("Anonymous"),
#include <stdio.h>
#include <string.h>
-#include "camel-sasl-cram-md5.h"
+
+#include "libedataserver/md5-utils.h"
+
+#include "camel-i18n.h"
#include "camel-mime-utils.h"
+#include "camel-sasl-cram-md5.h"
#include "camel-service.h"
-#include <libedataserver/md5-utils.h>
-#include "camel-i18n.h"
CamelServiceAuthType camel_sasl_cram_md5_authtype = {
N_("CRAM-MD5"),
#include <ctype.h>
#include <unistd.h>
-#include <libedataserver/md5-utils.h>
-
-#include <libedataserver/e-iconv.h>
+#include "libedataserver/e-iconv.h"
+#include "libedataserver/md5-utils.h"
#include "camel-charset-map.h"
-#include "camel-mime-utils.h"
-#include "camel-sasl-digest-md5.h"
#include "camel-i18n.h"
+#include "camel-mime-utils.h"
#include "camel-net-utils.h"
+#include "camel-sasl-digest-md5.h"
#define d(x)
#include <string.h>
#include <netdb.h>
+
#include "camel-i18n.h"
#include "camel-net-utils.h"
-#include "camel-string-utils.h"
#include "camel-sasl-kerberos4.h"
#include "camel-service.h"
+#include "camel-string-utils.h"
CamelServiceAuthType camel_sasl_kerberos4_authtype = {
N_("Kerberos 4"),
#endif
#include <string.h>
+
+#include "camel-i18n.h"
#include "camel-sasl-login.h"
#include "camel-service.h"
-#include "camel-i18n.h"
CamelServiceAuthType camel_sasl_login_authtype = {
N_("Login"),
#include <ctype.h>
#include <string.h>
-#include "camel-sasl-ntlm.h"
#include "camel-i18n.h"
+#include "camel-sasl-ntlm.h"
CamelServiceAuthType camel_sasl_ntlm_authtype = {
N_("NTLM / SPA"),
#endif
#include <string.h>
+
+#include "camel-i18n.h"
#include "camel-sasl-plain.h"
#include "camel-service.h"
-#include "camel-i18n.h"
CamelServiceAuthType camel_sasl_plain_authtype = {
N_("PLAIN"),
#endif
#include <string.h>
-#include "camel-sasl.h"
-#include "camel-mime-utils.h"
-#include "camel-service.h"
+#include "camel-mime-utils.h"
#include "camel-sasl-cram-md5.h"
#include "camel-sasl-digest-md5.h"
#include "camel-sasl-gssapi.h"
#include "camel-sasl-kerberos4.h"
#include "camel-sasl-login.h"
+#include "camel-sasl-ntlm.h"
#include "camel-sasl-plain.h"
#include "camel-sasl-popb4smtp.h"
-#include "camel-sasl-ntlm.h"
+#include "camel-sasl.h"
+#include "camel-service.h"
#define w(x)
#include <config.h>
#endif
-#include <glib.h>
#include <sys/types.h>
#include <regex.h>
#include <string.h>
#include <ctype.h>
#include <stdio.h>
+#include <glib.h>
+
+#include "libedataserver/e-sexp.h"
+
#include "camel-exception.h"
+#include "camel-i18n.h"
#include "camel-mime-message.h"
#include "camel-multipart.h"
-#include "camel-stream-mem.h"
-#include "libedataserver/e-sexp.h"
#include "camel-search-private.h"
-#include "camel-i18n.h"
+#include "camel-stream-mem.h"
-#include <glib/gunicode.h>
#define d(x)
#include "libedataserver/e-msgport.h"
-#include "camel-service.h"
-#include "camel-session.h"
#include "camel-exception.h"
+#include "camel-i18n.h"
#include "camel-operation.h"
#include "camel-private.h"
-#include "camel-i18n.h"
+#include "camel-service.h"
+#include "camel-session.h"
#define d(x)
#define w(x)
#include <errno.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-data-wrapper.h>
-
-#include <camel/camel-mime-part.h>
-#include <camel/camel-multipart-signed.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-mime-filter-basic.h>
-#include <camel/camel-mime-filter-canon.h>
-
-#include "camel-smime-context.h"
-#include "camel-operation.h"
+#include "camel-data-wrapper.h"
+#include "camel-exception.h"
#include "camel-i18n.h"
+#include "camel-mime-filter-basic.h"
+#include "camel-mime-filter-canon.h"
+#include "camel-mime-part.h"
+#include "camel-multipart-signed.h"
+#include "camel-operation.h"
+#include "camel-smime-context.h"
+#include "camel-stream-filter.h"
+#include "camel-stream-fs.h"
+#include "camel-stream-mem.h"
#define d(x)
#include <sys/stat.h>
#include "camel-debug.h"
-
+#include "camel-exception.h"
+#include "camel-folder.h"
+#include "camel-i18n.h"
+#include "camel-private.h"
#include "camel-session.h"
#include "camel-store.h"
-#include "camel-folder.h"
#include "camel-vtrash-folder.h"
-#include "camel-exception.h"
-#include "camel-private.h"
-#include "camel-i18n.h"
#define d(x)
#define w(x)
#include <sys/stat.h>
#include <fcntl.h>
#include <errno.h>
+
#include "camel-stream-buffer.h"
static CamelStreamClass *parent_class = NULL;
#include <stdio.h>
#include <string.h>
+
#include "camel-stream-filter.h"
#define d(x)
#include <fcntl.h>
#include <errno.h>
-#include "camel-stream-process.h"
#include "camel-file-utils.h"
+#include "camel-stream-process.h"
extern int camel_verbose_debug;
#endif
#include <string.h>
+
#include "camel-stream.h"
static CamelObjectClass *parent_class = NULL;
#include <config.h>
#endif
-#include "camel-transport.h"
#include "camel-address.h"
#include "camel-mime-message.h"
#include "camel-private.h"
+#include "camel-transport.h"
static CamelServiceClass *parent_class = NULL;
#include <ctype.h>
#include "libedataserver/e-trie.h"
-#include "camel-utf8.h"
+
#include "camel-url-scanner.h"
+#include "camel-utf8.h"
struct _CamelUrlScanner {
#include <string.h>
-#include "camel-exception.h"
-#include "camel-vee-folder.h"
-#include "camel-store.h"
-#include "camel-mime-message.h"
-#include "camel-folder-search.h"
-#include "camel-vee-summary.h"
-
-#include "camel-session.h"
-#include "camel-vee-store.h" /* for open flags */
-#include "camel-private.h"
-#include "camel-debug.h"
-#include "camel-i18n.h"
-
#include "libedataserver/md5-utils.h"
#if defined (DOEPOOLV) || defined (DOESTRV)
#include "libedataserver/e-memory.h"
#endif
+#include "camel-debug.h"
+#include "camel-exception.h"
+#include "camel-folder-search.h"
+#include "camel-i18n.h"
+#include "camel-mime-message.h"
+#include "camel-private.h"
+#include "camel-session.h"
+#include "camel-store.h"
+#include "camel-vee-folder.h"
+#include "camel-vee-store.h" /* for open flags */
+#include "camel-vee-summary.h"
+
+
#define d(x)
#define dd(x) (camel_debug("vfolder")?(x):0)
#include <string.h>
#include <stdlib.h>
-#include "camel-vee-summary.h"
#include "camel-folder.h"
+#include "camel-vee-summary.h"
#define d(x)
#include <config.h>
+#include <string.h>
+
#include "camel-exception.h"
-#include "camel-vtrash-folder.h"
-#include "camel-store.h"
-#include "camel-vee-store.h"
-#include "camel-mime-message.h"
#include "camel-i18n.h"
+#include "camel-mime-message.h"
#include "camel-private.h"
+#include "camel-store.h"
+#include "camel-vee-store.h"
+#include "camel-vtrash-folder.h"
-#include <string.h>
/* Returns the class for a CamelFolder */
#define CF_CLASS(so) ((CamelFolderClass *)((CamelObject *)(so))->klass)
#include "camel.h"
#include "camel-certdb.h"
+#include "camel-debug.h"
#include "camel-i18n.h"
-#include "camel-mime-utils.h"
#include "camel-provider.h"
-#include "camel-debug.h"
+#include "camel-private.h"
static int initialised = FALSE;
if (!initialised)
return;
-#ifdef HAVE_NSS
+#if defined (HAVE_NSS) && !defined (G_OS_WIN32)
+ /* For some reason we get into trouble on Win32 if we call these.
+ * But they shouldn't be necessary as the process is exiting anywy?
+ */
NSS_Shutdown ();
PR_Cleanup ();