GNOME.org
 

[evolution-data-server] Coding style cleanup.

commit a2e22e5873ffa017535cfea853e218011eb9bd41
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Oct 3 18:37:39 2010 -0400

    Coding style cleanup.

 camel/camel-block-file.h                           |    6 +-
 camel/camel-data-cache.c                           |    4 +-
 camel/camel-debug.c                                |    2 +-
 camel/camel-folder-search.c                        |    8 ++--
 camel/camel-folder-summary.h                       |   36 +++++++-------
 camel/camel-folder.h                               |   14 +++---
 camel/camel-index.h                                |    2 +-
 camel/camel-mime-filter-bestenc.h                  |   10 ++--
 camel/camel-mime-filter-canon.h                    |    6 +-
 camel/camel-mime-filter-linewrap.h                 |    4 +-
 camel/camel-mime-utils.h                           |   20 ++++----
 camel/camel-sasl-digest-md5.c                      |   20 ++++----
 camel/camel-search-private.h                       |   10 ++--
 camel/camel-smime-context.h                        |    8 ++--
 camel/camel-store-summary.h                        |   30 ++++++------
 camel/camel-store.h                                |   30 ++++++------
 camel/camel-stream-buffer.c                        |    2 +-
 camel/camel-utf8.c                                 |   14 +++---
 camel/camel-vee-store.h                            |    4 +-
 .../groupwise/camel-groupwise-store-summary.c      |    2 +-
 .../providers/groupwise/camel-groupwise-summary.h  |    4 +-
 camel/providers/imap/camel-imap-store-summary.c    |    2 +-
 camel/providers/imap/camel-imap-store.h            |    4 +-
 camel/providers/imap/camel-imap-summary.h          |    2 +-
 camel/providers/imapx/camel-imapx-server.c         |   28 +++++-----
 camel/providers/imapx/camel-imapx-server.h         |    4 +-
 camel/providers/imapx/camel-imapx-utils.h          |   54 ++++++++++----------
 camel/providers/local/camel-local-summary.h        |    6 +-
 camel/providers/local/camel-mh-store.h             |    2 +-
 camel/providers/nntp/camel-nntp-store.h            |   16 +++---
 camel/providers/pop3/camel-pop3-engine.h           |   14 +++---
 camel/tests/misc/test1.c                           |    6 +-
 32 files changed, 187 insertions(+), 187 deletions(-)
---
diff --git a/camel/camel-block-file.h b/camel/camel-block-file.h
index b6649a1..86d470c 100644
--- a/camel/camel-block-file.h
+++ b/camel/camel-block-file.h
@@ -78,13 +78,13 @@ typedef struct _CamelBlockFile CamelBlockFile;
 typedef struct _CamelBlockFileClass CamelBlockFileClass;
 typedef struct _CamelBlockFilePrivate CamelBlockFilePrivate;
 
-#define CAMEL_BLOCK_FILE_SYNC (1<<0)
+#define CAMEL_BLOCK_FILE_SYNC (1 << 0)
 
 #define CAMEL_BLOCK_SIZE (1024)
 #define CAMEL_BLOCK_SIZE_BITS (10) /* # bits to contain block_size bytes */
 
