Coding style and whitespace cleanups.

100 files changed, 155 insertions, 155 deletions

diff --git a/camel/camel-address.h b/camel/camel-address.h
index 6bd17b652..8b571b01a 100644
--- a/camel/camel-address.h
+++ b/camel/camel-address.h
@@ -72,4 +72,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-block-file.h b/camel/camel-block-file.h
index 318a02834..1bf1e5b13 100644
--- a/camel/camel-block-file.h
+++ b/camel/camel-block-file.h
@@ -145,4 +145,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-charset-map.c b/camel/camel-charset-map.c
index dec0ee841..60f8a493d 100644
--- a/camel/camel-charset-map.c
+++ b/camel/camel-charset-map.c
@@ -442,4 +442,4 @@ camel_charset_iso_to_windows (const gchar *isocharset)
 	return isocharset;
 }
 
-#endif /* !BUILD_MAP */
+#endif /* BUILD_MAP */
diff --git a/camel/camel-charset-map.h b/camel/camel-charset-map.h
index bdc80843f..3b6823c15 100644
--- a/camel/camel-charset-map.h
+++ b/camel/camel-charset-map.h
@@ -45,4 +45,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-data-cache.c b/camel/camel-data-cache.c
index f9b3c7375..7fbcea32b 100644
--- a/camel/camel-data-cache.c
+++ b/camel/camel-data-cache.c
@@ -202,7 +202,7 @@ data_cache_expire(CamelDataCache *cdc, const gchar *path, const gchar *keep, tim
 		return;
 
 	s = g_string_new("");
-	while ( (dname = g_dir_read_name(dir)) ) {
+	while ((dname = g_dir_read_name(dir))) {
 		if (strcmp(dname, keep) == 0)
 			continue;
 
diff --git a/camel/camel-digest-folder.h b/camel/camel-digest-folder.h
index 8fb310def..dfbfb2d13 100644
--- a/camel/camel-digest-folder.h
+++ b/camel/camel-digest-folder.h
@@ -55,6 +55,6 @@ CamelFolder *camel_digest_folder_new      (CamelStore *parent_store, CamelMimeMe
 
 G_END_DECLS
 
-#endif /* ! _CAMEL_DIGEST_FOLDER_H */
+#endif /* _CAMEL_DIGEST_FOLDER_H */
 
 #endif /* CAMEL_DISABLE_DEPRECATED */
diff --git a/camel/camel-filter-driver.h b/camel/camel-filter-driver.h
index c361f9c58..82277c14b 100644
--- a/camel/camel-filter-driver.h
+++ b/camel/camel-filter-driver.h
@@ -111,4 +111,4 @@ struct filter_option *camel_filter_driver_rule_get (CamelFilterDriver *d, gint n
 
 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 c786d0a3b..ec83c3ce5 100644
--- a/camel/camel-filter-search.h
+++ b/camel/camel-filter-search.h
@@ -45,4 +45,4 @@ gint camel_filter_search_match (CamelSession *session,
 
 G_END_DECLS
 
-#endif /* ! CAMEL_FILTER_SEARCH_H */
+#endif /* CAMEL_FILTER_SEARCH_H */
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index 24292fa12..03c352d70 100644
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -769,7 +769,7 @@ search_not(struct _ESExp *f, gint argc, struct _ESExpResult **argv, CamelFolderS
 			gint res = TRUE;
 
 			if (argv[0]->type == ESEXP_RES_BOOL)
-				res = ! argv[0]->value.bool;
+				res = !argv[0]->value.bool;
 
 			r = e_sexp_result_new(f, ESEXP_RES_BOOL);
 			r->value.bool = res;
diff --git a/camel/camel-folder-search.h b/camel/camel-folder-search.h
index 18f6c25d0..fa3d98270 100644
--- a/camel/camel-folder-search.h
+++ b/camel/camel-folder-search.h
@@ -147,4 +147,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.c b/camel/camel-folder-summary.c
index a28093821..90a10e423 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -1115,56 +1115,56 @@ mir_from_cols (CamelMIRecord *mir, CamelFolderSummary *s, gint ncol, gchar ** co
 
 	for (i = 0; i < ncol; ++i) {
 
-		if ( !strcmp (name [i], "uid") )
+		if (!strcmp (name [i], "uid"))
 			mir->uid = (gchar *) camel_pstring_strdup (cols [i]);
-		else if ( !strcmp (name [i], "flags") )
+		else if (!strcmp (name [i], "flags"))
 			mir->flags = cols [i] ? strtoul (cols [i], NULL, 10) : 0;
-		else if ( !strcmp (name [i], "read") )
+		else if (!strcmp (name [i], "read"))
 			mir->read =  (cols [i]) ? ( ((strtoul (cols [i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
-		else if ( !strcmp (name [i], "deleted") )
+		else if (!strcmp (name [i], "deleted"))
 			mir->deleted = (cols [i]) ? ( ((strtoul (cols [i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
-		else if ( !strcmp (name [i], "replied") )
+		else if (!strcmp (name [i], "replied"))
 			mir->replied = (cols [i]) ? ( ((strtoul (cols [i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
-		else if ( !strcmp (name [i], "important") )
+		else if (!strcmp (name [i], "important"))
 			mir->important = (cols [i]) ? ( ((strtoul (cols [i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
-		else if ( !strcmp (name [i], "junk") )
+		else if (!strcmp (name [i], "junk"))
 			mir->junk = (cols [i]) ? ( ((strtoul (cols [i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
-		else if ( !strcmp (name [i], "attachment") )
+		else if (!strcmp (name [i], "attachment"))
 			mir->attachment = (cols [i]) ? ( ((strtoul (cols [i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
-		else if ( !strcmp (name [i], "size") )
+		else if (!strcmp (name [i], "size"))
 			mir->size =  cols [i] ? strtoul (cols [i], NULL, 10) : 0;
-		else if ( !strcmp (name [i], "dsent") )
+		else if (!strcmp (name [i], "dsent"))
 			mir->dsent = cols [i] ? strtol (cols [i], NULL, 10) : 0;
-		else if ( !strcmp (name [i], "dreceived") )
+		else if (!strcmp (name [i], "dreceived"))
 			mir->dreceived = cols [i] ? strtol (cols [i], NULL, 10) : 0;
-		else if ( !strcmp (name [i], "subject") )
+		else if (!strcmp (name [i], "subject"))
 			mir->subject = (gchar *) camel_pstring_strdup (cols [i]);
-		else if ( !strcmp (name [i], "mail_from") )
+		else if (!strcmp (name [i], "mail_from"))
 			mir->from = (gchar *) camel_pstring_strdup (cols [i]);
-		else if ( !strcmp (name [i], "mail_to") )
+		else if (!strcmp (name [i], "mail_to"))
 			mir->to = (gchar *) camel_pstring_strdup (cols [i]);
-		else if ( !strcmp (name [i], "mail_cc") )
+		else if (!strcmp (name [i], "mail_cc"))
 			mir->cc = (gchar *) camel_pstring_strdup(cols [i]);
-		else if ( !strcmp (name [i], "mlist") )
+		else if (!strcmp (name [i], "mlist"))
 			mir->mlist = (gchar *) camel_pstring_strdup (cols [i]);
-		else if ( !strcmp (name [i], "followup_flag") )
+		else if (!strcmp (name [i], "followup_flag"))
 			mir->followup_flag = (gchar *) camel_pstring_strdup(cols [i]);
-		else if ( !strcmp (name [i], "followup_completed_on") )
+		else if (!strcmp (name [i], "followup_completed_on"))
 			mir->followup_completed_on = (gchar *) camel_pstring_strdup(cols [i]);
-		else if ( !strcmp (name [i], "followup_due_by") )
+		else if (!strcmp (name [i], "followup_due_by"))
 			mir->followup_due_by = (gchar *) camel_pstring_strdup(cols [i]);
-		else if ( !strcmp (name [i], "part") )
+		else if (!strcmp (name [i], "part"))
 			mir->part = g_strdup (cols [i]);
-		else if ( !strcmp (name [i], "labels") )
+		else if (!strcmp (name [i], "labels"))
 			mir->labels = g_strdup (cols [i]);
-		else if ( !strcmp (name [i], "usertags") )
+		else if (!strcmp (name [i], "usertags"))
 			mir->usertags = g_strdup (cols [i]);
-		else if ( !strcmp (name [i], "cinfo") )
+		else if (!strcmp (name [i], "cinfo"))
 			mir->cinfo = g_strdup(cols [i]);
-		else if ( !strcmp (name [i], "bdata") )
+		else if (!strcmp (name [i], "bdata"))
 			mir->bdata = g_strdup(cols [i]);
 		/* Evolution itself doesn't yet use this, ignoring
-		else if ( !strcmp (name [i], "bodystructure") )
+		else if (!strcmp (name [i], "bodystructure"))
 			mir->bodystructure = g_strdup(cols [i]); */
 
 	}
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
index c0e1eb67c..eddea5165 100644
--- a/camel/camel-folder-summary.h
+++ b/camel/camel-folder-summary.h
@@ -489,4 +489,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 1479648f5..4c0515d41 100644
--- a/camel/camel-folder-thread.h
+++ b/camel/camel-folder-thread.h
@@ -65,4 +65,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.c b/camel/camel-folder.c
index c21c735c5..be880105c 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -406,7 +406,7 @@ folder_getv(CamelObject *object, CamelException *ex, CamelArgGetV *args)
 								deleted++;
 							if (flags & CAMEL_MESSAGE_JUNK) {
 								junked++;
-								if (! (flags & CAMEL_MESSAGE_DELETED))
+								if (!(flags & CAMEL_MESSAGE_DELETED))
 									junked_not_deleted++;
 							}
 							if ((flags & (CAMEL_MESSAGE_DELETED|CAMEL_MESSAGE_JUNK)) == 0)
diff --git a/camel/camel-folder.h b/camel/camel-folder.h
index 4a9c1a96f..e847d92c6 100644
--- a/camel/camel-folder.h
+++ b/camel/camel-folder.h
@@ -233,7 +233,7 @@ void               camel_folder_refresh_info           (CamelFolder *folder,
 void               camel_folder_sync                   (CamelFolder *folder,
 							gboolean expunge,
 							CamelException *ex);
-void		   camel_folder_set_lock_async 	       (CamelFolder *folder, 
+void		   camel_folder_set_lock_async 	       (CamelFolder *folder,
 							gboolean async);
 
 CamelStore *       camel_folder_get_parent_store       (CamelFolder *folder);
diff --git a/camel/camel-html-parser.h b/camel/camel-html-parser.h
index 264965618..c79241039 100644
--- a/camel/camel-html-parser.h
+++ b/camel/camel-html-parser.h
@@ -79,4 +79,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-iconv.c b/camel/camel-iconv.c
index 2533d1f70..926bc929a 100644
--- a/camel/camel-iconv.c
+++ b/camel/camel-iconv.c
@@ -256,7 +256,7 @@ locale_parse_lang (const gchar *locale)
 	}
 }
 
-/* NOTE: Owns the lock on return if keep is TRUE ! */
+/* NOTE: Owns the lock on return if keep is TRUE !*/
 static void
 camel_iconv_init(gint keep)
 {
diff --git a/camel/camel-index.h b/camel/camel-index.h
index 7b074f4b5..3d4f0e29d 100644
--- a/camel/camel-index.h
+++ b/camel/camel-index.h
@@ -166,4 +166,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 c214c9a73..3c6967664 100644
--- a/camel/camel-internet-address.h
+++ b/camel/camel-internet-address.h
@@ -57,4 +57,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-list-utils.c b/camel/camel-list-utils.c
index bf9489bcb..86606acca 100644
--- a/camel/camel-list-utils.c
+++ b/camel/camel-list-utils.c
@@ -221,7 +221,7 @@ camel_slist_remove (CamelSList *l, CamelSListNode *n)
 	CamelSListNode *p, *q;
 
 	p = (CamelSListNode *)l;
-	while ( (q = p->next) ) {
+	while ((q = p->next)) {
 		if (q == n) {
 			p->next = n->next;
 			return n;
diff --git a/camel/camel-lock-client.c b/camel/camel-lock-client.c
index 5c9bf8a6b..33c72ee8e 100644
--- a/camel/camel-lock-client.c
+++ b/camel/camel-lock-client.c
@@ -214,7 +214,7 @@ again:
 		default:
 			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
 					     _("Could not lock '%s'"), path);
-			d(printf("locking failed ! status = %d\n", msg->id));
+			d(printf("locking failed !status = %d\n", msg->id));
 			break;
 		}
 	} else if (retry > 0) {
@@ -289,7 +289,7 @@ again:
 			res = 0;
 			break;
 		default:
-			d(printf("locking failed ! \n"));
+			d(printf("locking failed !\n"));
 			break;
 		}
 	} else if (retry > 0) {
diff --git a/camel/camel-lock-client.h b/camel/camel-lock-client.h
index a343326ee..0a99bedde 100644
--- a/camel/camel-lock-client.h
+++ b/camel/camel-lock-client.h
@@ -33,4 +33,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 4fb495db2..9582e58f1 100644
--- a/camel/camel-lock-helper.h
+++ b/camel/camel-lock-helper.h
@@ -61,4 +61,4 @@ enum {
 
 G_END_DECLS
 
-#endif /* !_CAMEL_LOCK_HELPER_H */
+#endif /* _CAMEL_LOCK_HELPER_H */
diff --git a/camel/camel-lock.c b/camel/camel-lock.c
index 7ebd3ccdc..d584791e0 100644
--- a/camel/camel-lock.c
+++ b/camel/camel-lock.c
@@ -143,7 +143,7 @@ camel_lock_dot(const gchar *path, CamelException *ex)
 
 	camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Timed out trying to get lock file on %s. Try again later."), path);
 	return -1;
-#else /* ! USE_DOT */
+#else /* !USE_DOT */
 	return 0;
 #endif
 }
diff --git a/camel/camel-lock.h b/camel/camel-lock.h
index 1fa23a1b3..8e3e78f00 100644
--- a/camel/camel-lock.h
+++ b/camel/camel-lock.h
@@ -55,4 +55,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-mime-filter-basic.h b/camel/camel-mime-filter-basic.h
index 1a77993fe..81ac4ddcb 100644
--- a/camel/camel-mime-filter-basic.h
+++ b/camel/camel-mime-filter-basic.h
@@ -63,4 +63,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 2fa499a22..d978b3514 100644
--- a/camel/camel-mime-filter-bestenc.h
+++ b/camel/camel-mime-filter-bestenc.h
@@ -90,4 +90,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 af931d2fc..edb661c63 100644
--- a/camel/camel-mime-filter-canon.h
+++ b/camel/camel-mime-filter-canon.h
@@ -57,4 +57,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 1948d079e..9c2db10e1 100644
--- a/camel/camel-mime-filter-charset.h
+++ b/camel/camel-mime-filter-charset.h
@@ -54,4 +54,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 ec1f5a143..bb4b48d9a 100644
--- a/camel/camel-mime-filter-crlf.h
+++ b/camel/camel-mime-filter-crlf.h
@@ -64,4 +64,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-from.h b/camel/camel-mime-filter-from.h
index 3ec0f2377..b4b3f0d1f 100644
--- a/camel/camel-mime-filter-from.h
+++ b/camel/camel-mime-filter-from.h
@@ -48,4 +48,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-html.h b/camel/camel-mime-filter-html.h
index abe71feaf..210d268c6 100644
--- a/camel/camel-mime-filter-html.h
+++ b/camel/camel-mime-filter-html.h
@@ -48,4 +48,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 a39369f38..a55ac36cf 100644
--- a/camel/camel-mime-filter-index.h
+++ b/camel/camel-mime-filter-index.h
@@ -56,4 +56,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 fada920fe..302d86c57 100644
--- a/camel/camel-mime-filter-linewrap.h
+++ b/camel/camel-mime-filter-linewrap.h
@@ -58,4 +58,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 852d15c1b..2da1b157a 100644
--- a/camel/camel-mime-filter-pgp.h
+++ b/camel/camel-mime-filter-pgp.h
@@ -46,4 +46,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.h b/camel/camel-mime-filter.h
index 484982939..b36b8d212 100644
--- a/camel/camel-mime-filter.h
+++ b/camel/camel-mime-filter.h
@@ -86,4 +86,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.c b/camel/camel-mime-message.c
index 11005d973..ca5e336d2 100644
--- a/camel/camel-mime-message.c
+++ b/camel/camel-mime-message.c
@@ -1179,7 +1179,7 @@ find_attachment (CamelMimeMessage *msg, CamelMimePart *part, gpointer data)
 		}
 	}
 
-	return ! (*found);
+	return !(*found);
 }
 
 /**
diff --git a/camel/camel-mime-parser.c b/camel/camel-mime-parser.c
index e851ee7c6..b527d19e2 100644
--- a/camel/camel-mime-parser.c
+++ b/camel/camel-mime-parser.c
@@ -1585,7 +1585,7 @@ tail_recurse:
 #else
 	case CAMEL_MIME_PARSER_STATE_INITIAL:
 	case CAMEL_MIME_PARSER_STATE_PRE_FROM:
-#endif /* !USE_FROM */
+#endif /* USE_FROM */
 
 	scan_header:
 	case CAMEL_MIME_PARSER_STATE_FROM:
diff --git a/camel/camel-mime-parser.h b/camel/camel-mime-parser.h
index c07871299..8d3ad79a7 100644
--- a/camel/camel-mime-parser.h
+++ b/camel/camel-mime-parser.h
@@ -139,4 +139,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-utils.c b/camel/camel-mime-utils.c
index d3abbd23e..51cb65471 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -3314,7 +3314,7 @@ header_encode_param (const guchar *in, gboolean *encoded, gboolean is_filename)
 	out = g_string_new (charset);
 	g_string_append(out, "''");
 
-	while ( (c = *inptr++) ) {
+	while ((c = *inptr++)) {
 		if (camel_mime_is_attrchar(c))
 			g_string_append_c (out, c);
 		else
@@ -4234,7 +4234,7 @@ camel_header_location_decode(const gchar *in)
 		quote = 1;
 	}
 
-	while ( (c = *in++) ) {
+	while ((c = *in++)) {
 		if (quote && c=='"')
 			break;
 		if (!camel_mime_is_lwsp(c))
diff --git a/camel/camel-mime-utils.h b/camel/camel-mime-utils.h
index 722576e83..67ba101c9 100644
--- a/camel/camel-mime-utils.h
+++ b/camel/camel-mime-utils.h
@@ -283,4 +283,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-news-address.h b/camel/camel-news-address.h
index 5f6b90c1e..2e2bcd5ca 100644
--- a/camel/camel-news-address.h
+++ b/camel/camel-news-address.h
@@ -49,6 +49,6 @@ CamelNewsAddress      *camel_news_address_new	(void);
 
 G_END_DECLS
 
-#endif /* ! _CAMEL_NEWS_ADDRESS_H */
+#endif /* _CAMEL_NEWS_ADDRESS_H */
 
 #endif /* CAMEL_DISABLE_DEPRECATED */
diff --git a/camel/camel-nntp-address.h b/camel/camel-nntp-address.h
index 2dde5d80a..34ad9d372 100644
--- a/camel/camel-nntp-address.h
+++ b/camel/camel-nntp-address.h
@@ -51,4 +51,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-partition-table.c b/camel/camel-partition-table.c
index f721a341b..bec514ba1 100644
--- a/camel/camel-partition-table.c
+++ b/camel/camel-partition-table.c
@@ -179,7 +179,7 @@ static CamelBlock *find_partition(CamelPartitionTable *cpi, camel_hash_t id, gin
 		bl = bl->next;
 	}
 
-	g_warning("could not find a partition that could fit !  partition table corrupt!");
+	g_warning("could not find a partition that could fit !partition table corrupt!");
 
 	/* This should never be reached */
 
diff --git a/camel/camel-partition-table.h b/camel/camel-partition-table.h
index 92c441934..4bfcd98b9 100644
--- a/camel/camel-partition-table.h
+++ b/camel/camel-partition-table.h
@@ -153,4 +153,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-search-private.h b/camel/camel-search-private.h
index 3ab4fd2e7..e927e41a3 100644
--- a/camel/camel-search-private.h
+++ b/camel/camel-search-private.h
@@ -89,4 +89,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 acce35cbc..56078bafe 100644
--- a/camel/camel-search-sql-sexp.h
+++ b/camel/camel-search-sql-sexp.h
@@ -29,4 +29,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 f7421d33e..ba741c142 100644
--- a/camel/camel-search-sql.h
+++ b/camel/camel-search-sql.h
@@ -28,4 +28,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-store-summary.c b/camel/camel-store-summary.c
index 48eb2bdf5..41807b8e4 100644
--- a/camel/camel-store-summary.c
+++ b/camel/camel-store-summary.c
@@ -430,7 +430,7 @@ camel_store_summary_save(CamelStoreSummary *s)
 	}
 
 	out = fdopen(fd, "wb");
-	if ( out == NULL ) {
+	if (out == NULL) {
 		i = errno;
 		printf("**  fdopen error: %s\n", g_strerror (errno));
 		close(fd);
diff --git a/camel/camel-store-summary.h b/camel/camel-store-summary.h
index 1a79f004e..a04247867 100644
--- a/camel/camel-store-summary.h
+++ b/camel/camel-store-summary.h
@@ -180,4 +180,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-stream-filter.h b/camel/camel-stream-filter.h
index e8b170153..05ee7ffa7 100644
--- a/camel/camel-stream-filter.h
+++ b/camel/camel-stream-filter.h
@@ -54,4 +54,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-null.h b/camel/camel-stream-null.h
index 46e3d3b78..d443a9d26 100644
--- a/camel/camel-stream-null.h
+++ b/camel/camel-stream-null.h
@@ -48,4 +48,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 4c435cd0a..68fa1015d 100644
--- a/camel/camel-stream-process.h
+++ b/camel/camel-stream-process.h
@@ -50,4 +50,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-text-index.c b/camel/camel-text-index.c
index 8b9bb422b..5dce85a1f 100644
--- a/camel/camel-text-index.c
+++ b/camel/camel-text-index.c
@@ -280,7 +280,7 @@ text_index_sync(CamelIndex *idx)
 
 	work = !camel_dlist_empty(&p->word_cache);
 
-	while ( (ww = (struct _CamelTextIndexWord *)camel_dlist_remhead(&p->word_cache)) ) {
+	while ((ww = (struct _CamelTextIndexWord *)camel_dlist_remhead(&p->word_cache))) {
 		if (ww->used > 0) {
 			io(printf("writing key file entry '%s' [%x]\n", ww->word, ww->data));
 			if (camel_key_file_write(p->links, &ww->data, ww->used, ww->names) != -1) {
@@ -415,7 +415,7 @@ text_index_compress_nosync(CamelIndex *idx)
 	remap = g_hash_table_new(NULL, NULL);
 	oldkeyid = 0;
 	deleted = 0;
-	while ( (oldkeyid = camel_key_table_next(oldp->name_index, oldkeyid, &name, &flags, &data)) ) {
+	while ((oldkeyid = camel_key_table_next(oldp->name_index, oldkeyid, &name, &flags, &data))) {
 		if ((flags&1) == 0) {
 			io(printf("copying name '%s'\n", name));
 			newkeyid = camel_key_table_add(newp->name_index, name, data, flags);
@@ -436,7 +436,7 @@ text_index_compress_nosync(CamelIndex *idx)
 	/* We re-block the data into 256 entry lots while we're at it, since we only
 	   have to do 1 at a time and its cheap */
 	oldkeyid = 0;
-	while ( (oldkeyid = camel_key_table_next(oldp->word_index, oldkeyid, &name, &flags, &data)) ) {
+	while ((oldkeyid = camel_key_table_next(oldp->word_index, oldkeyid, &name, &flags, &data))) {
 		io(printf("copying word '%s'\n", name));
 		newdata = 0;
 		newcount = 0;
@@ -1210,7 +1210,7 @@ camel_text_index_dump(CamelTextIndex *idx)
 	printf("UID's in index\n");
 
 	keyid = 0;
-	while ( (keyid = camel_key_table_next(p->name_index, keyid, &word, &flags, &data)) ) {
+	while ((keyid = camel_key_table_next(p->name_index, keyid, &word, &flags, &data))) {
 		if ((flags & 1) == 0)
 			printf(" %s\n", word);
 		else
@@ -1221,13 +1221,13 @@ camel_text_index_dump(CamelTextIndex *idx)
 	printf("Word's in index\n");
 
 	keyid = 0;
-	while ( (keyid = camel_key_table_next(p->word_index, keyid, &word, &flags, &data)) ) {
+	while ((keyid = camel_key_table_next(p->word_index, keyid, &word, &flags, &data))) {
 		CamelIndexCursor *idc;
 
 		printf("Word: '%s':\n", word);
 
 		idc = camel_index_find((CamelIndex *)idx, word);
-		while ( (name = camel_index_cursor_next(idc)) ) {
+		while ((name = camel_index_cursor_next(idc))) {
 			printf(" %s", name);
 		}
 		printf("\n");
@@ -1283,7 +1283,7 @@ camel_text_index_validate(CamelTextIndex *idx)
 	printf("Checking UID consistency\n");
 
 	keyid = 0;
-	while ( (keyid = camel_key_table_next(p->name_index, keyid, &word, &flags, &data)) ) {
+	while ((keyid = camel_key_table_next(p->name_index, keyid, &word, &flags, &data))) {
 		if ((oldword = g_hash_table_lookup(names, GINT_TO_POINTER(keyid))) != NULL
 		    || (oldword = g_hash_table_lookup(deleted, GINT_TO_POINTER(keyid))) != NULL) {
 			printf("Warning, name '%s' duplicates key (%x) with name '%s'\n", word, keyid, oldword);
@@ -1301,7 +1301,7 @@ camel_text_index_validate(CamelTextIndex *idx)
 	printf("Checking WORD member consistency\n");
 
 	keyid = 0;
-	while ( (keyid = camel_key_table_next(p->word_index, keyid, &word, &flags, &data)) ) {
+	while ((keyid = camel_key_table_next(p->word_index, keyid, &word, &flags, &data))) {
 		CamelIndexCursor *idc;
 		GHashTable *used;
 
@@ -1335,7 +1335,7 @@ camel_text_index_validate(CamelTextIndex *idx)
 		used = g_hash_table_new(g_str_hash, g_str_equal);
 
 		idc = camel_index_find((CamelIndex *)idx, word);
-		while ( (name = camel_index_cursor_next(idc)) ) {
+		while ((name = camel_index_cursor_next(idc))) {
 			if (g_hash_table_lookup(name_word, name) == NULL) {
 				printf("word '%s' references non-existant name '%s'\n", word, name);
 			}
@@ -1412,7 +1412,7 @@ camel_utf8_next(const guchar **ptr, const guchar *ptrend)
 	if (p == ptrend)
 		return 0;
 
-	while ( (c = *p++) ) {
+	while ((c = *p++)) {
 		if (c < 0x80) {
 			*ptr = p;
 			return c;
@@ -1705,7 +1705,7 @@ text_index_key_cursor_next(CamelIndexCursor *idc)
 	g_free(p->current);
 	p->current = NULL;
 
-	while ( (p->keyid = camel_key_table_next(p->table, p->keyid, &p->current, &p->flags, &p->data)) ) {
+	while ((p->keyid = camel_key_table_next(p->table, p->keyid, &p->current, &p->flags, &p->data))) {
 		if ((p->flags & 1) == 0) {
 			return p->current;
 		} else {
@@ -1862,7 +1862,7 @@ gint main(gint argc, gchar **argv)
 
 	printf("Looking up which names contain word 'word'\n");
 	idc = camel_index_find(idx, "words");
-	while ( (word = camel_index_cursor_next(idc)) != NULL ) {
+	while ((word = camel_index_cursor_next(idc)) != NULL) {
 		printf(" name is '%s'\n", word);
 	}
 	camel_object_unref((CamelObject *)idc);
@@ -1870,7 +1870,7 @@ gint main(gint argc, gchar **argv)
 
 	printf("Looking up which names contain word 'truncate'\n");
 	idc = camel_index_find(idx, "truncate");
-	while ( (word = camel_index_cursor_next(idc)) != NULL ) {
+	while ((word = camel_index_cursor_next(idc)) != NULL) {
 		printf(" name is '%s'\n", word);
 	}
 	camel_object_unref((CamelObject *)idc);
diff --git a/camel/camel-text-index.h b/camel/camel-text-index.h
index 01b007887..187a1567b 100644
--- a/camel/camel-text-index.h
+++ b/camel/camel-text-index.h
@@ -114,4 +114,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-utf8.c b/camel/camel-utf8.c
index 44c5426b9..4e6da152f 100644
--- a/camel/camel-utf8.c
+++ b/camel/camel-utf8.c
@@ -306,7 +306,7 @@ camel_utf8_utf7(const gchar *ptr)
 
 	out = g_string_new("");
 
-	while ( (c = camel_utf8_getc(&p)) ) {
+	while ((c = camel_utf8_getc(&p))) {
 		if (c >= 0x20 && c <= 0x7e) {
 			if (state == 1) {
 				utf7_closeb64(out, v, i);
@@ -360,7 +360,7 @@ camel_utf8_ucs2(const gchar *pptr)
 
 	/* what if c is > 0xffff ? */
 
-	while ( (c = camel_utf8_getc(&ptr)) ) {
+	while ((c = camel_utf8_getc(&ptr))) {
 		guint16 s = g_htons(c);
 
 		g_byte_array_append(work, (guchar *) &s, 2);
@@ -390,7 +390,7 @@ gchar *camel_ucs2_utf8(const gchar *ptr)
 	GString *work = g_string_new("");
 	gchar *out;
 
-	while ( (c = *ucs++) )
+	while ((c = *ucs++))
 		g_string_append_u(work, g_ntohs(c));
 
 	out = g_strdup(work->str);
diff --git a/camel/camel-utf8.h b/camel/camel-utf8.h
index 24c722136..63f251e95 100644
--- a/camel/camel-utf8.h
+++ b/camel/camel-utf8.h
@@ -45,4 +45,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.c b/camel/camel-vee-folder.c
index 903fa98f5..e98fe83fb 100644
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -2078,7 +2078,7 @@ vf_getv(CamelObject *object, CamelException *ex, CamelArgGetV *args)
 							deleted++;
 						if (flags & CAMEL_MESSAGE_JUNK) {
 							junked++;
-								if (! (flags & CAMEL_MESSAGE_DELETED))
+								if (!(flags & CAMEL_MESSAGE_DELETED))
 									junked_not_deleted++;
 						}
 						if ((flags & (CAMEL_MESSAGE_DELETED|CAMEL_MESSAGE_JUNK)) == 0)
diff --git a/camel/camel-vee-folder.h b/camel/camel-vee-folder.h
index 7a38428a3..0778f38b8 100644
--- a/camel/camel-vee-folder.h
+++ b/camel/camel-vee-folder.h
@@ -94,4 +94,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 ecbd2a07d..19215601f 100644
--- a/camel/camel-vee-store.h
+++ b/camel/camel-vee-store.h
@@ -55,4 +55,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 4718727c1..fcafadbfe 100644
--- a/camel/camel-vee-summary.h
+++ b/camel/camel-vee-summary.h
@@ -66,5 +66,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.c b/camel/camel-vtrash-folder.c
index 2383e03bd..6e43edc1b 100644
--- a/camel/camel-vtrash-folder.c
+++ b/camel/camel-vtrash-folder.c
@@ -159,7 +159,7 @@ vtrash_getv(CamelObject *object, CamelException *ex, CamelArgGetV *args)
 							deleted++;
 						if (flags & CAMEL_MESSAGE_JUNK) {
 							junked++;
-								if (! (flags & CAMEL_MESSAGE_DELETED))
+								if (!(flags & CAMEL_MESSAGE_DELETED))
 									junked_not_deleted++;
 						}
 						if ((flags & (CAMEL_MESSAGE_DELETED|CAMEL_MESSAGE_JUNK)) == 0)
diff --git a/camel/camel-vtrash-folder.h b/camel/camel-vtrash-folder.h
index 815327da1..070719071 100644
--- a/camel/camel-vtrash-folder.h
+++ b/camel/camel-vtrash-folder.h
@@ -62,4 +62,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/db-scrap-tools/db.c b/camel/db-scrap-tools/db.c
index bf97c059d..dcd73a539 100644
--- a/camel/db-scrap-tools/db.c
+++ b/camel/db-scrap-tools/db.c
@@ -82,7 +82,7 @@ gint main(gint argc, gchar **argv) {
 //	rc = sqlite3_open_v2("test.db", &db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE , NULL);
 	rc = sqlite3_open("test.db", &db);
 
-	if ( rc ) {
+	if (rc) {
 		fprintf(stderr, "Can't open database: %s\n", sqlite3_errmsg(db));
 		sqlite3_close(db);
 		exit(1);
diff --git a/camel/providers/groupwise/camel-groupwise-folder.c b/camel/providers/groupwise/camel-groupwise-folder.c
index 61d6dff60..a973c0dbc 100644
--- a/camel/providers/groupwise/camel-groupwise-folder.c
+++ b/camel/providers/groupwise/camel-groupwise-folder.c
@@ -1351,7 +1351,7 @@ groupwise_refresh_folder(CamelFolder *folder, CamelException *ex)
 	if (!is_proxy) {
 		const gchar *source;
 
-		if ( !strcmp (folder->full_name, RECEIVED) || !strcmp(folder->full_name, SENT) ) {
+		if (!strcmp (folder->full_name, RECEIVED) || !strcmp(folder->full_name, SENT)) {
 			source = NULL;
 		} else {
 			source = "sent received";
@@ -2161,7 +2161,7 @@ groupwise_folder_item_to_msg( CamelFolder *folder,
 			     !g_ascii_strcasecmp (attach->name, "meeting.ics")) && (attach->hidden == TRUE))
 				continue;
 
-			if ( (attach->item_reference) && (!g_ascii_strcasecmp (attach->item_reference, "1")) ) {
+			if ((attach->item_reference) && (!g_ascii_strcasecmp (attach->item_reference, "1"))) {
 				CamelMimeMessage *temp_msg = NULL;
 				status = e_gw_connection_get_item (cnc, container_id, attach->id, GET_ITEM_VIEW_WITH_CACHE, &temp_item);
 				if (status != E_GW_CONNECTION_STATUS_OK) {
@@ -2502,7 +2502,7 @@ groupwise_transfer_messages_to (CamelFolder *source, GPtrArray *uids,
 				break;
 
 			if (delete_originals) {
-				if ( !strcmp(source->full_name, SENT) ) {
+				if (!strcmp(source->full_name, SENT)) {
 					camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
 							_("This message is not available in offline mode."));
 
diff --git a/camel/providers/groupwise/camel-groupwise-store-summary.c b/camel/providers/groupwise/camel-groupwise-store-summary.c
index 8b833bf35..32b194e15 100644
--- a/camel/providers/groupwise/camel-groupwise-store-summary.c
+++ b/camel/providers/groupwise/camel-groupwise-store-summary.c
@@ -146,7 +146,7 @@ camel_groupwise_store_summary_full_to_path(CamelGroupwiseStoreSummary *s, const
 	if (dir_sep != '/') {
 		p = path = alloca(strlen(full_name)*3+1);
 		f = full_name;
-		while ( (c = *f++ & 0xff) ) {
+		while ((c = *f++ & 0xff)) {
 			if (c == dir_sep)
 				*p++ = '/';
 			else if (c == '/' || c == '%')
@@ -258,7 +258,7 @@ camel_groupwise_store_summary_path_to_full(CamelGroupwiseStoreSummary *s, const
 	else
 		p = path;
 
-	while ( (c = camel_utf8_getc((const guchar **)&p)) ) {
+	while ((c = camel_utf8_getc((const guchar **)&p))) {
 		switch (state) {
 			case 0:
 				if (c == '%')
diff --git a/camel/providers/groupwise/camel-groupwise-store-summary.h b/camel/providers/groupwise/camel-groupwise-store-summary.h
index 41ea304af..642bf2a65 100644
--- a/camel/providers/groupwise/camel-groupwise-store-summary.h
+++ b/camel/providers/groupwise/camel-groupwise-store-summary.h
@@ -86,4 +86,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 90aa3eec8..10121a837 100644
--- a/camel/providers/groupwise/camel-groupwise-store.c
+++ b/camel/providers/groupwise/camel-groupwise-store.c
@@ -1002,7 +1002,7 @@ groupwise_folders_sync (CamelGroupwiseStore *store, CamelException *ex)
 
 		if (e_gw_container_is_root(container))
 			continue;
-		if ( (type == E_GW_CONTAINER_TYPE_CALENDAR) || (type == E_GW_CONTAINER_TYPE_CONTACTS) )
+		if ((type == E_GW_CONTAINER_TYPE_CALENDAR) || (type == E_GW_CONTAINER_TYPE_CONTACTS))
 			continue;
 
 		info = convert_to_folder_info (store, E_GW_CONTAINER (folder_list->data), (const gchar *)url, ex);
diff --git a/camel/providers/groupwise/camel-groupwise-utils.c b/camel/providers/groupwise/camel-groupwise-utils.c
index 8a4864129..ca52f369b 100644
--- a/camel/providers/groupwise/camel-groupwise-utils.c
+++ b/camel/providers/groupwise/camel-groupwise-utils.c
@@ -177,7 +177,7 @@ find_folders_recursive (const gchar *physical_path, const gchar *path,
 		file_path = g_strdup_printf ("%s/%s", subfolder_directory_path, dirent);
 
 		if (g_stat (file_path, &file_stat) < 0 ||
-		    ! S_ISDIR (file_stat.st_mode)) {
+		    !S_ISDIR (file_stat.st_mode)) {
 			g_free (file_path);
 			continue;
 		}
diff --git a/camel/providers/imap/camel-imap-search.c b/camel/providers/imap/camel-imap-search.c
index eadef34d2..8f7dfb34a 100644
--- a/camel/providers/imap/camel-imap-search.c
+++ b/camel/providers/imap/camel-imap-search.c
@@ -123,7 +123,7 @@ camel_imap_search_finalise(CamelImapSearch *is)
 {
 	struct _match_record *mr;
 
-	while ( (mr = (struct _match_record *)camel_dlist_remtail(&is->matches)) )
+	while ((mr = (struct _match_record *)camel_dlist_remtail(&is->matches)))
 		free_match(is, mr);
 	g_hash_table_destroy(is->matches_hash);
 	if (is->cache)
diff --git a/camel/providers/imap/camel-imap-search.h b/camel/providers/imap/camel-imap-search.h
index afe4e2bbc..039db8a67 100644
--- a/camel/providers/imap/camel-imap-search.h
+++ b/camel/providers/imap/camel-imap-search.h
@@ -63,4 +63,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 ac0c223ea..421606036 100644
--- a/camel/providers/imap/camel-imap-store-summary.c
+++ b/camel/providers/imap/camel-imap-store-summary.c
@@ -177,7 +177,7 @@ camel_imap_store_summary_full_to_path(CamelImapStoreSummary *s, const gchar *ful
 	if (dir_sep != '/') {
 		p = path = alloca(strlen(full_name)*3+1);
 		f = full_name;
-		while ( (c = *f++ & 0xff) ) {
+		while ((c = *f++ & 0xff)) {
 			if (c == dir_sep)
 				*p++ = '/';
 			else if (c == '/' || c == '%')
diff --git a/camel/providers/imap/camel-imap-store-summary.h b/camel/providers/imap/camel-imap-store-summary.h
index fe5123a0f..b3f4a32b2 100644
--- a/camel/providers/imap/camel-imap-store-summary.h
+++ b/camel/providers/imap/camel-imap-store-summary.h
@@ -95,4 +95,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-summary.h b/camel/providers/imap/camel-imap-summary.h
index 414543547..2de45be8f 100644
--- a/camel/providers/imap/camel-imap-summary.h
+++ b/camel/providers/imap/camel-imap-summary.h
@@ -82,4 +82,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 e6f6a3c9e..89ff01ad9 100644
--- a/camel/providers/imap/camel-imap-utils.c
+++ b/camel/providers/imap/camel-imap-utils.c
@@ -1448,7 +1448,7 @@ find_folders_recursive (const gchar *physical_path, const gchar *path,
 					     dirent);
 
 		if (g_stat (file_path, &file_stat) < 0 ||
-		    ! S_ISDIR (file_stat.st_mode)) {
+		    !S_ISDIR (file_stat.st_mode)) {
 			g_free (file_path);
 			continue;
 		}
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index 1460f7d0a..27a2f25c3 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -467,7 +467,7 @@ imapx_command_addv(CamelIMAPXCommand *ic, const gchar *fmt, va_list ap)
 
 	p = fmt;
 	ps = fmt;
-	while ( ( c = *p++ ) ) {
+	while (( c = *p++ )) {
 		switch (c) {
 		case '%':
 			if (*p == '%') {
@@ -663,7 +663,7 @@ camel_imapx_command_free(CamelIMAPXCommand *ic)
 	imap_free_status(ic->status);
 	g_free(ic->select);
 
-	while ( (cp = ((CamelIMAPXCommandPart *)camel_dlist_remhead(&ic->parts))) ) {
+	while ((cp = ((CamelIMAPXCommandPart *)camel_dlist_remhead(&ic->parts)))) {
 		g_free(cp->data);
 		if (cp->ob) {
 			switch (cp->type & CAMEL_IMAPX_COMMAND_MASK) {
@@ -3031,7 +3031,7 @@ imapx_parser_thread (gpointer d)
 	op = camel_operation_new (NULL, NULL);
 	op = camel_operation_register (op);
 	while (TRUE) {
-		
+
 		CAMEL_SERVICE_REC_LOCK (is->store, connect_lock);
 		if (!is->stream)
 			imapx_reconnect(is, &ex);
diff --git a/camel/providers/imapx/camel-imapx-server.h b/camel/providers/imapx/camel-imapx-server.h
index 6d8849182..856238dcf 100644
--- a/camel/providers/imapx/camel-imapx-server.h
+++ b/camel/providers/imapx/camel-imapx-server.h
@@ -116,4 +116,4 @@ void camel_imapx_server_noop (CamelIMAPXServer *is, CamelFolder *folder, CamelEx
 CamelStream *camel_imapx_server_get_message(CamelIMAPXServer *is, CamelFolder *folder, const gchar *uid, struct _CamelException *ex);
 void camel_imapx_server_append_message(CamelIMAPXServer *is, CamelFolder *folder, struct _CamelMimeMessage *message, const struct _CamelMessageInfo *mi, 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 1b236aef5..01ec3076c 100644
--- a/camel/providers/imapx/camel-imapx-store-summary.c
+++ b/camel/providers/imapx/camel-imapx-store-summary.c
@@ -177,7 +177,7 @@ camel_imapx_store_summary_full_to_path(CamelIMAPXStoreSummary *s, const gchar *f
 	if (dir_sep != '/') {
 		p = path = alloca(strlen(full_name)*3+1);
 		f = full_name;
-		while ( (c = *f++ & 0xff) ) {
+		while ((c = *f++ & 0xff)) {
 			if (c == dir_sep)
 				*p++ = '/';
 			else if (c == '/' || c == '%')
diff --git a/camel/providers/imapx/camel-imapx-store-summary.h b/camel/providers/imapx/camel-imapx-store-summary.h
index 0eeca45f7..67f4004a2 100644
--- a/camel/providers/imapx/camel-imapx-store-summary.h
+++ b/camel/providers/imapx/camel-imapx-store-summary.h
@@ -102,4 +102,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-stream.h b/camel/providers/imapx/camel-imapx-stream.h
index a98ff6dad..8a8ce67d9 100644
--- a/camel/providers/imapx/camel-imapx-stream.h
+++ b/camel/providers/imapx/camel-imapx-stream.h
@@ -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.h b/camel/providers/imapx/camel-imapx-summary.h
index 06f5b29f1..f6078b6cf 100644
--- a/camel/providers/imapx/camel-imapx-summary.h
+++ b/camel/providers/imapx/camel-imapx-summary.h
@@ -80,4 +80,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 b5707af39..5c0e16f77 100644
--- a/camel/providers/imapx/camel-imapx-utils.c
+++ b/camel/providers/imapx/camel-imapx-utils.c
@@ -1364,7 +1364,7 @@ imap_parse_fetch(CamelIMAPXStream *is, CamelException *ex)
 		return NULL;
 	}
 
-	while ( (tok = camel_imapx_stream_token(is, &token, &len, ex)) == IMAP_TOK_TOKEN ) {
+	while ((tok = camel_imapx_stream_token(is, &token, &len, ex)) == IMAP_TOK_TOKEN) {
 
 		p = token;
 		while ((c=*p))
@@ -1469,7 +1469,7 @@ imap_parse_status_info (struct _CamelIMAPXStream *is, CamelException *ex)
 		return NULL;
 	}
 
-	while ( (tok = camel_imapx_stream_token(is, &token, &len, ex)) == IMAP_TOK_TOKEN ) {
+	while ((tok = camel_imapx_stream_token(is, &token, &len, ex)) == IMAP_TOK_TOKEN) {
 		switch (imap_tokenise((gchar *) token, len)) {
 			case IMAP_MESSAGES:
 				sinfo->messages = camel_imapx_stream_number (is, ex);
@@ -1669,7 +1669,7 @@ imap_parse_list(CamelIMAPXStream *is, CamelException *ex)
 		return NULL;
 	}
 
-	while ( (tok = camel_imapx_stream_token(is, &token, &len, ex)) != ')' ) {
+	while ((tok = camel_imapx_stream_token(is, &token, &len, ex)) != ')') {
 		if (tok == IMAP_TOK_STRING || tok == IMAP_TOK_TOKEN) {
 			p = token;
 			while ((c=*p))
@@ -1702,7 +1702,7 @@ imapx_list_get_path(struct _list_info *li)
 	if (li->separator != 0 && li->separator != '/') {
 		p = path = alloca(strlen(li->name)*3+1);
 		f = li->name;
-		while ( (c = *f++ & 0xff) ) {
+		while ((c = *f++ & 0xff)) {
 			if (c == li->separator)
 				*p++ = '/';
 			else if (c == '/' || c == '%')
diff --git a/camel/providers/imapx/camel-imapx-view-summary.h b/camel/providers/imapx/camel-imapx-view-summary.h
index 5c30bbdac..eb33ccdef 100644
--- a/camel/providers/imapx/camel-imapx-view-summary.h
+++ b/camel/providers/imapx/camel-imapx-view-summary.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/local/camel-local-summary.h b/camel/providers/local/camel-local-summary.h
index f9cdcd1ca..0cd8a3a2c 100644
--- a/camel/providers/local/camel-local-summary.h
+++ b/camel/providers/local/camel-local-summary.h
@@ -97,4 +97,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-store.c b/camel/providers/local/camel-maildir-store.c
index 4921794e4..c1ca64a0a 100644
--- a/camel/providers/local/camel-maildir-store.c
+++ b/camel/providers/local/camel-maildir-store.c
@@ -247,7 +247,7 @@ static void delete_folder(CamelStore * store, const gchar *folder_name, CamelExc
 			/* for tmp (only), its contents is irrelevant */
 			dir = opendir(tmp);
 			if (dir) {
-				while ( (d=readdir(dir)) ) {
+				while ((d=readdir(dir))) {
 					gchar *name = d->d_name, *file;
 
 					if (!strcmp(name, ".") || !strcmp(name, ".."))
@@ -442,7 +442,7 @@ scan_dirs(CamelStore *store, guint32 flags, CamelFolderInfo *topfi, CamelURL *ur
 			goto fail;
 		}
 
-		while ( (d = readdir(dir)) ) {
+		while ((d = readdir(dir))) {
 			if (strcmp(d->d_name, "tmp") == 0
 			    || strcmp(d->d_name, "cur") == 0
 			    || strcmp(d->d_name, "new") == 0
diff --git a/camel/providers/local/camel-maildir-summary.c b/camel/providers/local/camel-maildir-summary.c
index 8cc0c9e6d..347fc7e34 100644
--- a/camel/providers/local/camel-maildir-summary.c
+++ b/camel/providers/local/camel-maildir-summary.c
@@ -438,7 +438,7 @@ static gint maildir_summary_load(CamelLocalSummary *cls, gint forceindex, CamelE
 	mds->priv->load_map = g_hash_table_new(g_str_hash, g_str_equal);
 	pool = e_mempool_new(1024, 512, E_MEMPOOL_ALIGN_BYTE);
 
-	while ( (d = readdir(dir)) ) {
+	while ((d = readdir(dir))) {
 		if (d->d_name[0] == '.')
 			continue;
 
@@ -575,11 +575,11 @@ maildir_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changes, Ca
 	/* joy, use this to pre-count the total, so we can report progress meaningfully */
 	total = 0;
 	count = 0;
-	while ( (d = readdir(dir)) )
+	while ((d = readdir(dir)))
 		total++;
 	rewinddir(dir);
 
-	while ( (d = readdir(dir)) ) {
+	while ((d = readdir(dir))) {
 		gint pc = count * 100 / total;
 
 		camel_operation_progress(NULL, pc);
@@ -641,11 +641,11 @@ maildir_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changes, Ca
 	if (dir != NULL) {
 		total = 0;
 		count = 0;
-		while ( (d = readdir(dir)) )
+		while ((d = readdir(dir)))
 			total++;
 		rewinddir(dir);
 
-		while ( (d = readdir(dir)) ) {
+		while ((d = readdir(dir))) {
 			gchar *name, *newname, *destname, *destfilename;
 			gchar *src, *dest;
 			gint pc = count * 100 / total;
diff --git a/camel/providers/local/camel-maildir-summary.h b/camel/providers/local/camel-maildir-summary.h
index 223769e44..1ce6e74d6 100644
--- a/camel/providers/local/camel-maildir-summary.h
+++ b/camel/providers/local/camel-maildir-summary.h
@@ -76,4 +76,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-summary.h b/camel/providers/local/camel-mbox-summary.h
index 2fca130d6..4bd3a9212 100644
--- a/camel/providers/local/camel-mbox-summary.h
+++ b/camel/providers/local/camel-mbox-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-summary.c b/camel/providers/local/camel-mh-summary.c
index 81add3856..80d578080 100644
--- a/camel/providers/local/camel-mh-summary.c
+++ b/camel/providers/local/camel-mh-summary.c
@@ -253,10 +253,10 @@ mh_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, Came
 		}
 	}
 
-	while ( (d = readdir(dir)) ) {
+	while ((d = readdir(dir))) {
 		/* FIXME: also run stat to check for regular file */
 		p = d->d_name;
-		while ( (c = *p++) ) {
+		while ((c = *p++)) {
 			if (!isdigit(c))
 				break;
 		}
diff --git a/camel/providers/local/camel-mh-summary.h b/camel/providers/local/camel-mh-summary.h
index 81d43a868..9b8273476 100644
--- a/camel/providers/local/camel-mh-summary.h
+++ b/camel/providers/local/camel-mh-summary.h
@@ -53,4 +53,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-store.c b/camel/providers/local/camel-spool-store.c
index cfe033abd..d82a031c5 100644
--- a/camel/providers/local/camel-spool-store.c
+++ b/camel/providers/local/camel-spool-store.c
@@ -350,7 +350,7 @@ static gint scan_dir(CamelStore *store, GHashTable *visited, gchar *root, const
 		parent = fi;
 	}
 
-	while ( (d = readdir(dir)) ) {
+	while ((d = readdir(dir))) {
 		if (strcmp(d->d_name, ".") == 0
 		    || strcmp(d->d_name, "..") == 0)
 			continue;
diff --git a/camel/providers/local/camel-spool-summary.h b/camel/providers/local/camel-spool-summary.h
index f2137f1cf..2cae9026f 100644
--- a/camel/providers/local/camel-spool-summary.h
+++ b/camel/providers/local/camel-spool-summary.h
@@ -69,4 +69,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-store-summary.h b/camel/providers/nntp/camel-nntp-store-summary.h
index 15ae70506..10725f56a 100644
--- a/camel/providers/nntp/camel-nntp-store-summary.h
+++ b/camel/providers/nntp/camel-nntp-store-summary.h
@@ -92,4 +92,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 200a09dea..6e20bff61 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -1378,7 +1378,7 @@ camel_nntp_command (CamelNNTPStore *store, CamelException *ex, CamelNNTPFolder *
 		    && !camel_service_connect (CAMEL_SERVICE (store), ex))
 			return -1;
 
-		/* Check for unprocessed data, ! */
+		/* Check for unprocessed data, !*/
 		if (store->stream->mode == CAMEL_NNTP_STREAM_DATA) {
 			g_warning("Unprocessed data left in stream, flushing");
 			while (camel_nntp_stream_getd(store->stream, (guchar **)&p, &u) > 0)
diff --git a/camel/providers/nntp/camel-nntp-stream.h b/camel/providers/nntp/camel-nntp-stream.h
index 6d8ac3332..0014211eb 100644
--- a/camel/providers/nntp/camel-nntp-stream.h
+++ b/camel/providers/nntp/camel-nntp-stream.h
@@ -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.h b/camel/providers/nntp/camel-nntp-summary.h
index 3a112d211..606e861e3 100644
--- a/camel/providers/nntp/camel-nntp-summary.h
+++ b/camel/providers/nntp/camel-nntp-summary.h
@@ -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/pop3/camel-pop3-engine.c b/camel/providers/pop3/camel-pop3-engine.c
index 0bc17363d..6f647df55 100644
--- a/camel/providers/pop3/camel-pop3-engine.c
+++ b/camel/providers/pop3/camel-pop3-engine.c
@@ -364,12 +364,12 @@ camel_pop3_engine_iterate(CamelPOP3Engine *pe, CamelPOP3Command *pcwait)
 	return pe->current==NULL?0:1;
 ioerror:
 	/* we assume all outstanding commands are gunna fail now */
-	while ( (pw = (CamelPOP3Command*)camel_dlist_remhead(&pe->active)) ) {
+	while ((pw = (CamelPOP3Command*)camel_dlist_remhead(&pe->active))) {
 		pw->state = CAMEL_POP3_COMMAND_ERR;
 		camel_dlist_addtail(&pe->done, (CamelDListNode *)pw);
 	}
 
-	while ( (pw = (CamelPOP3Command*)camel_dlist_remhead(&pe->queue)) ) {
+	while ((pw = (CamelPOP3Command*)camel_dlist_remhead(&pe->queue))) {
 		pw->state = CAMEL_POP3_COMMAND_ERR;
 		camel_dlist_addtail(&pe->done, (CamelDListNode *)pw);
 	}
diff --git a/camel/providers/pop3/camel-pop3-engine.h b/camel/providers/pop3/camel-pop3-engine.h
index 6377b7508..8ebd46554 100644
--- a/camel/providers/pop3/camel-pop3-engine.h
+++ b/camel/providers/pop3/camel-pop3-engine.h
@@ -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-stream.h b/camel/providers/pop3/camel-pop3-stream.h
index a01917293..52511f93f 100644
--- a/camel/providers/pop3/camel-pop3-stream.h
+++ b/camel/providers/pop3/camel-pop3-stream.h
@@ -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/tests/lib/address-data.h b/camel/tests/lib/address-data.h
index 33d27ab18..d212fccd2 100644
--- a/camel/tests/lib/address-data.h
+++ b/camel/tests/lib/address-data.h
@@ -8,7 +8,7 @@ static struct _a {
 	gchar *addr;
 	gchar *utf8;		/* the utf8 in this table was generated by camel itself.  As a result i'm making the assumption it
 				   was right when it was created.  It also depends on the format of ::format(),. which is likely to
-				   change, to handle other bugs ! */
+				   change, to handle other bugs !*/
 } test_address[] = {
 	{ 1, "\"=?ISO-8859-1?Q?David_Guti=E9rrez_Magallanes?=\" <david@iiia.csic.es>", "David Gutiérrez Magallanes <david@iiia.csic.es>" },
 	{ 1, "\"=?iso-8859-1?Q?Jos=E9?= Antonio Milke G.\" <gerencia@ovoplus.com>", "José Antonio Milke G. <gerencia@ovoplus.com>" },