-#define CAMEL_BLOCK_DIRTY (1<<0)
-#define CAMEL_BLOCK_DETACHED (1<<1)
+#define CAMEL_BLOCK_DIRTY (1 << 0)
+#define CAMEL_BLOCK_DETACHED (1 << 1)
 
 struct _CamelBlockRoot {
 	gchar version[8];	/* version number */
diff --git a/camel/camel-data-cache.c b/camel/camel-data-cache.c
index a575c6c..b288db6 100644
--- a/camel/camel-data-cache.c
+++ b/camel/camel-data-cache.c
@@ -43,7 +43,7 @@
 
 /* how many 'bits' of hash are used to key the toplevel directory */
 #define CAMEL_DATA_CACHE_BITS (6)
-#define CAMEL_DATA_CACHE_MASK ((1<<CAMEL_DATA_CACHE_BITS)-1)
+#define CAMEL_DATA_CACHE_MASK ((1 << CAMEL_DATA_CACHE_BITS)-1)
 
 /* timeout before a cache dir is checked again for expired entries,
    once an hour should be enough */
@@ -61,7 +61,7 @@ struct _CamelDataCachePrivate {
 	time_t expire_age;
 	time_t expire_access;
 
-	time_t expire_last[1<<CAMEL_DATA_CACHE_BITS];
+	time_t expire_last[1 << CAMEL_DATA_CACHE_BITS];
 };
 
 enum {
diff --git a/camel/camel-debug.c b/camel/camel-debug.c
index a6a3fe3..5634d7f 100644
--- a/camel/camel-debug.c
+++ b/camel/camel-debug.c
@@ -222,7 +222,7 @@ camel_debug_hwatch (gint wp, gpointer addr)
      get_dr (7, control);
      /* set watch mode + size */
      rw = DR_RW_WRITE | DR_LEN_4;
-     control &= ~(((1<<DR_CONTROL_SIZE)-1) << (DR_CONTROL_SHIFT+DR_CONTROL_SIZE * wp));
+     control &= ~(((1 << DR_CONTROL_SIZE)-1) << (DR_CONTROL_SHIFT+DR_CONTROL_SIZE * wp));
      control |= rw << (DR_CONTROL_SHIFT + DR_CONTROL_SIZE*wp);
      /* set watch enable */
      control |=  ( 1<< (DR_LOCAL_ENABLE_SHIFT + DR_ENABLE_SIZE * wp));
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index 03b20f2..f36a2ea 100644
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -1382,7 +1382,7 @@ match_words_index (CamelFolderSearch *search,
 						while ((name = camel_index_cursor_next (nc))) {
 								gint mask;
 
-								mask = (GPOINTER_TO_INT (g_hash_table_lookup (ht, name))) | (1<<i);
+								mask = (GPOINTER_TO_INT (g_hash_table_lookup (ht, name))) | (1 << i);
 								g_hash_table_insert (ht, (gchar *) camel_pstring_peek (name), GINT_TO_POINTER (mask));
 						}
 						g_object_unref (nc);
@@ -1393,7 +1393,7 @@ match_words_index (CamelFolderSearch *search,
 		g_object_unref (wc);
 
 		lambdafoo.uids = result;
-		lambdafoo.count = (1<<words->len) - 1;
+		lambdafoo.count = (1 << words->len) - 1;
 		g_hash_table_foreach (ht, (GHFunc)htand, &lambdafoo);
 		g_hash_table_destroy (ht);
 	}
@@ -1440,9 +1440,9 @@ match_words_1message (CamelDataWrapper *object, struct _camel_search_words *word
 		for (i=0;i<words->len;i++) {
 			/* FIXME: This is horridly slow, and should use a real search algorithm */
 			if (camel_ustrstrcase ((const gchar *) byte_array->data, words->words[i]->word) != NULL) {
-				*mask |= (1<<i);
+				*mask |= (1 << i);
 				/* shortcut a match */
-				if (*mask == (1<<(words->len))-1)
+				if (*mask == (1 << (words->len))-1)
 					return TRUE;
 			}
 		}
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
index c4e565f..ef79679 100644
--- a/camel/camel-folder-summary.h
+++ b/camel/camel-folder-summary.h
@@ -85,31 +85,31 @@ struct _CamelMessageContentInfo {
 
 /* system flag bits */
 typedef enum _CamelMessageFlags {
-	CAMEL_MESSAGE_ANSWERED = 1<<0,
-	CAMEL_MESSAGE_DELETED = 1<<1,
-	CAMEL_MESSAGE_DRAFT = 1<<2,
-	CAMEL_MESSAGE_FLAGGED = 1<<3,
-	CAMEL_MESSAGE_SEEN = 1<<4,
+	CAMEL_MESSAGE_ANSWERED = 1 << 0,
+	CAMEL_MESSAGE_DELETED = 1 << 1,
+	CAMEL_MESSAGE_DRAFT = 1 << 2,
+	CAMEL_MESSAGE_FLAGGED = 1 << 3,
+	CAMEL_MESSAGE_SEEN = 1 << 4,
 
 	/* these aren't really system flag bits, but are convenience flags */
-	CAMEL_MESSAGE_ATTACHMENTS = 1<<5,
-	CAMEL_MESSAGE_ANSWERED_ALL = 1<<6,
-	CAMEL_MESSAGE_JUNK = 1<<7,
-	CAMEL_MESSAGE_SECURE = 1<<8,
-	CAMEL_MESSAGE_USER_NOT_DELETABLE = 1<<9,
-	CAMEL_MESSAGE_HIDDEN = 1<<10,
-	CAMEL_MESSAGE_NOTJUNK = 1<<11,
-	CAMEL_MESSAGE_FORWARDED = 1<<12,
+	CAMEL_MESSAGE_ATTACHMENTS = 1 << 5,
+	CAMEL_MESSAGE_ANSWERED_ALL = 1 << 6,
+	CAMEL_MESSAGE_JUNK = 1 << 7,
+	CAMEL_MESSAGE_SECURE = 1 << 8,
+	CAMEL_MESSAGE_USER_NOT_DELETABLE = 1 << 9,
+	CAMEL_MESSAGE_HIDDEN = 1 << 10,
+	CAMEL_MESSAGE_NOTJUNK = 1 << 11,
+	CAMEL_MESSAGE_FORWARDED = 1 << 12,
 
 	/* following flags are for the folder, and are not really permanent flags */
-	CAMEL_MESSAGE_FOLDER_FLAGGED = 1<<16, /* for use by the folder implementation */
-	/* flags after 1<<16 are used by camel providers,
+	CAMEL_MESSAGE_FOLDER_FLAGGED = 1 << 16, /* for use by the folder implementation */
+	/* flags after 1 << 16 are used by camel providers,
            if adding non permanent flags, add them to the end  */
 
-	CAMEL_MESSAGE_JUNK_LEARN = 1<<30, /* used when setting CAMEL_MESSAGE_JUNK flag
+	CAMEL_MESSAGE_JUNK_LEARN = 1 << 30, /* used when setting CAMEL_MESSAGE_JUNK flag
 					     to say that we request junk plugin
 					     to learn that message as junk/non junk */
-	CAMEL_MESSAGE_USER = 1<<31 /* supports user flags */
+	CAMEL_MESSAGE_USER = 1 << 31 /* supports user flags */
 } CamelMessageFlags;
 
 /* Changes to system flags will NOT trigger a folder changed event */
@@ -216,7 +216,7 @@ struct _CamelMessageInfoBase {
 };
 
 typedef enum _CamelFolderSummaryFlags {
-	CAMEL_SUMMARY_DIRTY = 1<<0
+	CAMEL_SUMMARY_DIRTY = 1 << 0
 } CamelFolderSummaryFlags;
 
 /**
diff --git a/camel/camel-folder.h b/camel/camel-folder.h
index 048f62a..2b8ea81 100644
--- a/camel/camel-folder.h
+++ b/camel/camel-folder.h
@@ -132,13 +132,13 @@ struct _CamelFolder {
 	gpointer later[4];
 };
 
-#define CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY (1<<0)
-#define CAMEL_FOLDER_HAS_SEARCH_CAPABILITY  (1<<1)
-#define CAMEL_FOLDER_FILTER_RECENT          (1<<2)
-#define CAMEL_FOLDER_HAS_BEEN_DELETED       (1<<3)
-#define CAMEL_FOLDER_IS_TRASH               (1<<4)
-#define CAMEL_FOLDER_IS_JUNK                (1<<5)
-#define CAMEL_FOLDER_FILTER_JUNK	    (1<<6)
+#define CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY (1 << 0)
+#define CAMEL_FOLDER_HAS_SEARCH_CAPABILITY  (1 << 1)
+#define CAMEL_FOLDER_FILTER_RECENT          (1 << 2)
+#define CAMEL_FOLDER_HAS_BEEN_DELETED       (1 << 3)
+#define CAMEL_FOLDER_IS_TRASH               (1 << 4)
+#define CAMEL_FOLDER_IS_JUNK                (1 << 5)
+#define CAMEL_FOLDER_FILTER_JUNK	    (1 << 6)
 
 struct _CamelFolderClass {
 	CamelObjectClass parent_class;
diff --git a/camel/camel-index.h b/camel/camel-index.h
index 2bd0439..d2bf71b 100644
--- a/camel/camel-index.h
+++ b/camel/camel-index.h
@@ -194,7 +194,7 @@ struct _CamelIndexClass {
 };
 
 /* flags, stored in 'state', set with set_state */
-#define CAMEL_INDEX_DELETED (1<<0)
+#define CAMEL_INDEX_DELETED (1 << 0)
 
 GType		camel_index_get_type		(void);
 CamelIndex *	camel_index_new			(const gchar *path,
diff --git a/camel/camel-mime-filter-bestenc.h b/camel/camel-mime-filter-bestenc.h
index 2171f69..b011940 100644
--- a/camel/camel-mime-filter-bestenc.h
+++ b/camel/camel-mime-filter-bestenc.h
@@ -56,13 +56,13 @@ typedef struct _CamelMimeFilterBestencClass CamelMimeFilterBestencClass;
 typedef struct _CamelMimeFilterBestencPrivate CamelMimeFilterBestencPrivate;
 
 typedef enum _CamelBestencRequired {
-	CAMEL_BESTENC_GET_ENCODING = 1<<0,
-	CAMEL_BESTENC_GET_CHARSET = 1<<1,
+	CAMEL_BESTENC_GET_ENCODING = 1 << 0,
+	CAMEL_BESTENC_GET_CHARSET = 1 << 1,
 
 	/* do we treat 'lf' as if it were crlf? */
-	CAMEL_BESTENC_LF_IS_CRLF = 1<<8,
+	CAMEL_BESTENC_LF_IS_CRLF = 1 << 8,
 	/* do we not allow "From " to appear at the start of a line in any part? */
-	CAMEL_BESTENC_NO_FROM = 1<<9
+	CAMEL_BESTENC_NO_FROM = 1 << 9
 } CamelBestencRequired;
 
 typedef enum _CamelBestencEncoding {
@@ -71,7 +71,7 @@ typedef enum _CamelBestencEncoding {
 	CAMEL_BESTENC_BINARY,
 
 	/* is the content stream to be treated as text? */
-	CAMEL_BESTENC_TEXT = 1<<8
+	CAMEL_BESTENC_TEXT = 1 << 8
 } CamelBestencEncoding;
 
 struct _CamelMimeFilterBestenc {
diff --git a/camel/camel-mime-filter-canon.h b/camel/camel-mime-filter-canon.h
index a886ede..f3da778 100644
--- a/camel/camel-mime-filter-canon.h
+++ b/camel/camel-mime-filter-canon.h
@@ -55,9 +55,9 @@ typedef struct _CamelMimeFilterCanonClass CamelMimeFilterCanonClass;
 typedef struct _CamelMimeFilterCanonPrivate CamelMimeFilterCanonPrivate;
 
 enum {
-	CAMEL_MIME_FILTER_CANON_CRLF = (1<<0), /* canoncialise end of line to crlf, otherwise canonicalise to lf only */
-	CAMEL_MIME_FILTER_CANON_FROM = (1<<1), /* escape "^From " using quoted-printable semantics into "=46rom " */
-	CAMEL_MIME_FILTER_CANON_STRIP = (1<<2)	/* strip trailing space */
+	CAMEL_MIME_FILTER_CANON_CRLF = (1 << 0), /* canoncialise end of line to crlf, otherwise canonicalise to lf only */
+	CAMEL_MIME_FILTER_CANON_FROM = (1 << 1), /* escape "^From " using quoted-printable semantics into "=46rom " */
+	CAMEL_MIME_FILTER_CANON_STRIP = (1 << 2)	/* strip trailing space */
 };
 
 struct _CamelMimeFilterCanon {
diff --git a/camel/camel-mime-filter-linewrap.h b/camel/camel-mime-filter-linewrap.h
index a9831af..ed317be 100644
--- a/camel/camel-mime-filter-linewrap.h
+++ b/camel/camel-mime-filter-linewrap.h
@@ -50,8 +50,8 @@
 G_BEGIN_DECLS
 
 enum {
-	CAMEL_MIME_FILTER_LINEWRAP_NOINDENT = (1<<0), /* does not indent; it's forced for indent_char = 0 */
-	CAMEL_MIME_FILTER_LINEWRAP_WORD     = (1<<1), /* indents on word boundary */
+	CAMEL_MIME_FILTER_LINEWRAP_NOINDENT = (1 << 0), /* does not indent; it's forced for indent_char = 0 */
+	CAMEL_MIME_FILTER_LINEWRAP_WORD     = (1 << 1), /* indents on word boundary */
 };
 
 typedef struct _CamelMimeFilterLinewrap CamelMimeFilterLinewrap;
diff --git a/camel/camel-mime-utils.h b/camel/camel-mime-utils.h
index 987fc0e..0922ff8 100644
--- a/camel/camel-mime-utils.h
+++ b/camel/camel-mime-utils.h
@@ -245,16 +245,16 @@ gsize camel_quoted_encode_close (guchar *in, gsize len, guchar *out, gint *state
 
 /* camel ctype type functions for rfc822/rfc2047/other, which are non-locale specific */
 enum {
-	CAMEL_MIME_IS_CTRL		= 1<<0,
-	CAMEL_MIME_IS_LWSP		= 1<<1,
-	CAMEL_MIME_IS_TSPECIAL	= 1<<2,
-	CAMEL_MIME_IS_SPECIAL	= 1<<3,
-	CAMEL_MIME_IS_SPACE	= 1<<4,
-	CAMEL_MIME_IS_DSPECIAL	= 1<<5,
-	CAMEL_MIME_IS_QPSAFE	= 1<<6,
-	CAMEL_MIME_IS_ESAFE	= 1<<7,	/* encoded word safe */
-	CAMEL_MIME_IS_PSAFE	= 1<<8,	/* encoded word in phrase safe */
-	CAMEL_MIME_IS_ATTRCHAR  = 1<<9	/* attribute-char safe (rfc2184) */
+	CAMEL_MIME_IS_CTRL		= 1 << 0,
+	CAMEL_MIME_IS_LWSP		= 1 << 1,
+	CAMEL_MIME_IS_TSPECIAL	= 1 << 2,
+	CAMEL_MIME_IS_SPECIAL	= 1 << 3,
+	CAMEL_MIME_IS_SPACE	= 1 << 4,
+	CAMEL_MIME_IS_DSPECIAL	= 1 << 5,
+	CAMEL_MIME_IS_QPSAFE	= 1 << 6,
+	CAMEL_MIME_IS_ESAFE	= 1 << 7,	/* encoded word safe */
+	CAMEL_MIME_IS_PSAFE	= 1 << 8,	/* encoded word in phrase safe */
+	CAMEL_MIME_IS_ATTRCHAR  = 1 << 9	/* attribute-char safe (rfc2184) */
 };
 
 extern gushort camel_mime_special_table[256];
diff --git a/camel/camel-sasl-digest-md5.c b/camel/camel-sasl-digest-md5.c
index cdea81a..2338c45 100644
--- a/camel/camel-sasl-digest-md5.c
+++ b/camel/camel-sasl-digest-md5.c
@@ -98,10 +98,10 @@ static DataType digest_args[] = {
 	{ NULL,        DIGEST_UNKNOWN   }
 };
 
-#define QOP_AUTH           (1<<0)
-#define QOP_AUTH_INT       (1<<1)
-#define QOP_AUTH_CONF      (1<<2)
-#define QOP_INVALID        (1<<3)
+#define QOP_AUTH           (1 << 0)
+#define QOP_AUTH_INT       (1 << 1)
+#define QOP_AUTH_CONF      (1 << 2)
+#define QOP_INVALID        (1 << 3)
 
 static DataType qop_types[] = {
 	{ "auth",      QOP_AUTH      },
@@ -110,12 +110,12 @@ static DataType qop_types[] = {
 	{ NULL,        QOP_INVALID   }
 };
 
-#define CIPHER_DES         (1<<0)
-#define CIPHER_3DES        (1<<1)
-#define CIPHER_RC4         (1<<2)
-#define CIPHER_RC4_40      (1<<3)
-#define CIPHER_RC4_56      (1<<4)
-#define CIPHER_INVALID     (1<<5)
+#define CIPHER_DES         (1 << 0)
+#define CIPHER_3DES        (1 << 1)
+#define CIPHER_RC4         (1 << 2)
+#define CIPHER_RC4_40      (1 << 3)
+#define CIPHER_RC4_56      (1 << 4)
+#define CIPHER_INVALID     (1 << 5)
 
 static DataType cipher_types[] = {
 	{ "des",    CIPHER_DES     },
diff --git a/camel/camel-search-private.h b/camel/camel-search-private.h
index 0962cb1..58a963c 100644
--- a/camel/camel-search-private.h
+++ b/camel/camel-search-private.h
@@ -33,11 +33,11 @@
 G_BEGIN_DECLS
 
 typedef enum {
-	CAMEL_SEARCH_MATCH_START = 1<<0,
-	CAMEL_SEARCH_MATCH_END = 1<<1,
-	CAMEL_SEARCH_MATCH_REGEX = 1<<2, /* disables the first 2 */
-	CAMEL_SEARCH_MATCH_ICASE = 1<<3,
-	CAMEL_SEARCH_MATCH_NEWLINE = 1<<4
+	CAMEL_SEARCH_MATCH_START = 1 << 0,
+	CAMEL_SEARCH_MATCH_END = 1 << 1,
+	CAMEL_SEARCH_MATCH_REGEX = 1 << 2, /* disables the first 2 */
+	CAMEL_SEARCH_MATCH_ICASE = 1 << 3,
+	CAMEL_SEARCH_MATCH_NEWLINE = 1 << 4
 } camel_search_flags_t;
 
 typedef enum {
diff --git a/camel/camel-smime-context.h b/camel/camel-smime-context.h
index 058d48b..1d5d6be 100644
--- a/camel/camel-smime-context.h
+++ b/camel/camel-smime-context.h
@@ -57,10 +57,10 @@ typedef enum _camel_smime_sign_t {
 } camel_smime_sign_t;
 
 typedef enum _camel_smime_describe_t {
-	CAMEL_SMIME_SIGNED = 1<<0,
-	CAMEL_SMIME_ENCRYPTED = 1<<1,
-	CAMEL_SMIME_CERTS = 1<<2,
-	CAMEL_SMIME_CRLS = 1<<3
+	CAMEL_SMIME_SIGNED = 1 << 0,
+	CAMEL_SMIME_ENCRYPTED = 1 << 1,
+	CAMEL_SMIME_CERTS = 1 << 2,
+	CAMEL_SMIME_CRLS = 1 << 3
 } camel_smime_describe_t;
 
 typedef struct _CamelSMIMEContext CamelSMIMEContext;
diff --git a/camel/camel-store-summary.h b/camel/camel-store-summary.h
index 4d9486c..8e38673 100644
--- a/camel/camel-store-summary.h
+++ b/camel/camel-store-summary.h
@@ -61,22 +61,22 @@ typedef struct _CamelStoreInfo CamelStoreInfo;
 
 /* FIXME: this needs to track the CAMEL_FOLDER_* flags in camel-store.h */
 typedef enum _CamelStoreInfoFlags {
-	CAMEL_STORE_INFO_FOLDER_NOSELECT = 1<<0,
-	CAMEL_STORE_INFO_FOLDER_NOINFERIORS = 1<<1,
-	CAMEL_STORE_INFO_FOLDER_CHILDREN = 1<<2,
-	CAMEL_STORE_INFO_FOLDER_NOCHILDREN = 1<<3,
-	CAMEL_STORE_INFO_FOLDER_SUBSCRIBED = 1<<4,
-	CAMEL_STORE_INFO_FOLDER_VIRTUAL = 1<<5,
-	CAMEL_STORE_INFO_FOLDER_SYSTEM = 1<<6,
-	CAMEL_STORE_INFO_FOLDER_VTRASH = 1<<7,
-	CAMEL_STORE_INFO_FOLDER_SHARED_BY_ME = 1<<8,
-	CAMEL_STORE_INFO_FOLDER_SHARED_TO_ME = 1<<9,
+	CAMEL_STORE_INFO_FOLDER_NOSELECT = 1 << 0,
+	CAMEL_STORE_INFO_FOLDER_NOINFERIORS = 1 << 1,
+	CAMEL_STORE_INFO_FOLDER_CHILDREN = 1 << 2,
+	CAMEL_STORE_INFO_FOLDER_NOCHILDREN = 1 << 3,
+	CAMEL_STORE_INFO_FOLDER_SUBSCRIBED = 1 << 4,
+	CAMEL_STORE_INFO_FOLDER_VIRTUAL = 1 << 5,
+	CAMEL_STORE_INFO_FOLDER_SYSTEM = 1 << 6,
+	CAMEL_STORE_INFO_FOLDER_VTRASH = 1 << 7,
+	CAMEL_STORE_INFO_FOLDER_SHARED_BY_ME = 1 << 8,
+	CAMEL_STORE_INFO_FOLDER_SHARED_TO_ME = 1 << 9,
 
 	/* not in camle-store.h yet */
-	CAMEL_STORE_INFO_FOLDER_READONLY = 1<<13,
-	CAMEL_STORE_INFO_FOLDER_CHECK_FOR_NEW = 1<<14,
+	CAMEL_STORE_INFO_FOLDER_READONLY = 1 << 13,
+	CAMEL_STORE_INFO_FOLDER_CHECK_FOR_NEW = 1 << 14,
 
-	CAMEL_STORE_INFO_FOLDER_FLAGGED = 1<<31
+	CAMEL_STORE_INFO_FOLDER_FLAGGED = 1 << 31
 } CamelStoreInfoFlags;
 
 #define CAMEL_STORE_INFO_FOLDER_UNKNOWN (~0)
@@ -98,8 +98,8 @@ struct _CamelStoreInfo {
 };
 
 typedef enum _CamelStoreSummaryFlags {
-	CAMEL_STORE_SUMMARY_DIRTY = 1<<0,
-	CAMEL_STORE_SUMMARY_FRAGMENT = 1<<1 /* path name is stored in fragment rather than path */
+	CAMEL_STORE_SUMMARY_DIRTY = 1 << 0,
+	CAMEL_STORE_SUMMARY_FRAGMENT = 1 << 1 /* path name is stored in fragment rather than path */
 } CamelStoreSummaryFlags;
 
 /**
diff --git a/camel/camel-store.h b/camel/camel-store.h
index 9b27523..be7ee90 100644
--- a/camel/camel-store.h
+++ b/camel/camel-store.h
@@ -102,25 +102,25 @@ typedef struct _CamelFolderInfo {
 /* Note: these are abstractions (duh), its upto the provider to make them make sense */
 
 /* a folder which can't contain messages */
-#define CAMEL_FOLDER_NOSELECT (1<<0)
+#define CAMEL_FOLDER_NOSELECT (1 << 0)
 /* a folder which cannot have children */
-#define CAMEL_FOLDER_NOINFERIORS (1<<1)
+#define CAMEL_FOLDER_NOINFERIORS (1 << 1)
 /* a folder which has children (not yet fully implemented) */
-#define CAMEL_FOLDER_CHILDREN (1<<2)
+#define CAMEL_FOLDER_CHILDREN (1 << 2)
 /* a folder which does not have any children (not yet fully implemented) */
-#define CAMEL_FOLDER_NOCHILDREN (1<<3)
+#define CAMEL_FOLDER_NOCHILDREN (1 << 3)
 /* a folder which is subscribed */
-#define CAMEL_FOLDER_SUBSCRIBED (1<<4)
+#define CAMEL_FOLDER_SUBSCRIBED (1 << 4)
 /* a virtual folder, cannot copy/move messages here */
-#define CAMEL_FOLDER_VIRTUAL (1<<5)
+#define CAMEL_FOLDER_VIRTUAL (1 << 5)
 /* a system folder, cannot be renamed/deleted */
-#define CAMEL_FOLDER_SYSTEM (1<<6)
+#define CAMEL_FOLDER_SYSTEM (1 << 6)
 /* a virtual folder that can't be copied to, and can only be moved to if in an existing folder */
-#define CAMEL_FOLDER_VTRASH (1<<7)
+#define CAMEL_FOLDER_VTRASH (1 << 7)
 /* a shared folder i'm accessing */
-#define CAMEL_FOLDER_SHARED_TO_ME (1<<8)
+#define CAMEL_FOLDER_SHARED_TO_ME (1 << 8)
 /* a folder that i'm sharing */
-#define CAMEL_FOLDER_SHARED_BY_ME (1<<9)
+#define CAMEL_FOLDER_SHARED_BY_ME (1 << 9)
 
 /* use 3 bits as a hint for a folder type */
 #define CAMEL_FOLDER_TYPE_MASK (7 << 10)
@@ -138,7 +138,7 @@ typedef struct _CamelFolderInfo {
 /* a sent-items folder */
 #define CAMEL_FOLDER_TYPE_SENT (5 << 10)
 
-/* next bit is 1<<13 */
+/* next bit is 1 << 13 */
 
 /* store premissions */
 #define CAMEL_STORE_READ  (1 << 0)
@@ -189,10 +189,10 @@ struct _CamelStore {
 };
 
 /* open mode for folder */
-#define CAMEL_STORE_FOLDER_CREATE (1<<0)
-#define CAMEL_STORE_FOLDER_EXCL (1<<1)
-#define CAMEL_STORE_FOLDER_BODY_INDEX (1<<2)
-#define CAMEL_STORE_FOLDER_PRIVATE (1<<3) /* a private folder, that shouldn't show up in unmatched/folder info's, etc */
+#define CAMEL_STORE_FOLDER_CREATE (1 << 0)
+#define CAMEL_STORE_FOLDER_EXCL (1 << 1)
+#define CAMEL_STORE_FOLDER_BODY_INDEX (1 << 2)
+#define CAMEL_STORE_FOLDER_PRIVATE (1 << 3) /* a private folder, that shouldn't show up in unmatched/folder info's, etc */
 
 #define CAMEL_STORE_FOLDER_CREATE_EXCL (CAMEL_STORE_FOLDER_CREATE | CAMEL_STORE_FOLDER_EXCL)
 
diff --git a/camel/camel-stream-buffer.c b/camel/camel-stream-buffer.c
index 1b858b5..6881276 100644
--- a/camel/camel-stream-buffer.c
+++ b/camel/camel-stream-buffer.c
@@ -54,7 +54,7 @@ struct _CamelStreamBufferPrivate {
 G_DEFINE_TYPE (CamelStreamBuffer, camel_stream_buffer, CAMEL_TYPE_STREAM)
 
 enum {
-	BUF_USER = 1<<0	/* user-supplied buffer, do not free */
+	BUF_USER = 1 << 0	/* user-supplied buffer, do not free */
 };
 
 #define BUF_SIZE 1024
diff --git a/camel/camel-utf8.c b/camel/camel-utf8.c
index 9f07d3c..d80ec83 100644
--- a/camel/camel-utf8.c
+++ b/camel/camel-utf8.c
@@ -97,9 +97,9 @@ loop:
 				r = c;
 				goto loop;
 			}
-			v = (v<<6) | (c & 0x3f);
-			r<<=1;
-			m<<=5;
+			v = (v << 6) | (c & 0x3f);
+			r <<= 1;
+			m <<= 5;
 		} while (r & 0x40);
 
 		*ptr = p;
@@ -151,9 +151,9 @@ loop:
 					r = c;
 					goto loop;
 				}
-				v = (v<<6) | (c & 0x3f);
-				r<<=1;
-				m<<=5;
+				v = (v << 6) | (c & 0x3f);
+				r <<= 1;
+				m <<= 5;
 			} while (r & 0x40);
 
 			*ptr = p;
@@ -251,7 +251,7 @@ camel_utf7_utf8 (const gchar *ptr)
 			if (c == '-') {
 				state = 0;
 			} else if (utf7_rank[c] != 0xff) {
-				v = (v<<6) | utf7_rank[c];
+				v = (v << 6) | utf7_rank[c];
 				i+=6;
 				if (i >= 16) {
 					x = (v >> (i-16)) & 0xffff;
diff --git a/camel/camel-vee-store.h b/camel/camel-vee-store.h
index ae16975..890e2cf 100644
--- a/camel/camel-vee-store.h
+++ b/camel/camel-vee-store.h
@@ -53,14 +53,14 @@ typedef struct _CamelVeeStore CamelVeeStore;
 typedef struct _CamelVeeStoreClass CamelVeeStoreClass;
 
 /* open mode for folder, vee folder auto-update */
-#define CAMEL_STORE_VEE_FOLDER_AUTO (1<<16)
+#define CAMEL_STORE_VEE_FOLDER_AUTO (1 << 16)
 
 /**
  * CAMEL_STORE_VEE_FOLDER_SPECIAL:
  *
  * Since: 2.24
  **/
-#define CAMEL_STORE_VEE_FOLDER_SPECIAL (1<<17)
+#define CAMEL_STORE_VEE_FOLDER_SPECIAL (1 << 17)
 
 struct _CamelVeeStore {
 	CamelStore parent;
diff --git a/camel/providers/groupwise/camel-groupwise-store-summary.c b/camel/providers/groupwise/camel-groupwise-store-summary.c
index ae11154..80c0da2 100644
--- a/camel/providers/groupwise/camel-groupwise-store-summary.c
+++ b/camel/providers/groupwise/camel-groupwise-store-summary.c
@@ -236,7 +236,7 @@ camel_groupwise_store_summary_path_to_full (CamelGroupwiseStoreSummary *s, const
 				break;
 			case 1:
 				state = 2;
-				v = hexnib (c)<<4;
+				v = hexnib (c) << 4;
 				break;
 			case 2:
 				state = 0;
diff --git a/camel/providers/groupwise/camel-groupwise-summary.h b/camel/providers/groupwise/camel-groupwise-summary.h
index c0ed562..4ea56b7 100644
--- a/camel/providers/groupwise/camel-groupwise-summary.h
+++ b/camel/providers/groupwise/camel-groupwise-summary.h
@@ -52,8 +52,8 @@ typedef struct _CamelGroupwiseMessageContentInfo CamelGroupwiseMessageContentInf
 
 /* extra summary flags*/
 enum {
-	CAMEL_GW_MESSAGE_JUNK = 1<<17,
-	CAMEL_GW_MESSAGE_NOJUNK = 1<<18
+	CAMEL_GW_MESSAGE_JUNK = 1 << 17,
+	CAMEL_GW_MESSAGE_NOJUNK = 1 << 18
 };
 
 struct _CamelGroupwiseMessageInfo {
diff --git a/camel/providers/imap/camel-imap-store-summary.c b/camel/providers/imap/camel-imap-store-summary.c
index 522a066..9be65ab 100644
--- a/camel/providers/imap/camel-imap-store-summary.c
+++ b/camel/providers/imap/camel-imap-store-summary.c
@@ -211,7 +211,7 @@ camel_imap_store_summary_path_to_full (CamelImapStoreSummary *s, const gchar *pa
 			break;
 		case 1:
 			state = 2;
-			v = hexnib (c)<<4;
+			v = hexnib (c) << 4;
 			break;
 		case 2:
 			state = 0;
diff --git a/camel/providers/imap/camel-imap-store.h b/camel/providers/imap/camel-imap-store.h
index dffaa1c..eacacae 100644
--- a/camel/providers/imap/camel-imap-store.h
+++ b/camel/providers/imap/camel-imap-store.h
@@ -93,8 +93,8 @@ G_BEGIN_DECLS
 #define CAMEL_IMAP_STORE_CHECK_LSUB          (CAMEL_IMAP_STORE_ARG_CHECK_LSUB | CAMEL_ARG_BOO)
 
 /* CamelFolderInfo flags */
-#define CAMEL_IMAP_FOLDER_MARKED	     (1<<16)
-#define CAMEL_IMAP_FOLDER_UNMARKED	     (1<<17)
+#define CAMEL_IMAP_FOLDER_MARKED	     (1 << 16)
+#define CAMEL_IMAP_FOLDER_UNMARKED	     (1 << 17)
 
 typedef enum {
 	IMAP_LEVEL_UNKNOWN,
diff --git a/camel/providers/imap/camel-imap-summary.h b/camel/providers/imap/camel-imap-summary.h
index 1f01238..53fb245 100644
--- a/camel/providers/imap/camel-imap-summary.h
+++ b/camel/providers/imap/camel-imap-summary.h
@@ -53,7 +53,7 @@
 G_BEGIN_DECLS
 
 enum {
-	CAMEL_IMAP_MESSAGE_RECENT = 1<<17
+	CAMEL_IMAP_MESSAGE_RECENT = 1 << 17
 };
 
 typedef struct _CamelImapSummary CamelImapSummary;
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index 59c23e6..635b1d2 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -187,20 +187,20 @@ struct _refresh_info {
 };
 
 enum {
-	IMAPX_JOB_GET_MESSAGE = 1<<0,
-	IMAPX_JOB_APPEND_MESSAGE = 1<<1,
-	IMAPX_JOB_COPY_MESSAGE = 1<<2,
-	IMAPX_JOB_FETCH_NEW_MESSAGES = 1<<3,
-	IMAPX_JOB_REFRESH_INFO = 1<<4,
-	IMAPX_JOB_SYNC_CHANGES = 1<<5,
-	IMAPX_JOB_EXPUNGE = 1<<6,
-	IMAPX_JOB_NOOP = 1<<7,
-	IMAPX_JOB_IDLE = 1<<8,
-	IMAPX_JOB_LIST = 1<<9,
-	IMAPX_JOB_MANAGE_SUBSCRIPTION = 1<<10,
-	IMAPX_JOB_CREATE_FOLDER = 1<<11,
-	IMAPX_JOB_DELETE_FOLDER = 1<<12,
-	IMAPX_JOB_RENAME_FOLDER = 1<<13,
+	IMAPX_JOB_GET_MESSAGE = 1 << 0,
+	IMAPX_JOB_APPEND_MESSAGE = 1 << 1,
+	IMAPX_JOB_COPY_MESSAGE = 1 << 2,
+	IMAPX_JOB_FETCH_NEW_MESSAGES = 1 << 3,
+	IMAPX_JOB_REFRESH_INFO = 1 << 4,
+	IMAPX_JOB_SYNC_CHANGES = 1 << 5,
+	IMAPX_JOB_EXPUNGE = 1 << 6,
+	IMAPX_JOB_NOOP = 1 << 7,
+	IMAPX_JOB_IDLE = 1 << 8,
+	IMAPX_JOB_LIST = 1 << 9,
+	IMAPX_JOB_MANAGE_SUBSCRIPTION = 1 << 10,
+	IMAPX_JOB_CREATE_FOLDER = 1 << 11,
+	IMAPX_JOB_DELETE_FOLDER = 1 << 12,
+	IMAPX_JOB_RENAME_FOLDER = 1 << 13,
 };
 
 /* Operations on the store (folder_tree) will have highest priority as we know for sure they are sync
diff --git a/camel/providers/imapx/camel-imapx-server.h b/camel/providers/imapx/camel-imapx-server.h
index 340eb6a..6b46b18 100644
--- a/camel/providers/imapx/camel-imapx-server.h
+++ b/camel/providers/imapx/camel-imapx-server.h
@@ -45,8 +45,8 @@
 	(G_TYPE_INSTANCE_GET_CLASS \
 	((obj), CAMEL_TYPE_IMAPX_SERVER, CamelIMAPXServerClass))
 
-#define IMAPX_MODE_READ (1<<0)
-#define IMAPX_MODE_WRITE (1<<1)
+#define IMAPX_MODE_READ (1 << 0)
+#define IMAPX_MODE_WRITE (1 << 1)
 
 G_BEGIN_DECLS
 
diff --git a/camel/providers/imapx/camel-imapx-utils.h b/camel/providers/imapx/camel-imapx-utils.h
index 7bcbdcb..56541ee 100644
--- a/camel/providers/imapx/camel-imapx-utils.h
+++ b/camel/providers/imapx/camel-imapx-utils.h
@@ -79,7 +79,7 @@ camel_imapx_id_t imapx_tokenise (register const gchar *str, register guint len);
 
 /* this flag should be part of imapfoldersummary */
 enum {
-	CAMEL_IMAPX_MESSAGE_RECENT = (1<<21),
+	CAMEL_IMAPX_MESSAGE_RECENT = (1 << 21),
 };
 
 /* ********************************************************************** */
@@ -146,18 +146,18 @@ struct _fetch_info {
 	gchar *uid;		/* UID */
 };
 
-#define FETCH_BODY (1<<0)
-#define FETCH_TEXT (1<<1)
-#define FETCH_HEADER (1<<2)
-#define FETCH_MINFO (1<<3)
-#define FETCH_CINFO (1<<4)
-#define FETCH_SIZE (1<<5)
-#define FETCH_OFFSET (1<<6)
-#define FETCH_FLAGS (1<<7)
-#define FETCH_DATE (1<<8)
-#define FETCH_SECTION (1<<9)
-#define FETCH_UID (1<<10)
-#define FETCH_MODSEQ (1<<11)
+#define FETCH_BODY (1 << 0)
+#define FETCH_TEXT (1 << 1)
+#define FETCH_HEADER (1 << 2)
+#define FETCH_MINFO (1 << 3)
+#define FETCH_CINFO (1 << 4)
+#define FETCH_SIZE (1 << 5)
+#define FETCH_OFFSET (1 << 6)
+#define FETCH_FLAGS (1 << 7)
+#define FETCH_DATE (1 << 8)
+#define FETCH_SECTION (1 << 9)
+#define FETCH_UID (1 << 10)
+#define FETCH_MODSEQ (1 << 11)
 
 struct _fetch_info *imapx_parse_fetch (struct _CamelIMAPXStream *is, GCancellable *cancellable, GError **error);
 void imapx_free_fetch (struct _fetch_info *finfo);
@@ -241,12 +241,12 @@ void camel_imapx_destroy_job_queue_info (IMAPXJobQueueInfo *jinfo);
 
 extern guchar imapx_specials[256];
 
-#define IMAPX_TYPE_CHAR (1<<0)
-#define IMAPX_TYPE_TEXT_CHAR (1<<1)
-#define IMAPX_TYPE_QUOTED_CHAR (1<<2)
-#define IMAPX_TYPE_ATOM_CHAR (1<<3)
-#define IMAPX_TYPE_TOKEN_CHAR (1<<4)
-#define IMAPX_TYPE_NOTID_CHAR (1<<5)
+#define IMAPX_TYPE_CHAR (1 << 0)
+#define IMAPX_TYPE_TEXT_CHAR (1 << 1)
+#define IMAPX_TYPE_QUOTED_CHAR (1 << 2)
+#define IMAPX_TYPE_ATOM_CHAR (1 << 3)
+#define IMAPX_TYPE_TOKEN_CHAR (1 << 4)
+#define IMAPX_TYPE_NOTID_CHAR (1 << 5)
 
 guchar imapx_is_mask (const gchar *p);
 
@@ -259,16 +259,16 @@ guchar imapx_is_mask (const gchar *p);
 #define imapx_is_atom(s) (imapx_is_mask(s) & IMAPX_TYPE_ATOM_CHAR)
 
 extern gint camel_imapx_debug_flags;
-#define CAMEL_IMAPX_DEBUG_command	(1<<0)
-#define CAMEL_IMAPX_DEBUG_debug		(1<<1)
-#define CAMEL_IMAPX_DEBUG_extra		(1<<2)
-#define CAMEL_IMAPX_DEBUG_io		(1<<3)
-#define CAMEL_IMAPX_DEBUG_token		(1<<4)
-#define CAMEL_IMAPX_DEBUG_parse		(1<<5)
-#define CAMEL_IMAPX_DEBUG_conman	(1<<6)
+#define CAMEL_IMAPX_DEBUG_command	(1 << 0)
+#define CAMEL_IMAPX_DEBUG_debug		(1 << 1)
+#define CAMEL_IMAPX_DEBUG_extra		(1 << 2)
+#define CAMEL_IMAPX_DEBUG_io		(1 << 3)
+#define CAMEL_IMAPX_DEBUG_token		(1 << 4)
+#define CAMEL_IMAPX_DEBUG_parse		(1 << 5)
+#define CAMEL_IMAPX_DEBUG_conman	(1 << 6)
 
 /* Set this to zero to remove all debug output at build time */
-#define CAMEL_IMAPX_DEBUG_ALL		((1<<7)-1)
+#define CAMEL_IMAPX_DEBUG_ALL		((1 << 7)-1)
 
 #define camel_debug_flag(type) (camel_imapx_debug_flags & CAMEL_IMAPX_DEBUG_ALL & CAMEL_IMAPX_DEBUG_ ## type)
 #define camel_imapx_debug(type, tagprefix, fmt, ...) do {		\
diff --git a/camel/providers/local/camel-local-summary.h b/camel/providers/local/camel-local-summary.h
index 54be594..ebcb581 100644
--- a/camel/providers/local/camel-local-summary.h
+++ b/camel/providers/local/camel-local-summary.h
@@ -49,9 +49,9 @@ typedef struct _CamelLocalSummaryClass CamelLocalSummaryClass;
 
 /* extra summary flags */
 enum {
-	CAMEL_MESSAGE_FOLDER_NOXEV = 1<<17,
-	CAMEL_MESSAGE_FOLDER_XEVCHANGE = 1<<18,
-	CAMEL_MESSAGE_FOLDER_NOTSEEN = 1<<19 /* have we seen this in processing this loop? */
+	CAMEL_MESSAGE_FOLDER_NOXEV = 1 << 17,
+	CAMEL_MESSAGE_FOLDER_XEVCHANGE = 1 << 18,
+	CAMEL_MESSAGE_FOLDER_NOTSEEN = 1 << 19 /* have we seen this in processing this loop? */
 };
 
 typedef struct _CamelLocalMessageInfo CamelLocalMessageInfo;
diff --git a/camel/providers/local/camel-mh-store.h b/camel/providers/local/camel-mh-store.h
index e166ea3..f6479da 100644
--- a/camel/providers/local/camel-mh-store.h
+++ b/camel/providers/local/camel-mh-store.h
@@ -49,7 +49,7 @@ typedef struct _CamelMhStore CamelMhStore;
 typedef struct _CamelMhStoreClass CamelMhStoreClass;
 
 enum {
-	CAMEL_MH_DOTFOLDERS = (1<<0) /* update/use .folders file */
+	CAMEL_MH_DOTFOLDERS = (1 << 0) /* update/use .folders file */
 };
 
 struct _CamelMhStore {
diff --git a/camel/providers/nntp/camel-nntp-store.h b/camel/providers/nntp/camel-nntp-store.h
index 074789a..92e3c69 100644
--- a/camel/providers/nntp/camel-nntp-store.h
+++ b/camel/providers/nntp/camel-nntp-store.h
@@ -47,14 +47,14 @@
 	(G_TYPE_INSTANCE_GET_CLASS \
 	((obj), CAMEL_TYPE_NNTP_STORE, CamelNNTPStoreClass))
 
-#define CAMEL_NNTP_EXT_SEARCH     (1<<0)
-#define CAMEL_NNTP_EXT_SETGET     (1<<1)
-#define CAMEL_NNTP_EXT_OVER       (1<<2)
-#define CAMEL_NNTP_EXT_XPATTEXT   (1<<3)
-#define CAMEL_NNTP_EXT_XACTIVE    (1<<4)
-#define CAMEL_NNTP_EXT_LISTMOTD   (1<<5)
-#define CAMEL_NNTP_EXT_LISTSUBSCR (1<<6)
-#define CAMEL_NNTP_EXT_LISTPNAMES (1<<7)
+#define CAMEL_NNTP_EXT_SEARCH     (1 << 0)
+#define CAMEL_NNTP_EXT_SETGET     (1 << 1)
+#define CAMEL_NNTP_EXT_OVER       (1 << 2)
+#define CAMEL_NNTP_EXT_XPATTEXT   (1 << 3)
+#define CAMEL_NNTP_EXT_XACTIVE    (1 << 4)
+#define CAMEL_NNTP_EXT_LISTMOTD   (1 << 5)
+#define CAMEL_NNTP_EXT_LISTSUBSCR (1 << 6)
+#define CAMEL_NNTP_EXT_LISTPNAMES (1 << 7)
 
 G_BEGIN_DECLS
 
diff --git a/camel/providers/pop3/camel-pop3-engine.h b/camel/providers/pop3/camel-pop3-engine.h
index 856a84e..d766cb4 100644
--- a/camel/providers/pop3/camel-pop3-engine.h
+++ b/camel/providers/pop3/camel-pop3-engine.h
@@ -77,17 +77,17 @@ enum {
 
 /* flags for server options */
 enum {
-	CAMEL_POP3_CAP_APOP = 1<<0,
-	CAMEL_POP3_CAP_UIDL = 1<<1,
-	CAMEL_POP3_CAP_SASL = 1<<2,
-	CAMEL_POP3_CAP_TOP  = 1<<3,
-	CAMEL_POP3_CAP_PIPE = 1<<4,
-	CAMEL_POP3_CAP_STLS = 1<<5
+	CAMEL_POP3_CAP_APOP = 1 << 0,
+	CAMEL_POP3_CAP_UIDL = 1 << 1,
+	CAMEL_POP3_CAP_SASL = 1 << 2,
+	CAMEL_POP3_CAP_TOP  = 1 << 3,
+	CAMEL_POP3_CAP_PIPE = 1 << 4,
+	CAMEL_POP3_CAP_STLS = 1 << 5
 };
 
 /* enable/disable flags for the engine itself */
 enum {
-	CAMEL_POP3_ENGINE_DISABLE_EXTENSIONS = 1<<0
+	CAMEL_POP3_ENGINE_DISABLE_EXTENSIONS = 1 << 0
 };
 
 typedef void (*CamelPOP3CommandFunc)(CamelPOP3Engine *pe, CamelPOP3Stream *stream, gpointer data);
diff --git a/camel/tests/misc/test1.c b/camel/tests/misc/test1.c
index dfe54ca..3b1fd0c 100644
--- a/camel/tests/misc/test1.c
+++ b/camel/tests/misc/test1.c
@@ -15,12 +15,12 @@ struct {
 	{ "(this is a comment) <test camel host>", { "test camel host" } },
 	{ "<test camel host> (this is a comment)", { "test camel host" } },
 	{ "<test camel host> This is total rubbish!", { "test camel host" } },
-	{ "<<test groupwise bug novell>@novell>", { "test groupwise bug novell" } },
-	{ "<<test groupwise bug novell>@novell> <test camel host>",
+	{ " << test groupwise bug novell>@novell>", { "test groupwise bug novell" } },
+	{ " << test groupwise bug novell>@novell> <test camel host>",
 	  { "test camel host", "test groupwise bug novell" } },
 	{ "<test camel host> <<test groupwise bug novell>@novell> <test camel host>",
 	  { "test camel host", "test groupwise bug novell", "test camel host" } },
-	{ "<<test groupwise bug novell>@novell> <test camel host> <<test groupwise bug novell>@novell>",
+	{ " << test groupwise bug novell>@novell> <test camel host> <<test groupwise bug novell>@novell>",
 	  { "test groupwise bug novell", "test camel host", "test groupwise bug novell" } },
 };
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]