Coding style and whitespace cleanup.

100 files changed, 1497 insertions, 1487 deletions

diff --git a/addressbook/backends/file/e-book-backend-file.c b/addressbook/backends/file/e-book-backend-file.c
index 0201c5c56..80354584c 100644
--- a/addressbook/backends/file/e-book-backend-file.c
+++ b/addressbook/backends/file/e-book-backend-file.c
@@ -223,7 +223,7 @@ maybe_delete_unused_uris (EBookBackendFile *bf,
 	 * old uris for those fields from old_contact to delete
 	 */
 	uri_photo = check_remove_uri_for_field (old_contact, new_contact, E_CONTACT_PHOTO);
-	uri_logo  = check_remove_uri_for_field (old_contact, new_contact, E_CONTACT_LOGO);
+	uri_logo = check_remove_uri_for_field (old_contact, new_contact, E_CONTACT_LOGO);
 
 	if (uri_photo) {
 		maybe_delete_uri (bf, uri_photo);
@@ -329,7 +329,7 @@ safe_name_for_photo (EBookBackendFile *bf,
 	do {
 		g_free (fullname);
 
-		str      = e_filename_mkdir_encoded (bf->priv->photo_dirname, name, NULL, i);
+		str = e_filename_mkdir_encoded (bf->priv->photo_dirname, name, NULL, i);
 		fullname = g_strdup_printf ("%s.%s", str, suffix);
 		g_free (str);
 
@@ -370,7 +370,7 @@ hard_link_photo (EBookBackendFile *bf,
 	do {
 		g_free (fullname);
 
-		str      = e_filename_mkdir_encoded (bf->priv->photo_dirname, name, NULL, i);
+		str = e_filename_mkdir_encoded (bf->priv->photo_dirname, name, NULL, i);
 		fullname = g_strdup_printf ("%s.%s", str, suffix);
 		g_free (str);
 
@@ -463,8 +463,8 @@ maybe_transform_vcard_field_for_photo (EBookBackendFile *bf,
 
 			status = STATUS_ERROR;
 		} else {
-			new_photo           = e_contact_photo_new ();
-			new_photo->type     = E_CONTACT_PHOTO_TYPE_URI;
+			new_photo = e_contact_photo_new ();
+			new_photo->type = E_CONTACT_PHOTO_TYPE_URI;
 			new_photo->data.uri = g_strdup (uri);
 
 			e_contact_set (contact, field, new_photo);
@@ -541,8 +541,8 @@ maybe_transform_vcard_field_for_photo (EBookBackendFile *bf,
 				status = STATUS_ERROR;
 			} else {
 
-				new_photo           = e_contact_photo_new ();
-				new_photo->type     = E_CONTACT_PHOTO_TYPE_URI;
+				new_photo = e_contact_photo_new ();
+				new_photo->type = E_CONTACT_PHOTO_TYPE_URI;
 				new_photo->data.uri = new_uri;
 
 				e_contact_set (contact, field, new_photo);
@@ -938,7 +938,7 @@ view_notify_update (EBookBackendFile *backend,
                     EContact *contact)
 {
 	EBookBackendSExp *sexp;
-	GHashTable *fields   = e_data_book_view_get_fields_of_interest (view);
+	GHashTable *fields = e_data_book_view_get_fields_of_interest (view);
 	const gchar *query;
 	gboolean    notified = FALSE;
 	gboolean    with_all_required_fields = FALSE;
@@ -1286,7 +1286,7 @@ book_backend_file_remove_contacts_sync (EBookBackend *backend,
 			NULL, NULL, &local_error);
 
 		if (contact) {
-			removed_ids      = g_slist_prepend (removed_ids, g_strdup (uids[ii]));
+			removed_ids = g_slist_prepend (removed_ids, g_strdup (uids[ii]));
 			removed_contacts = g_slist_prepend (removed_contacts, contact);
 		} else {
 			g_warning ("Failed to fetch contact to be removed: %s", local_error->message);
diff --git a/addressbook/backends/google/e-book-backend-google.c b/addressbook/backends/google/e-book-backend-google.c
index f5fb85a09..79951b362 100644
--- a/addressbook/backends/google/e-book-backend-google.c
+++ b/addressbook/backends/google/e-book-backend-google.c
@@ -2268,7 +2268,7 @@ e_book_backend_google_class_init (EBookBackendGoogleClass *class)
 	g_type_class_add_private (class, sizeof (EBookBackendGooglePrivate));
 
 	object_class = G_OBJECT_CLASS (class);
-	object_class->dispose  = book_backend_google_dispose;
+	object_class->dispose = book_backend_google_dispose;
 	object_class->finalize = book_backend_google_finalize;
 
 	backend_class = E_BOOK_BACKEND_CLASS (class);
diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index 0cff4536a..a0bc29c84 100644
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -1387,7 +1387,7 @@ build_mods_from_contacts (EBookBackendLDAP *bl,
 				continue;
 		}
 		if (((prop_info[i].prop_type & PROP_TYPE_COMPLEX) ||
-		     (prop_info[i].prop_type & PROP_TYPE_BINARY))  && is_list) {
+		     (prop_info[i].prop_type & PROP_TYPE_BINARY)) && is_list) {
 			continue;
 		}
 
@@ -3915,7 +3915,7 @@ e_book_backend_ldap_build_query (EBookBackendLDAP *bl,
 				strings[1] = g_strdup_printf ("%s", bl->priv->ldap_search_filter);
 				strings[2] = data.list->data;
 				strings[3] = g_strdup (")");
-				retval =  g_strjoinv (" ", strings);
+				retval = g_strjoinv (" ", strings);
 				for (i = 0; i < 4; i++)
 					g_free (strings[i]);
 				g_free (strings);
diff --git a/addressbook/backends/webdav/e-book-backend-webdav.c b/addressbook/backends/webdav/e-book-backend-webdav.c
index 30fd53434..59b4818bf 100644
--- a/addressbook/backends/webdav/e-book-backend-webdav.c
+++ b/addressbook/backends/webdav/e-book-backend-webdav.c
@@ -165,8 +165,8 @@ init_closure (EDataBookView *book_view,
 {
 	WebdavBackendSearchClosure *closure = g_new (WebdavBackendSearchClosure, 1);
 
-	closure->webdav  = webdav;
-	closure->thread  = NULL;
+	closure->webdav = webdav;
+	closure->thread = NULL;
 	closure->running = e_flag_new ();
 
 	g_object_set_data_full (
@@ -339,7 +339,7 @@ upload_contact (EBookBackendWebdav *webdav,
 		message, "text/vcard", SOUP_MEMORY_TEMPORARY,
 		request, strlen (request));
 
-	status   = send_and_handle_ssl (webdav, message, cancellable);
+	status = send_and_handle_ssl (webdav, message, cancellable);
 	new_etag = soup_message_headers_get_list (message->response_headers, "ETag");
 
 	redir_uri = soup_message_headers_get_list (message->response_headers, "Location");
@@ -459,8 +459,8 @@ static response_element_t *
 parse_response_tag (const parser_strings_t *strings,
                     xmlTextReaderPtr reader)
 {
-	xmlChar            *href  = NULL;
-	xmlChar            *etag  = NULL;
+	xmlChar            *href = NULL;
+	xmlChar            *etag = NULL;
 	gint                 depth = xmlTextReaderDepth (reader);
 	response_element_t *element;
 
@@ -531,14 +531,13 @@ parse_propfind_response (xmlTextReaderPtr reader)
 
 	/* get internalized versions of some strings to avoid strcmp while
 	 * parsing */
-	strings.multistatus
-		= xmlTextReaderConstString (reader, BAD_CAST "multistatus");
-	strings.dav         = xmlTextReaderConstString (reader, BAD_CAST "DAV:");
-	strings.href        = xmlTextReaderConstString (reader, BAD_CAST "href");
-	strings.response    = xmlTextReaderConstString (reader, BAD_CAST "response");
-	strings.propstat    = xmlTextReaderConstString (reader, BAD_CAST "propstat");
-	strings.prop        = xmlTextReaderConstString (reader, BAD_CAST "prop");
-	strings.getetag     = xmlTextReaderConstString (reader, BAD_CAST "getetag");
+	strings.multistatus = xmlTextReaderConstString (reader, BAD_CAST "multistatus");
+	strings.dav = xmlTextReaderConstString (reader, BAD_CAST "DAV:");
+	strings.href = xmlTextReaderConstString (reader, BAD_CAST "href");
+	strings.response = xmlTextReaderConstString (reader, BAD_CAST "response");
+	strings.propstat = xmlTextReaderConstString (reader, BAD_CAST "propstat");
+	strings.prop = xmlTextReaderConstString (reader, BAD_CAST "prop");
+	strings.getetag = xmlTextReaderConstString (reader, BAD_CAST "getetag");
 
 	while (xmlTextReaderRead (reader) == 1 && xmlTextReaderNodeType (reader) != XML_READER_TYPE_ELEMENT) {
 	}
@@ -567,7 +566,7 @@ parse_propfind_response (xmlTextReaderPtr reader)
 			continue;
 
 		element->next = elements;
-		elements      = element;
+		elements = element;
 	}
 
 	return elements;
@@ -578,7 +577,7 @@ send_propfind (EBookBackendWebdav *webdav,
                GCancellable *cancellable)
 {
 	SoupMessage               *message;
-	EBookBackendWebdavPrivate *priv    = webdav->priv;
+	EBookBackendWebdavPrivate *priv = webdav->priv;
 	const gchar               *request =
 		"<?xml version=\"1.0\" encoding=\"utf-8\"?>"
 		"<propfind xmlns=\"DAV:\"><prop><getetag/></prop></propfind>";
@@ -806,7 +805,7 @@ download_contacts (EBookBackendWebdav *webdav,
 	}
 
 	message = send_propfind (webdav, cancellable);
-	status  = message->status_code;
+	status = message->status_code;
 
 	if (status == 401 || status == 407) {
 		g_object_unref (message);
@@ -893,7 +892,7 @@ download_contacts (EBookBackendWebdav *webdav,
 		/* uri might be relative, construct complete one */
 		if (uri[0] == '/') {
 			SoupURI *soup_uri = soup_uri_new (priv->uri);
-			soup_uri->path    = g_strdup (uri);
+			soup_uri->path = g_strdup (uri);
 
 			complete_uri = soup_uri_to_string (soup_uri, FALSE);
 			soup_uri_free (soup_uri);
@@ -980,7 +979,7 @@ e_book_backend_webdav_start_view (EBookBackend *backend,
                                   EDataBookView *book_view)
 {
 	EBookBackendWebdav        *webdav = E_BOOK_BACKEND_WEBDAV (backend);
-	EBookBackendWebdavPrivate *priv   = webdav->priv;
+	EBookBackendWebdavPrivate *priv = webdav->priv;
 	EBookBackendSExp *sexp;
 	const gchar *query;
 	GList *contacts;
@@ -1005,11 +1004,13 @@ e_book_backend_webdav_start_view (EBookBackend *backend,
 	e_data_book_view_notify_complete (book_view, NULL /* Success */);
 
 	if (e_backend_get_online (E_BACKEND (backend))) {
-		WebdavBackendSearchClosure *closure
-			= init_closure (book_view, E_BOOK_BACKEND_WEBDAV (backend));
+		WebdavBackendSearchClosure *closure;
 
-		closure->thread
-			= g_thread_new (NULL, book_view_thread, book_view);
+		closure = init_closure (
+			book_view, E_BOOK_BACKEND_WEBDAV (backend));
+
+		closure->thread = g_thread_new (
+			NULL, book_view_thread, book_view);
 
 		e_flag_wait (closure->running);
 	}
@@ -1047,7 +1048,7 @@ soup_authenticate (SoupSession *session,
                    gpointer data)
 {
 	EBookBackendWebdav        *webdav = data;
-	EBookBackendWebdavPrivate *priv   = webdav->priv;
+	EBookBackendWebdavPrivate *priv = webdav->priv;
 
 	if (retrying)
 		return;
@@ -1162,7 +1163,7 @@ book_backend_webdav_open_sync (EBookBackend *backend,
                                GError **error)
 {
 	EBookBackendWebdav        *webdav = E_BOOK_BACKEND_WEBDAV (backend);
-	EBookBackendWebdavPrivate *priv   = webdav->priv;
+	EBookBackendWebdavPrivate *priv = webdav->priv;
 	ESourceAuthentication     *auth_extension;
 	ESourceOffline            *offline_extension;
 	ESourceWebdav             *webdav_extension;
diff --git a/addressbook/libebook-contacts/e-book-contacts-types.h b/addressbook/libebook-contacts/e-book-contacts-types.h
index bc5a88a31..3db2ab4cb 100644
--- a/addressbook/libebook-contacts/e-book-contacts-types.h
+++ b/addressbook/libebook-contacts/e-book-contacts-types.h
@@ -43,7 +43,7 @@ G_BEGIN_DECLS
  * Since: 3.4
  */
 typedef enum {
-	E_BOOK_CLIENT_VIEW_FLAGS_NONE           = 0,
+	E_BOOK_CLIENT_VIEW_FLAGS_NONE = 0,
 	E_BOOK_CLIENT_VIEW_FLAGS_NOTIFY_INITIAL = (1 << 0),
 } EBookClientViewFlags;
 
diff --git a/addressbook/libebook-contacts/e-contact.c b/addressbook/libebook-contacts/e-contact.c
index 89d996688..538e4661d 100644
--- a/addressbook/libebook-contacts/e-contact.c
+++ b/addressbook/libebook-contacts/e-contact.c
@@ -427,7 +427,7 @@ geo_getter (EContact *contact,
 		GList *p = e_vcard_attribute_get_values (attr);
 		EContactGeo *geo = g_new0 (EContactGeo, 1);
 
-		geo->latitude  = (p && p->data ? g_ascii_strtod (p->data, NULL) : 0); if (p) p = p->next;
+		geo->latitude = (p && p->data ? g_ascii_strtod (p->data, NULL) : 0); if (p) p = p->next;
 		geo->longitude = (p && p->data ? g_ascii_strtod (p->data, NULL) : 0);
 
 		return geo;
@@ -670,11 +670,11 @@ n_getter (EContact *contact,
 	if (attr) {
 		GList *p = e_vcard_attribute_get_values (attr);
 
-		name->family     = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
-		name->given      = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
+		name->family = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
+		name->given = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
 		name->additional = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
-		name->prefixes   = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
-		name->suffixes   = g_strdup (p && p->data ? p->data : "");
+		name->prefixes = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
+		name->suffixes = g_strdup (p && p->data ? p->data : "");
 	}
 
 	new_attr = e_vcard_get_attribute (E_VCARD (contact), EVC_FN);
@@ -735,13 +735,13 @@ adr_getter (EContact *contact,
 		EContactAddress *addr = g_new0 (EContactAddress, 1);
 
 		addr->address_format = g_strdup ("");
-		addr->po       = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
-		addr->ext      = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
-		addr->street   = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
+		addr->po = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
+		addr->ext = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
+		addr->street = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
 		addr->locality = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
-		addr->region   = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
-		addr->code     = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
-		addr->country  = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
+		addr->region = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
+		addr->code = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
+		addr->country = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
 
 		return addr;
 	}
@@ -1383,8 +1383,8 @@ e_contact_field_type (EContactField field_id)
 	g_return_val_if_fail (field_id >= 1 && field_id < E_CONTACT_FIELD_LAST, G_TYPE_INVALID);
 
 	field_name = e_contact_field_name (field_id);
-	class      = g_type_class_ref (E_TYPE_CONTACT);
-	pspec      = g_object_class_find_property (G_OBJECT_CLASS (class), field_name);
+	class = g_type_class_ref (E_TYPE_CONTACT);
+	pspec = g_object_class_find_property (G_OBJECT_CLASS (class), field_name);
 
 	if (pspec)
 		type = G_PARAM_SPEC_VALUE_TYPE (pspec);
@@ -1888,11 +1888,11 @@ e_contact_name_from_string (const gchar *name_str)
 	name = e_contact_name_new ();
 	western = e_name_western_parse (name_str);
 
-	name->prefixes   = g_strdup (western->prefix);
-	name->given      = g_strdup (western->first );
+	name->prefixes = g_strdup (western->prefix);
+	name->given = g_strdup (western->first );
 	name->additional = g_strdup (western->middle);
-	name->family     = g_strdup (western->last  );
-	name->suffixes   = g_strdup (western->suffix);
+	name->family = g_strdup (western->last  );
+	name->suffixes = g_strdup (western->suffix);
 
 	e_name_western_free (western);
 
@@ -1916,11 +1916,11 @@ e_contact_name_copy (EContactName *n)
 
 	name = e_contact_name_new ();
 
-	name->prefixes   = g_strdup (n->prefixes);
-	name->given      = g_strdup (n->given);
+	name->prefixes = g_strdup (n->prefixes);
+	name->given = g_strdup (n->given);
 	name->additional = g_strdup (n->additional);
-	name->family     = g_strdup (n->family);
-	name->suffixes   = g_strdup (n->suffixes);
+	name->family = g_strdup (n->family);
+	name->suffixes = g_strdup (n->suffixes);
 
 	return name;
 }
@@ -1946,23 +1946,23 @@ e_contact_name_free (EContactName *name)
 	g_free (name);
 }
 
-#define E_CONTACT_DEFINE_BOXED_TYPE(_tp,_nm)				\
-	GType								\
-	_tp ## _get_type (void)						\
-	{								\
-		static volatile gsize type_id__volatile = 0;		\
-									\
-		if (g_once_init_enter (&type_id__volatile)) {		\
-			GType type_id;					\
-									\
-			type_id = g_boxed_type_register_static (_nm,	\
-				(GBoxedCopyFunc) _tp ## _copy,		\
-				(GBoxedFreeFunc) _tp ## _free);		\
-									\
+#define E_CONTACT_DEFINE_BOXED_TYPE(_tp,_nm) \
+	GType \
+	_tp ## _get_type (void) \
+	{ \
+		static volatile gsize type_id__volatile = 0; \
+ \
+		if (g_once_init_enter (&type_id__volatile)) { \
+			GType type_id; \
+ \
+			type_id = g_boxed_type_register_static (_nm, \
+				(GBoxedCopyFunc) _tp ## _copy, \
+				(GBoxedFreeFunc) _tp ## _free); \
+ \
 			g_once_init_leave (&type_id__volatile, type_id);\
-	}								\
-									\
-	return type_id__volatile;					\
+	} \
+ \
+	return type_id__volatile; \
 }
 
 E_CONTACT_DEFINE_BOXED_TYPE (e_contact_name, "EContactName")
@@ -2321,7 +2321,7 @@ mime_type_from_filename (const gchar *filename)
 	if (!extension)
 		return NULL;
 
-	mime_type    = g_uri_unescape_string (extension, NULL);
+	mime_type = g_uri_unescape_string (extension, NULL);
 	content_type = g_content_type_from_mime_type (mime_type);
 
 	if (!content_type) {
@@ -2368,8 +2368,8 @@ e_contact_photo_make_inline (EContactPhoto *photo,
 		g_free (photo->data.uri);
 
 		photo->type = E_CONTACT_PHOTO_TYPE_INLINED;
-		photo->data.inlined.data      = (guchar *) contents;
-		photo->data.inlined.length    = length;
+		photo->data.inlined.data = (guchar *) contents;
+		photo->data.inlined.length = length;
 		photo->data.inlined.mime_type = mime_type;
 
 		success = TRUE;
@@ -2471,7 +2471,7 @@ static EContactGeo *
 e_contact_geo_copy (EContactGeo *geo)
 {
 	EContactGeo *geo2 = g_new0 (EContactGeo, 1);
-	geo2->latitude  = geo->latitude;
+	geo2->latitude = geo->latitude;
 	geo2->longitude = geo->longitude;
 
 	return geo2;
diff --git a/addressbook/libebook-contacts/e-contact.h b/addressbook/libebook-contacts/e-contact.h
index fe5caf67a..af9e2952b 100644
--- a/addressbook/libebook-contacts/e-contact.h
+++ b/addressbook/libebook-contacts/e-contact.h
@@ -252,18 +252,18 @@ typedef enum {
 	E_CONTACT_IM_TWITTER,		/* Multi-valued */
 
 	E_CONTACT_FIELD_LAST,
-	E_CONTACT_FIELD_FIRST        = E_CONTACT_UID,
+	E_CONTACT_FIELD_FIRST = E_CONTACT_UID,
 
 	/* useful constants */
 	E_CONTACT_LAST_SIMPLE_STRING = E_CONTACT_NAME_OR_ORG,
-	E_CONTACT_FIRST_PHONE_ID     = E_CONTACT_PHONE_ASSISTANT,
-	E_CONTACT_LAST_PHONE_ID      = E_CONTACT_PHONE_TTYTDD,
-	E_CONTACT_FIRST_EMAIL_ID     = E_CONTACT_EMAIL_1,
-	E_CONTACT_LAST_EMAIL_ID      = E_CONTACT_EMAIL_4,
-	E_CONTACT_FIRST_ADDRESS_ID   = E_CONTACT_ADDRESS_HOME,
-	E_CONTACT_LAST_ADDRESS_ID    = E_CONTACT_ADDRESS_OTHER,
-	E_CONTACT_FIRST_LABEL_ID     = E_CONTACT_ADDRESS_LABEL_HOME,
-	E_CONTACT_LAST_LABEL_ID      = E_CONTACT_ADDRESS_LABEL_OTHER
+	E_CONTACT_FIRST_PHONE_ID = E_CONTACT_PHONE_ASSISTANT,
+	E_CONTACT_LAST_PHONE_ID = E_CONTACT_PHONE_TTYTDD,
+	E_CONTACT_FIRST_EMAIL_ID = E_CONTACT_EMAIL_1,
+	E_CONTACT_LAST_EMAIL_ID = E_CONTACT_EMAIL_4,
+	E_CONTACT_FIRST_ADDRESS_ID = E_CONTACT_ADDRESS_HOME,
+	E_CONTACT_LAST_ADDRESS_ID = E_CONTACT_ADDRESS_OTHER,
+	E_CONTACT_FIRST_LABEL_ID = E_CONTACT_ADDRESS_LABEL_HOME,
+	E_CONTACT_LAST_LABEL_ID = E_CONTACT_ADDRESS_LABEL_OTHER
 
 } EContactField;
 
diff --git a/addressbook/libebook-contacts/e-name-western.c b/addressbook/libebook-contacts/e-name-western.c
index b95993a0c..359ed761f 100644
--- a/addressbook/libebook-contacts/e-name-western.c
+++ b/addressbook/libebook-contacts/e-name-western.c
@@ -232,7 +232,7 @@ e_name_western_extract_prefix (ENameWestern *name,
 		return;
 
 	idxs->prefix_idx = 0;
-	name->prefix     = pfx;
+	name->prefix = pfx;
 }
 
 static gboolean
@@ -480,7 +480,7 @@ e_name_western_extract_last (ENameWestern *name,
 			return;
 		}
 
-		name->last     = g_strdup (name->full);
+		name->last = g_strdup (name->full);
 		idxs->last_idx = 0;
 		return;
 	}
@@ -766,59 +766,59 @@ e_name_western_zap_nil (gchar **str,
 	*str = NULL;
 }
 
-#define FINISH_CHECK_MIDDLE_NAME_FOR_CONJUNCTION			\
-	gchar *last_start = NULL;					\
-	if (name->last)							\
-		last_start = g_utf8_strchr (name->last, -1, ' ');	\
-	if (last_start) {						\
-		gchar *new_last, *new_first;				\
-									\
-		new_last = g_strdup (g_utf8_next_char (last_start));	\
-		*last_start = '\0';					\
-									\
-		idxs->last_idx += (last_start - name->last) + 1;	\
-									\
-		new_first = g_strdup_printf ("%s %s %s",		\
-					     name->first,		\
-					     name->middle,		\
-					     name->last);		\
-									\
-		g_free (name->first);					\
-		g_free (name->middle);					\
-		g_free (name->last);					\
-									\
-		name->first = new_first;				\
-		name->middle = NULL;					\
-		name->last = new_last;					\
-									\
-		idxs->middle_idx = -1;					\
-	} else {							\
-		gchar *new_first;					\
-									\
-		new_first = g_strdup_printf ("%s %s %s",		\
-					     name->first,		\
-					     name->middle,		\
-					     name->last);		\
-									\
-		g_free (name->first);					\
-		g_free (name->middle);					\
-		g_free (name->last);					\
-									\
-		name->first = new_first;				\
-		name->middle = NULL;					\
-		name->last = NULL;					\
-		idxs->middle_idx = -1;					\
-		idxs->last_idx = -1;					\
+#define FINISH_CHECK_MIDDLE_NAME_FOR_CONJUNCTION \
+	gchar *last_start = NULL; \
+	if (name->last) \
+		last_start = g_utf8_strchr (name->last, -1, ' '); \
+	if (last_start) { \
+		gchar *new_last, *new_first; \
+ \
+		new_last = g_strdup (g_utf8_next_char (last_start)); \
+		*last_start = '\0'; \
+ \
+		idxs->last_idx += (last_start - name->last) + 1; \
+ \
+		new_first = g_strdup_printf ("%s %s %s", \
+					     name->first, \
+					     name->middle, \
+					     name->last); \
+ \
+		g_free (name->first); \
+		g_free (name->middle); \
+		g_free (name->last); \
+ \
+		name->first = new_first; \
+		name->middle = NULL; \
+		name->last = new_last; \
+ \
+		idxs->middle_idx = -1; \
+	} else { \
+		gchar *new_first; \
+ \
+		new_first = g_strdup_printf ("%s %s %s", \
+					     name->first, \
+					     name->middle, \
+					     name->last); \
+ \
+		g_free (name->first); \
+		g_free (name->middle); \
+		g_free (name->last); \
+ \
+		name->first = new_first; \
+		name->middle = NULL; \
+		name->last = NULL; \
+		idxs->middle_idx = -1; \
+		idxs->last_idx = -1; \
 	}
 
 #define CHECK_MIDDLE_NAME_FOR_CONJUNCTION(conj) \
-	if (idxs->middle_idx != -1 && !strcmp (name->middle, conj)) {	\
-		FINISH_CHECK_MIDDLE_NAME_FOR_CONJUNCTION	\
+	if (idxs->middle_idx != -1 && !strcmp (name->middle, conj)) { \
+		FINISH_CHECK_MIDDLE_NAME_FOR_CONJUNCTION \
 	}
 
 #define CHECK_MIDDLE_NAME_FOR_CONJUNCTION_CASE(conj) \
-	if (idxs->middle_idx != -1 && !g_ascii_strcasecmp (name->middle, conj)) {	\
-		FINISH_CHECK_MIDDLE_NAME_FOR_CONJUNCTION	\
+	if (idxs->middle_idx != -1 && !g_ascii_strcasecmp (name->middle, conj)) { \
+		FINISH_CHECK_MIDDLE_NAME_FOR_CONJUNCTION \
 	}
 
 static void
@@ -839,9 +839,9 @@ e_name_western_fixup (ENameWestern *name,
 	 * the last name for the middle name.
 	 */
 	if (idxs->last_idx == -1 && idxs->middle_idx != -1) {
-		idxs->last_idx   = idxs->middle_idx;
-		name->last       = name->middle;
-		name->middle     = NULL;
+		idxs->last_idx = idxs->middle_idx;
+		name->last = name->middle;
+		name->middle = NULL;
 		idxs->middle_idx = -1;
 	}
 
@@ -878,10 +878,10 @@ e_name_western_fixup (ENameWestern *name,
 	 */
 	if (idxs->first_idx != -1 && idxs->prefix_idx != -1 &&
 	    idxs->last_idx == -1) {
-		name->last      = name->first;
-		idxs->last_idx  = idxs->first_idx;
+		name->last = name->first;
+		idxs->last_idx = idxs->first_idx;
 		idxs->first_idx = -1;
-		name->first     = NULL;
+		name->first = NULL;
 	}
 
 	if (idxs->middle_idx != -1) {
@@ -970,10 +970,10 @@ e_name_western_parse (const gchar *full_name)
 	idxs = g_new0 (ENameWesternIdxs, 1);
 
 	idxs->prefix_idx = -1;
-	idxs->first_idx  = -1;
+	idxs->first_idx = -1;
 	idxs->middle_idx = -1;
-	idxs->nick_idx   = -1;
-	idxs->last_idx   = -1;
+	idxs->nick_idx = -1;
+	idxs->last_idx = -1;
 	idxs->suffix_idx = -1;
 
 	/*
diff --git a/addressbook/libebook-contacts/e-source-backend-summary-setup.c b/addressbook/libebook-contacts/e-source-backend-summary-setup.c
index 90e4da840..c01f04ad5 100644
--- a/addressbook/libebook-contacts/e-source-backend-summary-setup.c
+++ b/addressbook/libebook-contacts/e-source-backend-summary-setup.c
@@ -48,9 +48,9 @@
 #include "e-source-backend-summary-setup.h"
 #include "e-book-contacts-enumtypes.h"
 
-#define E_SOURCE_BACKEND_SUMMARY_GET_PRIVATE(obj)	\
-	(G_TYPE_INSTANCE_GET_PRIVATE			\
-	 ((obj), E_TYPE_SOURCE_BACKEND_SUMMARY_SETUP,	\
+#define E_SOURCE_BACKEND_SUMMARY_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	 ((obj), E_TYPE_SOURCE_BACKEND_SUMMARY_SETUP, \
 	  ESourceBackendSummarySetupPrivate))
 
 struct _ESourceBackendSummarySetupPrivate {
@@ -256,7 +256,7 @@ source_backend_summary_setup_get_fields_array (ESourceBackendSummarySetup *exten
 
 	if (split) {
 		n_ret_fields = g_strv_length (split);
-		fields       = g_new (EContactField, n_ret_fields);
+		fields = g_new (EContactField, n_ret_fields);
 
 		for (i = 0; i < n_ret_fields; i++) {
 			field = e_contact_field_id (split[i]);
@@ -476,7 +476,7 @@ e_source_backend_summary_setup_get_indexed_fields (ESourceBackendSummarySetup *e
 	ret_n_fields = g_strv_length (split);
 
 	ret_fields = g_new0 (EContactField, ret_n_fields);
-	ret_types  = g_new0 (EBookIndexType, ret_n_fields);
+	ret_types = g_new0 (EBookIndexType, ret_n_fields);
 
 	for (i = 0; i < ret_n_fields && malformed == FALSE; i++) {
 
@@ -572,7 +572,7 @@ e_source_backend_summary_setup_set_indexed_fieldsv (ESourceBackendSummarySetup *
 		const gchar *type;
 
 		field = e_contact_field_name (fields[i]);
-		type  = e_enum_to_string (E_TYPE_BOOK_INDEX_TYPE, types[i]);
+		type = e_enum_to_string (E_TYPE_BOOK_INDEX_TYPE, types[i]);
 
 		if (!field) {
 			g_warning ("Invalid contact field specified in indexed fields");
diff --git a/addressbook/libebook-contacts/e-vcard.c b/addressbook/libebook-contacts/e-vcard.c
index 82b6c2cdd..a3c0d4202 100644
--- a/addressbook/libebook-contacts/e-vcard.c
+++ b/addressbook/libebook-contacts/e-vcard.c
@@ -331,7 +331,7 @@ read_attribute_value (EVCardAttribute *attr,
 
 	/* read in the value */
 	str = g_string_new ("");
-	for (lp =  skip_newline ( *p, quoted_printable);
+	for (lp = skip_newline ( *p, quoted_printable);
 	     *lp != '\n' && *lp != '\r' && *lp != '\0';
 	     lp = skip_newline ( lp, quoted_printable ) ) {
 
@@ -444,7 +444,7 @@ read_attribute_params (EVCardAttribute *attr,
 	gboolean in_quote = FALSE;
 
 	str = g_string_new ("");
-	for (lp =  skip_newline ( *p, *quoted_printable);
+	for (lp = skip_newline ( *p, *quoted_printable);
 	     *lp != '\n' && *lp != '\r' && *lp != '\0';
 	     lp = skip_newline ( lp, *quoted_printable ) ) {
 
@@ -610,7 +610,7 @@ read_attribute (gchar **p)
 
 	/* first read in the group/name */
 	str = g_string_new ("");
-	for (lp =  skip_newline ( *p, is_qp);
+	for (lp = skip_newline ( *p, is_qp);
 	     *lp != '\n' && *lp != '\r' && *lp != '\0';
 	     lp = skip_newline ( lp, is_qp ) ) {
 
diff --git a/addressbook/libebook/e-book-client.c b/addressbook/libebook/e-book-client.c
index 9d87eea47..a67976365 100644
--- a/addressbook/libebook/e-book-client.c
+++ b/addressbook/libebook/e-book-client.c
@@ -2701,7 +2701,7 @@ e_book_client_get_contact (EBookClient *client,
 	g_return_if_fail (uid != NULL);
 
 	async_context = g_slice_new0 (AsyncContext);
-	async_context->uid  = g_strdup (uid);
+	async_context->uid = g_strdup (uid);
 
 	simple = g_simple_async_result_new (
 		G_OBJECT (client), callback, user_data,
diff --git a/addressbook/libebook/e-destination.c b/addressbook/libebook/e-destination.c
index 9001482c8..38c590ace 100644
--- a/addressbook/libebook/e-destination.c
+++ b/addressbook/libebook/e-destination.c
@@ -197,19 +197,19 @@ e_destination_copy (const EDestination *dest)
 
 	new_dest = e_destination_new ();
 
-	new_dest->priv->source_uid         = g_strdup (dest->priv->source_uid);
-	new_dest->priv->contact_uid        = g_strdup (dest->priv->contact_uid);
-	new_dest->priv->name               = g_strdup (dest->priv->name);
-	new_dest->priv->email              = g_strdup (dest->priv->email);
-	new_dest->priv->addr               = g_strdup (dest->priv->addr);
-	new_dest->priv->email_num          = dest->priv->email_num;
-	new_dest->priv->ignored            = dest->priv->ignored;
+	new_dest->priv->source_uid = g_strdup (dest->priv->source_uid);
+	new_dest->priv->contact_uid = g_strdup (dest->priv->contact_uid);
+	new_dest->priv->name = g_strdup (dest->priv->name);
+	new_dest->priv->email = g_strdup (dest->priv->email);
+	new_dest->priv->addr = g_strdup (dest->priv->addr);
+	new_dest->priv->email_num = dest->priv->email_num;
+	new_dest->priv->ignored = dest->priv->ignored;
 
 	if (dest->priv->contact)
 		new_dest->priv->contact = g_object_ref (dest->priv->contact);
 
 	new_dest->priv->html_mail_override = dest->priv->html_mail_override;
-	new_dest->priv->wants_html_mail    = dest->priv->wants_html_mail;
+	new_dest->priv->wants_html_mail = dest->priv->wants_html_mail;
 
 	/* deep copy, recursively copy our children */
 	for (iter = dest->priv->list_dests; iter != NULL; iter = g_list_next (iter)) {
@@ -1101,7 +1101,7 @@ e_destination_get_textrep (const EDestination *dest,
 	if (dest->priv->raw)
 		return dest->priv->raw;
 
-	name  = e_destination_get_name (dest);
+	name = e_destination_get_name (dest);
 	email = e_destination_get_email (dest);
 
 	if (e_destination_from_contact (dest) && name != NULL && (!include_email || !email || !*email))
@@ -1664,7 +1664,7 @@ e_destination_exportv (EDestination **destv)
 	if (destv == NULL || *destv == NULL)
 		return NULL;
 
-	destv_doc  = xmlNewDoc ((xmlChar *) XML_DEFAULT_VERSION);
+	destv_doc = xmlNewDoc ((xmlChar *) XML_DEFAULT_VERSION);
 	destv_node = xmlNewNode (NULL, (xmlChar *)"destinations");
 	xmlDocSetRootElement (destv_doc, destv_node);
 
diff --git a/addressbook/libebook/e-error.h b/addressbook/libebook/e-error.h
index 0c5655c0a..6b08733e5 100644
--- a/addressbook/libebook/e-error.h
+++ b/addressbook/libebook/e-error.h
@@ -11,23 +11,23 @@
  *
  * Since: 2.30
  **/
-#define e_return_error_if_fail(expr,error_code)	G_STMT_START{		\
-     if G_LIKELY (expr) { } else						\
-       {								\
-	 g_log (G_LOG_DOMAIN,						\
-		G_LOG_LEVEL_CRITICAL,					\
-		"file %s: line %d (%s): assertion `%s' failed",		\
-		__FILE__,						\
-		__LINE__,						\
-		G_STRFUNC,						\
-		#expr);							\
-	 g_set_error (error, E_BOOK_ERROR, (error_code),		\
-		"file %s: line %d (%s): assertion `%s' failed",		\
-		__FILE__,						\
-		__LINE__,						\
-		G_STRFUNC,						\
-		#expr);							\
-	 return FALSE;							\
+#define e_return_error_if_fail(expr,error_code)	G_STMT_START{ \
+     if G_LIKELY (expr) { } else \
+       { \
+	 g_log (G_LOG_DOMAIN, \
+		G_LOG_LEVEL_CRITICAL, \
+		"file %s: line %d (%s): assertion `%s' failed", \
+		__FILE__, \
+		__LINE__, \
+		G_STRFUNC, \
+		#expr); \
+	 g_set_error (error, E_BOOK_ERROR, (error_code), \
+		"file %s: line %d (%s): assertion `%s' failed", \
+		__FILE__, \
+		__LINE__, \
+		G_STRFUNC, \
+		#expr); \
+	 return FALSE; \
        } \
   } G_STMT_END
 
@@ -39,38 +39,38 @@
  * Since: 2.32
  **/
 #define e_return_async_error_if_fail(expr, error) G_STMT_START { \
-    if G_LIKELY (expr) {} else {                                 \
-      g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,                 \
-             "file %s: line %d (%s): assertion `%s' failed",     \
-             __FILE__, __LINE__, G_STRFUNC, #expr);    \
-      cb (book, error, closure);                           \
-      return TRUE;                                                  \
-    }                                                            \
+    if G_LIKELY (expr) {} else { \
+      g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, \
+             "file %s: line %d (%s): assertion `%s' failed", \
+             __FILE__, __LINE__, G_STRFUNC, #expr); \
+      cb (book, error, closure); \
+      return TRUE; \
+    } \
   } G_STMT_END
 
 #define e_return_async_error_val_if_fail(expr, error) G_STMT_START { \
-    if G_LIKELY (expr) {} else {                                 \
-      g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,                 \
-             "file %s: line %d (%s): assertion `%s' failed",     \
-             __FILE__, __LINE__, G_STRFUNC, #expr);    \
-      cb (book, error, NULL, closure);                           \
-      return TRUE;                                                  \
-    }                                                            \
+    if G_LIKELY (expr) {} else { \
+      g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, \
+             "file %s: line %d (%s): assertion `%s' failed", \
+             __FILE__, __LINE__, G_STRFUNC, #expr); \
+      cb (book, error, NULL, closure); \
+      return TRUE; \
+    } \
   } G_STMT_END
 
-#define e_return_ex_async_error_if_fail(expr, error) G_STMT_START {	\
-    if G_LIKELY (expr) {} else {					\
-      GError *err;							\
-      g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,			\
-             "file %s: line %d (%s): assertion `%s' failed",		\
-             __FILE__, __LINE__, G_STRFUNC, #expr);			\
-      err = g_error_new (E_BOOK_ERROR, (error),				\
-		"file %s: line %d (%s): assertion `%s' failed",		\
-		__FILE__, __LINE__, G_STRFUNC, #expr);			\
-      cb (book, err, closure);					\
-      g_error_free (err);						\
-      return FALSE;							\
-    }								\
+#define e_return_ex_async_error_if_fail(expr, error) G_STMT_START { \
+    if G_LIKELY (expr) {} else { \
+      GError *err; \
+      g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, \
+             "file %s: line %d (%s): assertion `%s' failed", \
+             __FILE__, __LINE__, G_STRFUNC, #expr); \
+      err = g_error_new (E_BOOK_ERROR, (error), \
+		"file %s: line %d (%s): assertion `%s' failed", \
+		__FILE__, __LINE__, G_STRFUNC, #expr); \
+      cb (book, err, closure); \
+      g_error_free (err); \
+      return FALSE; \
+    } \
   } G_STMT_END
 
 /**
@@ -80,17 +80,17 @@
  *
  * Since: 2.32
  **/
-#define e_return_ex_async_error_val_if_fail(expr, error) G_STMT_START {	\
-    if G_LIKELY (expr) {} else {					\
-      GError *err;							\
-      g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,			\
-             "file %s: line %d (%s): assertion `%s' failed",		\
-             __FILE__, __LINE__, G_STRFUNC, #expr);			\
-      err = g_error_new (E_BOOK_ERROR, (error),				\
-		"file %s: line %d (%s): assertion `%s' failed",		\
-		__FILE__, __LINE__, G_STRFUNC, #expr);			\
-      cb (book, err, NULL, closure);					\
-      g_error_free (err);						\
-      return TRUE;							\
-    }								\
+#define e_return_ex_async_error_val_if_fail(expr, error) G_STMT_START { \
+    if G_LIKELY (expr) {} else { \
+      GError *err; \
+      g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, \
+             "file %s: line %d (%s): assertion `%s' failed", \
+             __FILE__, __LINE__, G_STRFUNC, #expr); \
+      err = g_error_new (E_BOOK_ERROR, (error), \
+		"file %s: line %d (%s): assertion `%s' failed", \
+		__FILE__, __LINE__, G_STRFUNC, #expr); \
+      cb (book, err, NULL, closure); \
+      g_error_free (err); \
+      return TRUE; \
+    } \
   } G_STMT_END
diff --git a/addressbook/libedata-book/e-book-backend-sexp.c b/addressbook/libedata-book/e-book-backend-sexp.c
index 6bcd13fdc..4ba2b559a 100644
--- a/addressbook/libedata-book/e-book-backend-sexp.c
+++ b/addressbook/libedata-book/e-book-backend-sexp.c
@@ -267,7 +267,7 @@ compare_address (EContact *contact,
 	for (i = E_CONTACT_FIRST_ADDRESS_ID; i <= E_CONTACT_LAST_ADDRESS_ID; i++) {
 		EContactAddress *address = e_contact_get (contact, i);
 		if (address) {
-			rv =  (address->po && compare (address->po, str, region)) ||
+			rv = (address->po && compare (address->po, str, region)) ||
 				(address->street && compare (address->street, str, region)) ||
 				(address->ext && compare (address->ext, str, region)) ||
 				(address->locality && compare (address->locality, str, region)) ||
@@ -552,7 +552,7 @@ try_contains_word (const gchar *s1,
 	w = word->data;
 	first_w_char = g_utf8_get_char (w->str);
 
-	o  = s1;
+	o = s1;
 	for (p = e_util_unicode_get_utf8 (o, &unival); p && unival; p = e_util_unicode_get_utf8 (p, &unival)) {
 		if (unival == first_w_char) {
 			gunichar unival2;
diff --git a/addressbook/libedata-book/e-book-backend-sqlitedb.c b/addressbook/libedata-book/e-book-backend-sqlitedb.c
index b639c0514..06ab895be 100644
--- a/addressbook/libedata-book/e-book-backend-sqlitedb.c
+++ b/addressbook/libedata-book/e-book-backend-sqlitedb.c
@@ -43,18 +43,18 @@
 #define d(x)
 
 #if d(1)+0
-#  define LOCK_MUTEX(mutex)					\
-	G_STMT_START {						\
-		g_message ("%s: DB Locking ", G_STRFUNC);	\
-		g_mutex_lock (mutex);				\
-		g_message ("%s: DB Locked ", G_STRFUNC);	\
+#  define LOCK_MUTEX(mutex) \
+	G_STMT_START { \
+		g_message ("%s: DB Locking ", G_STRFUNC); \
+		g_mutex_lock (mutex); \
+		g_message ("%s: DB Locked ", G_STRFUNC); \
 	} G_STMT_END
 
-#  define UNLOCK_MUTEX(mutex)					\
-	G_STMT_START {						\
-		g_message ("%s: Unlocking ", G_STRFUNC);	\
-		g_mutex_unlock (mutex);				\
-		g_message ("%s: DB Unlocked ", G_STRFUNC);	\
+#  define UNLOCK_MUTEX(mutex) \
+	G_STMT_START { \
+		g_message ("%s: Unlocking ", G_STRFUNC); \
+		g_mutex_unlock (mutex); \
+		g_message ("%s: DB Unlocked ", G_STRFUNC); \
 	} G_STMT_END
 #else
 #  define LOCK_MUTEX(mutex)   g_mutex_lock (mutex)
@@ -67,7 +67,7 @@
 typedef enum {
 	INDEX_PREFIX = (1 << 0),
 	INDEX_SUFFIX = (1 << 1),
-	INDEX_PHONE  = (1 << 2)
+	INDEX_PHONE = (1 << 2)
 } IndexFlags;
 
 typedef struct {
@@ -511,7 +511,7 @@ create_folders_table (EBookBackendSqliteDB *ebsdb,
 		goto rollback;
 
 	/* Create a child table to store key/value pairs for a folder. */
-	stmt =	"CREATE TABLE IF NOT EXISTS keys"
+	stmt = "CREATE TABLE IF NOT EXISTS keys"
 		"( key TEXT PRIMARY KEY, value TEXT,"
 		" folder_id TEXT REFERENCES folders)";
 	if (!book_backend_sql_exec (ebsdb->priv->db, stmt, NULL, NULL, error))
@@ -1513,10 +1513,10 @@ append_summary_field (GArray *array,
 	if (type == E_TYPE_CONTACT_ATTR_LIST && have_attr_list)
 		*have_attr_list = TRUE;
 
-	new_field.field  = field;
+	new_field.field = field;
 	new_field.dbname = dbname;
-	new_field.type   = type;
-	new_field.index  = 0;
+	new_field.type = type;
+	new_field.index = 0;
 	g_array_append_val (array, new_field);
 
 	return &g_array_index (array, SummaryField, array->len - 1);
@@ -1608,7 +1608,7 @@ e_book_backend_sqlitedb_new_full (const gchar *path,
 	GArray *summary_fields;
 	gint n_fields = 0, n_indexed_fields = 0, i;
 
-	fields         = e_source_backend_summary_setup_get_summary_fields (setup, &n_fields);
+	fields = e_source_backend_summary_setup_get_summary_fields (setup, &n_fields);
 	indexed_fields = e_source_backend_summary_setup_get_indexed_fields (setup, &index_types, &n_indexed_fields);
 
 	/* No specified summary fields indicates the default summary configuration should be used */
@@ -2500,8 +2500,8 @@ e_book_backend_sqlitedb_is_summary_fields (GHashTable *fields_of_interest)
 	g_hash_table_iter_init (&iter, fields_of_interest);
 	while (g_hash_table_iter_next (&iter, &key, &value)) {
 		const gchar  *field_name = key;
-		EContactField field      = e_contact_field_id (field_name);
-		gboolean      found      = FALSE;
+		EContactField field = e_contact_field_id (field_name);
+		gboolean      found = FALSE;
 
 		for (i = 0; i < G_N_ELEMENTS (default_summary_fields); i++) {
 			if (field == default_summary_fields[i]) {
@@ -2545,7 +2545,7 @@ e_book_backend_sqlitedb_check_summary_fields (EBookBackendSqliteDB *ebsdb,
 	g_hash_table_iter_init (&iter, fields_of_interest);
 	while (g_hash_table_iter_next (&iter, &key, &value)) {
 		const gchar  *field_name = key;
-		EContactField field      = e_contact_field_id (field_name);
+		EContactField field = e_contact_field_id (field_name);
 
 		if (summary_dbname_from_field (ebsdb, field) == NULL) {
 			summary_fields = FALSE;
@@ -2710,10 +2710,10 @@ e_book_backend_sqlitedb_get_vcard_string (EBookBackendSqliteDB *ebsdb,
 }
 
 enum {
-	CHECK_IS_SUMMARY   = (1 << 0),
+	CHECK_IS_SUMMARY = (1 << 0),
 	CHECK_IS_LIST_ATTR = (1 << 1),
-	CHECK_UNSUPPORTED  = (1 << 2),
-	CHECK_INVALID      = (1 << 3)
+	CHECK_UNSUPPORTED = (1 << 2),
+	CHECK_INVALID = (1 << 3)
 };
 
 static ESExpResult *
@@ -3088,10 +3088,10 @@ typedef enum {
 } MatchType;
 
 typedef enum {
-	CONVERT_NOTHING   =  0,
+	CONVERT_NOTHING = 0,
 	CONVERT_NORMALIZE = (1 << 0),
-	CONVERT_REVERSE   = (1 << 1),
-	CONVERT_PHONE     = (1 << 2)
+	CONVERT_REVERSE = (1 << 1),
+	CONVERT_PHONE = (1 << 2)
 } ConvertFlags;
 
 static gchar *
diff --git a/addressbook/libedata-book/e-book-backend-summary.c b/addressbook/libedata-book/e-book-backend-summary.c
index ce9dec12e..7326f0306 100644
--- a/addressbook/libedata-book/e-book-backend-summary.c
+++ b/addressbook/libedata-book/e-book-backend-summary.c
@@ -743,17 +743,17 @@ e_book_backend_summary_add_contact (EBookBackendSummary *summary,
 
 	new_item = g_new0 (EBookBackendSummaryItem, 1);
 
-	new_item->id         = id;
-	new_item->nickname   = e_contact_get (contact, E_CONTACT_NICKNAME);
-	new_item->full_name  = e_contact_get (contact, E_CONTACT_FULL_NAME);
+	new_item->id = id;
+	new_item->nickname = e_contact_get (contact, E_CONTACT_NICKNAME);
+	new_item->full_name = e_contact_get (contact, E_CONTACT_FULL_NAME);
 	new_item->given_name = e_contact_get (contact, E_CONTACT_GIVEN_NAME);
-	new_item->surname    = e_contact_get (contact, E_CONTACT_FAMILY_NAME);
-	new_item->file_as    = e_contact_get (contact, E_CONTACT_FILE_AS);
-	new_item->email_1    = e_contact_get (contact, E_CONTACT_EMAIL_1);
-	new_item->email_2    = e_contact_get (contact, E_CONTACT_EMAIL_2);
-	new_item->email_3    = e_contact_get (contact, E_CONTACT_EMAIL_3);
-	new_item->email_4    = e_contact_get (contact, E_CONTACT_EMAIL_4);
-	new_item->list       = GPOINTER_TO_INT (e_contact_get (contact, E_CONTACT_IS_LIST));
+	new_item->surname = e_contact_get (contact, E_CONTACT_FAMILY_NAME);
+	new_item->file_as = e_contact_get (contact, E_CONTACT_FILE_AS);
+	new_item->email_1 = e_contact_get (contact, E_CONTACT_EMAIL_1);
+	new_item->email_2 = e_contact_get (contact, E_CONTACT_EMAIL_2);
+	new_item->email_3 = e_contact_get (contact, E_CONTACT_EMAIL_3);
+	new_item->email_4 = e_contact_get (contact, E_CONTACT_EMAIL_4);
+	new_item->list = GPOINTER_TO_INT (e_contact_get (contact, E_CONTACT_IS_LIST));
 	new_item->list_show_addresses = GPOINTER_TO_INT (e_contact_get (contact, E_CONTACT_LIST_SHOW_ADDRESSES));
 	new_item->wants_html = GPOINTER_TO_INT (e_contact_get (contact, E_CONTACT_WANTS_HTML));
 
diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
index a8a56db91..9b6c928fc 100644
--- a/calendar/backends/caldav/e-cal-backend-caldav.c
+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
@@ -413,7 +413,7 @@ ecalcomp_get_href (ECalComponent *comp)
 	icomp = e_cal_component_get_icalcomponent (comp);
 	g_return_val_if_fail (icomp != NULL, NULL);
 
-	str =  icomp_x_prop_get (icomp, X_E_CALDAV "HREF");
+	str = icomp_x_prop_get (icomp, X_E_CALDAV "HREF");
 
 	return str;
 }
@@ -441,7 +441,7 @@ ecalcomp_get_etag (ECalComponent *comp)
 	icomp = e_cal_component_get_icalcomponent (comp);
 	g_return_val_if_fail (icomp != NULL, NULL);
 
-	str =  icomp_x_prop_get (icomp, X_E_CALDAV "ETAG");
+	str = icomp_x_prop_get (icomp, X_E_CALDAV "ETAG");
 
 	/* libical 0.48 escapes quotes, thus unescape them */
 	if (str && strchr (str, '\\')) {
@@ -2251,8 +2251,8 @@ free_comp_list (gpointer cclist)
 	g_free (ccl);
 }
 
-#define etags_match(_tag1, _tag2) ((_tag1 == _tag2) ? TRUE :                 \
-				   g_str_equal (_tag1 != NULL ? _tag1 : "",  \
+#define etags_match(_tag1, _tag2) ((_tag1 == _tag2) ? TRUE : \
+				   g_str_equal (_tag1 != NULL ? _tag1 : "", \
 						_tag2 != NULL ? _tag2 : ""))
 
 /* start_time/end_time is an interval for checking changes. If both greater than zero,
@@ -2276,8 +2276,8 @@ synchronize_cache (ECalBackendCalDAV *cbdav,
 		return;
 	}
 
-	len    = 0;
-	sobjs  = NULL;
+	len = 0;
+	sobjs = NULL;
 
 	/* get list of server objects */
 	if (!caldav_server_list_objects (cbdav, &sobjs, &len, NULL, start_time, end_time))
@@ -4045,8 +4045,8 @@ do_create_objects (ECalBackendCalDAV *cbdav,
 	if (online) {
 		CalDAVObject object;
 
-		object.href  = ecalcomp_gen_href (comp);
-		object.etag  = NULL;
+		object.href = ecalcomp_gen_href (comp);
+		object.etag = NULL;
 		object.cdata = pack_cobj (cbdav, icalcomp);
 
 		did_put = caldav_server_put_object (cbdav, &object, icalcomp, cancellable, perror);
@@ -4218,8 +4218,8 @@ do_modify_objects (ECalBackendCalDAV *cbdav,
 	if (online) {
 		CalDAVObject object;
 
-		object.href  = href;
-		object.etag  = etag;
+		object.href = href;
+		object.etag = etag;
 		object.cdata = pack_cobj (cbdav, cache_comp);
 
 		did_put = caldav_server_put_object (cbdav, &object, cache_comp, cancellable, error);
@@ -4329,8 +4329,8 @@ do_remove_objects (ECalBackendCalDAV *cbdav,
 	if (online) {
 		CalDAVObject caldav_object;
 
-		caldav_object.href  = href;
-		caldav_object.etag  = etag;
+		caldav_object.href = href;
+		caldav_object.etag = etag;
 		caldav_object.cdata = NULL;
 
 		if (mod == E_CAL_OBJ_MOD_THIS && rid && *rid) {
@@ -4627,34 +4627,34 @@ do_receive_objects (ECalBackendSync *backend,
 		g_propagate_error (perror, err);
 }
 
-#define caldav_busy_stub(_func_name, _params, _call_func, _call_params)	\
-static void								\
-_func_name _params							\
-{									\
-	ECalBackendCalDAV        *cbdav;				\
-	SlaveCommand		  old_slave_cmd;			\
-	gboolean		  was_slave_busy;			\
-									\
-	cbdav = E_CAL_BACKEND_CALDAV (backend);				\
-									\
-	/* this is done before locking */				\
-	old_slave_cmd = cbdav->priv->slave_cmd;				\
-	was_slave_busy = cbdav->priv->slave_busy;			\
-	if (was_slave_busy) {						\
-		/* let it pause its work and do our job */		\
-		update_slave_cmd (cbdav->priv, SLAVE_SHOULD_SLEEP);	\
-	}								\
-									\
-	g_mutex_lock (&cbdav->priv->busy_lock);				\
-	_call_func _call_params;					\
-									\
-	/* this is done before unlocking */				\
-	if (was_slave_busy) {						\
-		update_slave_cmd (cbdav->priv, old_slave_cmd);		\
-		g_cond_signal (&cbdav->priv->cond);			\
-	}								\
-									\
-	g_mutex_unlock (&cbdav->priv->busy_lock);			\
+#define caldav_busy_stub(_func_name, _params, _call_func, _call_params) \
+static void \
+_func_name _params \
+{ \
+	ECalBackendCalDAV        *cbdav; \
+	SlaveCommand		  old_slave_cmd; \
+	gboolean		  was_slave_busy; \
+ \
+	cbdav = E_CAL_BACKEND_CALDAV (backend); \
+ \
+	/* this is done before locking */ \
+	old_slave_cmd = cbdav->priv->slave_cmd; \
+	was_slave_busy = cbdav->priv->slave_busy; \
+	if (was_slave_busy) { \
+		/* let it pause its work and do our job */ \
+		update_slave_cmd (cbdav->priv, SLAVE_SHOULD_SLEEP); \
+	} \
+ \
+	g_mutex_lock (&cbdav->priv->busy_lock); \
+	_call_func _call_params; \
+ \
+	/* this is done before unlocking */ \
+	if (was_slave_busy) { \
+		update_slave_cmd (cbdav->priv, old_slave_cmd); \
+		g_cond_signal (&cbdav->priv->cond); \
+	} \
+ \
+	g_mutex_unlock (&cbdav->priv->busy_lock); \
 }
 
 caldav_busy_stub (
@@ -5296,7 +5296,7 @@ e_cal_backend_caldav_init (ECalBackendCalDAV *cbdav)
 	if (G_UNLIKELY (caldav_debug_show (DEBUG_MESSAGE)))
 		caldav_debug_setup (cbdav->priv->session);
 
-	cbdav->priv->loaded   = FALSE;
+	cbdav->priv->loaded = FALSE;
 	cbdav->priv->opened = FALSE;
 
 	/* Thinks the 'getctag' extension is available the first time, but unset it when realizes it isn't. */
@@ -5340,26 +5340,26 @@ e_cal_backend_caldav_class_init (ECalBackendCalDAVClass *class)
 	parent_class = (ECalBackendSyncClass *) g_type_class_peek_parent (class);
 	g_type_class_add_private (class, sizeof (ECalBackendCalDAVPrivate));
 
-	object_class->dispose  = e_cal_backend_caldav_dispose;
+	object_class->dispose = e_cal_backend_caldav_dispose;
 	object_class->finalize = e_cal_backend_caldav_finalize;
 	object_class->constructed = cal_backend_caldav_constructed;
 
 	backend_class->get_backend_property = caldav_get_backend_property;
 	backend_class->shutdown = caldav_shutdown;
 
-	sync_class->open_sync			= caldav_do_open;
-	sync_class->refresh_sync		= caldav_refresh;
+	sync_class->open_sync = caldav_do_open;
+	sync_class->refresh_sync = caldav_refresh;
 
-	sync_class->create_objects_sync		= caldav_create_objects;
-	sync_class->modify_objects_sync		= caldav_modify_objects;
-	sync_class->remove_objects_sync		= caldav_remove_objects;
+	sync_class->create_objects_sync = caldav_create_objects;
+	sync_class->modify_objects_sync = caldav_modify_objects;
+	sync_class->remove_objects_sync = caldav_remove_objects;
 
-	sync_class->receive_objects_sync	= caldav_receive_objects;
-	sync_class->send_objects_sync		= caldav_send_objects;
-	sync_class->get_object_sync		= caldav_get_object;
-	sync_class->get_object_list_sync	= caldav_get_object_list;
-	sync_class->add_timezone_sync		= caldav_add_timezone;
-	sync_class->get_free_busy_sync		= caldav_get_free_busy;
+	sync_class->receive_objects_sync = caldav_receive_objects;
+	sync_class->send_objects_sync = caldav_send_objects;
+	sync_class->get_object_sync = caldav_get_object;
+	sync_class->get_object_list_sync = caldav_get_object_list;
+	sync_class->add_timezone_sync = caldav_add_timezone;
+	sync_class->get_free_busy_sync = caldav_get_free_busy;
 
-	backend_class->start_view		= caldav_start_view;
+	backend_class->start_view = caldav_start_view;
 }
diff --git a/calendar/backends/contacts/e-cal-backend-contacts.c b/calendar/backends/contacts/e-cal-backend-contacts.c
index 03aa26e05..b9c3fd832 100644
--- a/calendar/backends/contacts/e-cal-backend-contacts.c
+++ b/calendar/backends/contacts/e-cal-backend-contacts.c
@@ -1356,16 +1356,16 @@ e_cal_backend_contacts_class_init (ECalBackendContactsClass *class)
 
 	backend_class->get_backend_property = e_cal_backend_contacts_get_backend_property;
 
-	sync_class->open_sync			= e_cal_backend_contacts_open;
-	sync_class->create_objects_sync		= e_cal_backend_contacts_create_objects;
-	sync_class->receive_objects_sync	= e_cal_backend_contacts_receive_objects;
-	sync_class->send_objects_sync		= e_cal_backend_contacts_send_objects;
-	sync_class->get_object_sync		= e_cal_backend_contacts_get_object;
-	sync_class->get_object_list_sync	= e_cal_backend_contacts_get_object_list;
-	sync_class->add_timezone_sync		= e_cal_backend_contacts_add_timezone;
-	sync_class->get_free_busy_sync		= e_cal_backend_contacts_get_free_busy;
-
-	backend_class->start_view		= e_cal_backend_contacts_start_view;
+	sync_class->open_sync = e_cal_backend_contacts_open;
+	sync_class->create_objects_sync = e_cal_backend_contacts_create_objects;
+	sync_class->receive_objects_sync = e_cal_backend_contacts_receive_objects;
+	sync_class->send_objects_sync = e_cal_backend_contacts_send_objects;
+	sync_class->get_object_sync = e_cal_backend_contacts_get_object;
+	sync_class->get_object_list_sync = e_cal_backend_contacts_get_object_list;
+	sync_class->add_timezone_sync = e_cal_backend_contacts_add_timezone;
+	sync_class->get_free_busy_sync = e_cal_backend_contacts_get_free_busy;
+
+	backend_class->start_view = e_cal_backend_contacts_start_view;
 
 	/* Register our ESource extension. */
 	E_TYPE_SOURCE_CONTACTS;
diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c
index 1015d53e2..4d27546f8 100644
--- a/calendar/backends/file/e-cal-backend-file.c
+++ b/calendar/backends/file/e-cal-backend-file.c
@@ -448,7 +448,7 @@ static void
 bump_revision (ECalBackendFile *cbfile)
 {
 	/* Update the revision string */
-	icalproperty *prop     = ensure_revision (cbfile);
+	icalproperty *prop = ensure_revision (cbfile);
 	gchar        *revision = make_revision_string (cbfile);
 
 	icalproperty_set_x (prop, revision);
@@ -1696,7 +1696,7 @@ e_cal_backend_file_get_object_list (ECalBackendSync *backend,
 		&occur_start,
 		&occur_end);
 
-	objs_occuring_in_tw =  NULL;
+	objs_occuring_in_tw = NULL;
 
 	if (!prunning_by_time) {
 		g_hash_table_foreach (priv->comp_uid_hash, (GHFunc) match_object_sexp,
@@ -3543,19 +3543,19 @@ e_cal_backend_file_class_init (ECalBackendFileClass *class)
 
 	backend_class->get_backend_property = e_cal_backend_file_get_backend_property;
 
-	sync_class->open_sync			= e_cal_backend_file_open;
-	sync_class->create_objects_sync		= e_cal_backend_file_create_objects;
-	sync_class->modify_objects_sync		= e_cal_backend_file_modify_objects;
-	sync_class->remove_objects_sync		= e_cal_backend_file_remove_objects;
-	sync_class->receive_objects_sync	= e_cal_backend_file_receive_objects;
-	sync_class->send_objects_sync		= e_cal_backend_file_send_objects;
-	sync_class->get_object_sync		= e_cal_backend_file_get_object;
-	sync_class->get_object_list_sync	= e_cal_backend_file_get_object_list;
-	sync_class->get_attachment_uris_sync	= e_cal_backend_file_get_attachment_uris;
-	sync_class->add_timezone_sync		= e_cal_backend_file_add_timezone;
-	sync_class->get_free_busy_sync		= e_cal_backend_file_get_free_busy;
-
-	backend_class->start_view		= e_cal_backend_file_start_view;
+	sync_class->open_sync = e_cal_backend_file_open;
+	sync_class->create_objects_sync = e_cal_backend_file_create_objects;
+	sync_class->modify_objects_sync = e_cal_backend_file_modify_objects;
+	sync_class->remove_objects_sync = e_cal_backend_file_remove_objects;
+	sync_class->receive_objects_sync = e_cal_backend_file_receive_objects;
+	sync_class->send_objects_sync = e_cal_backend_file_send_objects;
+	sync_class->get_object_sync = e_cal_backend_file_get_object;
+	sync_class->get_object_list_sync = e_cal_backend_file_get_object_list;
+	sync_class->get_attachment_uris_sync = e_cal_backend_file_get_attachment_uris;
+	sync_class->add_timezone_sync = e_cal_backend_file_add_timezone;
+	sync_class->get_free_busy_sync = e_cal_backend_file_get_free_busy;
+
+	backend_class->start_view = e_cal_backend_file_start_view;
 
 	/* Register our ESource extension. */
 	E_TYPE_SOURCE_LOCAL;
diff --git a/calendar/backends/http/e-cal-backend-http.c b/calendar/backends/http/e-cal-backend-http.c
index 8b8232ab9..474a792a0 100644
--- a/calendar/backends/http/e-cal-backend-http.c
+++ b/calendar/backends/http/e-cal-backend-http.c
@@ -1498,19 +1498,19 @@ e_cal_backend_http_class_init (ECalBackendHttpClass *class)
 
 	backend_class->get_backend_property = e_cal_backend_http_get_backend_property;
 
-	sync_class->open_sync			= e_cal_backend_http_open;
-	sync_class->refresh_sync		= e_cal_backend_http_refresh;
-	sync_class->create_objects_sync		= e_cal_backend_http_create_objects;
-	sync_class->modify_objects_sync		= e_cal_backend_http_modify_objects;
-	sync_class->remove_objects_sync		= e_cal_backend_http_remove_objects;
-	sync_class->receive_objects_sync	= e_cal_backend_http_receive_objects;
-	sync_class->send_objects_sync		= e_cal_backend_http_send_objects;
-	sync_class->get_object_sync		= e_cal_backend_http_get_object;
-	sync_class->get_object_list_sync	= e_cal_backend_http_get_object_list;
-	sync_class->add_timezone_sync		= e_cal_backend_http_add_timezone;
-	sync_class->get_free_busy_sync		= e_cal_backend_http_get_free_busy;
-
-	backend_class->start_view		= e_cal_backend_http_start_view;
+	sync_class->open_sync = e_cal_backend_http_open;
+	sync_class->refresh_sync = e_cal_backend_http_refresh;
+	sync_class->create_objects_sync = e_cal_backend_http_create_objects;
+	sync_class->modify_objects_sync = e_cal_backend_http_modify_objects;
+	sync_class->remove_objects_sync = e_cal_backend_http_remove_objects;
+	sync_class->receive_objects_sync = e_cal_backend_http_receive_objects;
+	sync_class->send_objects_sync = e_cal_backend_http_send_objects;
+	sync_class->get_object_sync = e_cal_backend_http_get_object;
+	sync_class->get_object_list_sync = e_cal_backend_http_get_object_list;
+	sync_class->add_timezone_sync = e_cal_backend_http_add_timezone;
+	sync_class->get_free_busy_sync = e_cal_backend_http_get_free_busy;
+
+	backend_class->start_view = e_cal_backend_http_start_view;
 }
 
 static void
diff --git a/calendar/backends/weather/e-cal-backend-weather.c b/calendar/backends/weather/e-cal-backend-weather.c
index 23d6fb578..9f6c653fd 100644
--- a/calendar/backends/weather/e-cal-backend-weather.c
+++ b/calendar/backends/weather/e-cal-backend-weather.c
@@ -792,15 +792,15 @@ e_cal_backend_weather_class_init (ECalBackendWeatherClass *class)
 
 	backend_class->get_backend_property = e_cal_backend_weather_get_backend_property;
 
-	sync_class->open_sync			= e_cal_backend_weather_open;
-	sync_class->refresh_sync		= e_cal_backend_weather_refresh;
-	sync_class->receive_objects_sync	= e_cal_backend_weather_receive_objects;
-	sync_class->get_object_sync		= e_cal_backend_weather_get_object;
-	sync_class->get_object_list_sync	= e_cal_backend_weather_get_object_list;
-	sync_class->add_timezone_sync		= e_cal_backend_weather_add_timezone;
-	sync_class->get_free_busy_sync		= e_cal_backend_weather_get_free_busy;
-
-	backend_class->start_view		= e_cal_backend_weather_start_view;
+	sync_class->open_sync = e_cal_backend_weather_open;
+	sync_class->refresh_sync = e_cal_backend_weather_refresh;
+	sync_class->receive_objects_sync = e_cal_backend_weather_receive_objects;
+	sync_class->get_object_sync = e_cal_backend_weather_get_object;
+	sync_class->get_object_list_sync = e_cal_backend_weather_get_object_list;
+	sync_class->add_timezone_sync = e_cal_backend_weather_add_timezone;
+	sync_class->get_free_busy_sync = e_cal_backend_weather_get_free_busy;
+
+	backend_class->start_view = e_cal_backend_weather_start_view;
 
 	/* Register our ESource extension. */
 	E_TYPE_SOURCE_WEATHER;
diff --git a/calendar/backends/weather/e-weather-source.c b/calendar/backends/weather/e-weather-source.c
index 8288d99b0..2515d1ce3 100644
--- a/calendar/backends/weather/e-weather-source.c
+++ b/calendar/backends/weather/e-weather-source.c
@@ -73,8 +73,8 @@ e_weather_source_init (EWeatherSource *source)
 
 static GWeatherLocation *
 weather_source_find_location_by_coords (GWeatherLocation *start,
-					gdouble latitude,
-					gdouble longitude)
+                                        gdouble latitude,
+                                        gdouble longitude)
 {
 	GWeatherLocation *location, **children;
 	gint ii;
diff --git a/calendar/libecal/e-cal-client-view.h b/calendar/libecal/e-cal-client-view.h
index eb534f9ed..ed22f112e 100644
--- a/calendar/libecal/e-cal-client-view.h
+++ b/calendar/libecal/e-cal-client-view.h
@@ -68,7 +68,7 @@ struct _ECalClient;
  * Since: 3.6
  */
 typedef enum {
-	E_CAL_CLIENT_VIEW_FLAGS_NONE           = 0,
+	E_CAL_CLIENT_VIEW_FLAGS_NONE = 0,
 	E_CAL_CLIENT_VIEW_FLAGS_NOTIFY_INITIAL = (1 << 0)
 } ECalClientViewFlags;
 
diff --git a/calendar/libecal/e-cal-recur.c b/calendar/libecal/e-cal-recur.c
index 306ac7fac..462d1c17a 100644
--- a/calendar/libecal/e-cal-recur.c
+++ b/calendar/libecal/e-cal-recur.c
@@ -850,19 +850,19 @@ e_cal_recur_generate_instances_of_rule (ECalComponent *comp,
 		chunk_end.year = year;
 
 		if (year != interval_start.year) {
-			chunk_start.month  = 0;
-			chunk_start.day    = 1;
-			chunk_start.hour   = 0;
+			chunk_start.month = 0;
+			chunk_start.day = 1;
+			chunk_start.hour = 0;
 			chunk_start.minute = 0;
 			chunk_start.second = 0;
 		}
 		if (end == -1 || year != interval_end.year) {
-			chunk_end.month  = 11;
-			chunk_end.day    = 31;
-			chunk_end.hour   = 23;
+			chunk_end.month = 11;
+			chunk_end.day = 31;
+			chunk_end.hour = 23;
 			chunk_end.minute = 59;
 			chunk_end.second = 61;
-			chunk_end.flags  = FALSE;
+			chunk_end.flags = FALSE;
 		}
 
 		if (!generate_instances_for_chunk (comp, dtstart_time,
@@ -1233,13 +1233,13 @@ generate_instances_for_chunk (ECalComponent *comp,
 		p = elem->data;
 
 		tt = icaltime_convert_to_zone (p->start, zone);
-		cotime.year     = tt.year;
-		cotime.month    = tt.month - 1;
-		cotime.day      = tt.day;
-		cotime.hour     = tt.hour;
-		cotime.minute   = tt.minute;
-		cotime.second   = tt.second;
-		cotime.flags    = FALSE;
+		cotime.year = tt.year;
+		cotime.month = tt.month - 1;
+		cotime.day = tt.day;
+		cotime.hour = tt.hour;
+		cotime.minute = tt.minute;
+		cotime.second = tt.second;
+		cotime.flags = FALSE;
 
 		/* If the rdate is after the current chunk we set finished
 		 * to FALSE, and we skip it. */
@@ -1293,23 +1293,23 @@ generate_instances_for_chunk (ECalComponent *comp,
 		cdt = elem->data;
 		tt = icaltime_convert_to_zone (*cdt->value, zone);
 
-		cotime.year     = tt.year;
-		cotime.month    = tt.month - 1;
-		cotime.day      = tt.day;
+		cotime.year = tt.year;
+		cotime.month = tt.month - 1;
+		cotime.day = tt.day;
 
 		/* If the EXDATE has a DATE value, set the time to the start
 		 * of the day and set flags to TRUE so we know to skip all
 		 * occurrences on that date. */
 		if (cdt->value->is_date) {
-			cotime.hour     = 0;
-			cotime.minute   = 0;
-			cotime.second   = 0;
-			cotime.flags    = TRUE;
+			cotime.hour = 0;
+			cotime.minute = 0;
+			cotime.second = 0;
+			cotime.flags = TRUE;
 		} else {
-			cotime.hour     = tt.hour;
-			cotime.minute   = tt.minute;
-			cotime.second   = tt.second;
-			cotime.flags    = FALSE;
+			cotime.hour = tt.hour;
+			cotime.minute = tt.minute;
+			cotime.second = tt.second;
+			cotime.flags = FALSE;
 		}
 
 		g_array_append_val (ex_occs, cotime);
@@ -1339,10 +1339,10 @@ generate_instances_for_chunk (ECalComponent *comp,
 			cal_obj_time_to_string (occ));
 #endif
 		start_tt = icaltime_null_time ();
-		start_tt.year   = occ->year;
-		start_tt.month  = occ->month + 1;
-		start_tt.day    = occ->day;
-		start_tt.hour   = occ->hour;
+		start_tt.year = occ->year;
+		start_tt.month = occ->month + 1;
+		start_tt.day = occ->day;
+		start_tt.hour = occ->hour;
 		start_tt.minute = occ->minute;
 		start_tt.second = occ->second;
 		start_time = icaltime_as_timet_with_zone (start_tt, zone);
@@ -1383,10 +1383,10 @@ generate_instances_for_chunk (ECalComponent *comp,
 		}
 
 		end_tt = icaltime_null_time ();
-		end_tt.year   = occ->year;
-		end_tt.month  = occ->month + 1;
-		end_tt.day    = occ->day;
-		end_tt.hour   = occ->hour;
+		end_tt.year = occ->year;
+		end_tt.month = occ->month + 1;
+		end_tt.day = occ->day;
+		end_tt.hour = occ->hour;
 		end_tt.minute = occ->minute;
 		end_tt.second = occ->second;
 		end_time = icaltime_as_timet_with_zone (end_tt, zone);
@@ -1464,13 +1464,13 @@ cal_object_get_rdate_end (CalObjTime *occ,
 	if (p->type == E_CAL_COMPONENT_PERIOD_DATETIME) {
 		struct icaltimetype tt =
 			icaltime_convert_to_zone (p->u.end, zone);
-		occ->year     = tt.year;
-		occ->month    = tt.month - 1;
-		occ->day      = tt.day;
-		occ->hour     = tt.hour;
-		occ->minute   = tt.minute;
-		occ->second   = tt.second;
-		occ->flags    = FALSE;
+		occ->year = tt.year;
+		occ->month = tt.month - 1;
+		occ->day = tt.day;
+		occ->hour = tt.hour;
+		occ->minute = tt.minute;
+		occ->second = tt.second;
+		occ->flags = FALSE;
 	} else {
 		cal_obj_time_add_days (
 			occ,
@@ -2016,7 +2016,7 @@ cal_obj_remove_duplicates_and_invalid_dates (GArray *occs)
 		if (keep_occ) {
 			if (i != j)
 				g_array_index (occs, CalObjTime, j)
-					= g_array_index (occs, CalObjTime, i);
+ = g_array_index (occs, CalObjTime, i);
 			j++;
 		}
 
@@ -2117,7 +2117,7 @@ cal_obj_remove_exceptions (GArray *occs,
 			 * kept). */
 			if (i != j)
 				g_array_index (occs, CalObjTime, j)
-					= g_array_index (occs, CalObjTime, i);
+ = g_array_index (occs, CalObjTime, i);
 			j++;
 		}
 
@@ -3788,13 +3788,13 @@ cal_object_time_from_time (CalObjTime *cotime,
 	else
 		tt = icaltime_from_timet (t, FALSE);
 
-	cotime->year     = tt.year;
-	cotime->month    = tt.month - 1;
-	cotime->day      = tt.day;
-	cotime->hour     = tt.hour;
-	cotime->minute   = tt.minute;
-	cotime->second   = tt.second;
-	cotime->flags    = FALSE;
+	cotime->year = tt.year;
+	cotime->month = tt.month - 1;
+	cotime->day = tt.day;
+	cotime->hour = tt.hour;
+	cotime->minute = tt.minute;
+	cotime->second = tt.second;
+	cotime->flags = FALSE;
 }
 
 /* Debugging function to convert a CalObjTime to a string. It uses a static
diff --git a/calendar/libecal/e-cal-time-util.c b/calendar/libecal/e-cal-time-util.c
index 725a7ba21..5f9ff56bf 100644
--- a/calendar/libecal/e-cal-time-util.c
+++ b/calendar/libecal/e-cal-time-util.c
@@ -262,9 +262,9 @@ time_year_begin_with_zone (time_t time,
 	tt = icaltime_from_timet_with_zone (time, FALSE, zone);
 
 	/* Set it to the start of the year. */
-	tt.month  = 1;
-	tt.day    = 1;
-	tt.hour   = 0;
+	tt.month = 1;
+	tt.day = 1;
+	tt.hour = 0;
 	tt.minute = 0;
 	tt.second = 0;
 
@@ -295,8 +295,8 @@ time_month_begin_with_zone (time_t time,
 	tt = icaltime_from_timet_with_zone (time, FALSE, zone);
 
 	/* Set it to the start of the month. */
-	tt.day    = 1;
-	tt.hour   = 0;
+	tt.day = 1;
+	tt.hour = 0;
 	tt.minute = 0;
 	tt.second = 0;
 
@@ -338,7 +338,7 @@ time_week_begin_with_zone (time_t time,
 
 	/* Set it to the start of the month. */
 	tt.day -= offset;
-	tt.hour   = 0;
+	tt.hour = 0;
 	tt.minute = 0;
 	tt.second = 0;
 
@@ -372,7 +372,7 @@ time_day_begin_with_zone (time_t time,
 	tt = icaltime_from_timet_with_zone (time, FALSE, zone);
 
 	/* Set it to the start of the day. */
-	tt.hour   = 0;
+	tt.hour = 0;
 	tt.minute = 0;
 	tt.second = 0;
 
@@ -404,7 +404,7 @@ time_day_end_with_zone (time_t time,
 
 	/* Set it to the start of the next day. */
 	tt.day++;
-	tt.hour   = 0;
+	tt.hour = 0;
 	tt.minute = 0;
 	tt.second = 0;
 
@@ -645,9 +645,9 @@ time_from_isodate (const gchar *str)
 	if (len > 8) {
 		tt.hour = digit_at (str, 9) * 10
 			+ digit_at (str, 10);
-		tt.minute  = digit_at (str, 11) * 10
+		tt.minute = digit_at (str, 11) * 10
 			   + digit_at (str, 12);
-		tt.second  = digit_at (str, 13) * 10
+		tt.second = digit_at (str, 13) * 10
 			   + digit_at (str, 14);
 	}
 
diff --git a/calendar/libecal/e-cal-types.h b/calendar/libecal/e-cal-types.h
index a51e4570b..2e573ee53 100644
--- a/calendar/libecal/e-cal-types.h
+++ b/calendar/libecal/e-cal-types.h
@@ -52,11 +52,11 @@ typedef enum {
  * Since: 3.8
  **/
 typedef enum {
-	E_CAL_OBJ_MOD_THIS            = 1 << 0,
-	E_CAL_OBJ_MOD_THIS_AND_PRIOR  = 1 << 1,
+	E_CAL_OBJ_MOD_THIS = 1 << 0,
+	E_CAL_OBJ_MOD_THIS_AND_PRIOR = 1 << 1,
 	E_CAL_OBJ_MOD_THIS_AND_FUTURE = 1 << 2,
-	E_CAL_OBJ_MOD_ALL             = 0x07,
-	E_CAL_OBJ_MOD_ONLY_THIS       = 1 << 3
+	E_CAL_OBJ_MOD_ALL = 0x07,
+	E_CAL_OBJ_MOD_ONLY_THIS = 1 << 3
 } ECalObjModType;
 
 /** Everything below this point is deprecated. **/
diff --git a/calendar/libecal/e-cal-util.h b/calendar/libecal/e-cal-util.h
index e336ff11c..1adc75384 100644
--- a/calendar/libecal/e-cal-util.h
+++ b/calendar/libecal/e-cal-util.h
@@ -210,14 +210,14 @@ void		e_cal_util_get_component_occur_times
 /* Used for mode stuff */
 typedef enum {
 	CAL_MODE_INVALID = -1,
-	CAL_MODE_LOCAL   = 1 << 0,
-	CAL_MODE_REMOTE  = 1 << 1,
-	CAL_MODE_ANY     = 0x07
+	CAL_MODE_LOCAL = 1 << 0,
+	CAL_MODE_REMOTE = 1 << 1,
+	CAL_MODE_ANY = 0x07
 } CalMode;
 
 #define cal_mode_to_corba(mode) \
-	(mode == CAL_MODE_LOCAL   ? Local  : \
-	 mode == CAL_MODE_REMOTE  ? Remote : \
+	(mode == CAL_MODE_LOCAL ? Local : \
+	 mode == CAL_MODE_REMOTE ? Remote : \
 	 AnyMode)
 #endif /* EDS_DISABLE_DEPRECATED */
 
diff --git a/calendar/libedata-cal/e-cal-backend-sexp.c b/calendar/libedata-cal/e-cal-backend-sexp.c
index bfe3fd182..af4910c3a 100644
--- a/calendar/libedata-cal/e-cal-backend-sexp.c
+++ b/calendar/libedata-cal/e-cal-backend-sexp.c
@@ -566,17 +566,17 @@ matches_status (ECalComponent *comp ,const gchar *str)
 			return TRUE;
 	else if (g_str_equal (str, "CANCELLED") && status == ICAL_STATUS_CANCELLED)
 			return TRUE;
-	else if (g_str_equal (str, "IN PROGRESS")  && status == ICAL_STATUS_INPROCESS)
+	else if (g_str_equal (str, "IN PROGRESS") && status == ICAL_STATUS_INPROCESS)
 			return TRUE;
-	else if (g_str_equal (str, "NEEDS ACTION")  && status == ICAL_STATUS_NEEDSACTION)
+	else if (g_str_equal (str, "NEEDS ACTION") && status == ICAL_STATUS_NEEDSACTION)
 			return TRUE;
-	else if (g_str_equal (str, "TENTATIVE")  && status == ICAL_STATUS_TENTATIVE)
+	else if (g_str_equal (str, "TENTATIVE") && status == ICAL_STATUS_TENTATIVE)
 			return TRUE;
-	else if (g_str_equal (str, "CONFIRMED")  && status == ICAL_STATUS_CONFIRMED)
+	else if (g_str_equal (str, "CONFIRMED") && status == ICAL_STATUS_CONFIRMED)
 			return TRUE;
-	else if (g_str_equal (str, "DRAFT")  && status == ICAL_STATUS_DRAFT)
+	else if (g_str_equal (str, "DRAFT") && status == ICAL_STATUS_DRAFT)
 			return TRUE;
-	else if (g_str_equal (str, "FINAL")  && status == ICAL_STATUS_FINAL)
+	else if (g_str_equal (str, "FINAL") && status == ICAL_STATUS_FINAL)
 			return TRUE;
 
 	return FALSE;
diff --git a/calendar/libedata-cal/e-cal-backend-sync.c b/calendar/libedata-cal/e-cal-backend-sync.c
index 6dd5fe1b5..ccb61221c 100644
--- a/calendar/libedata-cal/e-cal-backend-sync.c
+++ b/calendar/libedata-cal/e-cal-backend-sync.c
@@ -905,20 +905,20 @@ e_cal_backend_sync_class_init (ECalBackendSyncClass *class)
 	ECalBackendClass *backend_class;
 
 	backend_class = E_CAL_BACKEND_CLASS (class);
-	backend_class->open			= cal_backend_open;
-	backend_class->refresh			= cal_backend_refresh;
-	backend_class->get_object		= cal_backend_get_object;
-	backend_class->get_object_list		= cal_backend_get_object_list;
-	backend_class->get_free_busy		= cal_backend_get_free_busy;
-	backend_class->create_objects		= cal_backend_create_objects;
-	backend_class->modify_objects		= cal_backend_modify_objects;
-	backend_class->remove_objects		= cal_backend_remove_objects;
-	backend_class->receive_objects		= cal_backend_receive_objects;
-	backend_class->send_objects		= cal_backend_send_objects;
-	backend_class->get_attachment_uris	= cal_backend_get_attachment_uris;
-	backend_class->discard_alarm		= cal_backend_discard_alarm;
-	backend_class->get_timezone		= cal_backend_get_timezone;
-	backend_class->add_timezone		= cal_backend_add_timezone;
+	backend_class->open = cal_backend_open;
+	backend_class->refresh = cal_backend_refresh;
+	backend_class->get_object = cal_backend_get_object;
+	backend_class->get_object_list = cal_backend_get_object_list;
+	backend_class->get_free_busy = cal_backend_get_free_busy;
+	backend_class->create_objects = cal_backend_create_objects;
+	backend_class->modify_objects = cal_backend_modify_objects;
+	backend_class->remove_objects = cal_backend_remove_objects;
+	backend_class->receive_objects = cal_backend_receive_objects;
+	backend_class->send_objects = cal_backend_send_objects;
+	backend_class->get_attachment_uris = cal_backend_get_attachment_uris;
+	backend_class->discard_alarm = cal_backend_discard_alarm;
+	backend_class->get_timezone = cal_backend_get_timezone;
+	backend_class->add_timezone = cal_backend_add_timezone;
 }
 
 static void
diff --git a/calendar/libedata-cal/e-data-cal-view.c b/calendar/libedata-cal/e-data-cal-view.c
index 82c454a82..55db6ec23 100644
--- a/calendar/libedata-cal/e-data-cal-view.c
+++ b/calendar/libedata-cal/e-data-cal-view.c
@@ -761,7 +761,7 @@ notify_remove (EDataCalView *view,
                ECalComponentId *id)
 {
 	gchar *ids;
- 	gsize ids_len, ids_offset;
+	gsize ids_len, ids_offset;
 	gchar *uid, *rid;
 	gsize uid_len, rid_len;
 
@@ -1064,7 +1064,7 @@ filter_component (icalcomponent *icomponent,
 	/* 	kind_string = icomponent->x_name; */
 	/* } */
 
-	kind_string  = icalcomponent_kind_to_string (kind);
+	kind_string = icalcomponent_kind_to_string (kind);
 
 	g_string_append (string, kind_string);
 	g_string_append (string, newline);
diff --git a/camel/camel-block-file.h b/camel/camel-block-file.h
index 64e5644d9..ab447b5e9 100644
--- a/camel/camel-block-file.h
+++ b/camel/camel-block-file.h
@@ -85,7 +85,7 @@ typedef enum {
 #define CAMEL_BLOCK_SIZE_BITS (10) /* # bits to contain block_size bytes */
 
 typedef enum {
-	CAMEL_BLOCK_DIRTY    = 1 << 0,
+	CAMEL_BLOCK_DIRTY = 1 << 0,
 	CAMEL_BLOCK_DETACHED = 1 << 1
 } CamelBlockFlags;
 
diff --git a/camel/camel-certdb.c b/camel/camel-certdb.c
index 78b328f90..e9d1e5d24 100644
--- a/camel/camel-certdb.c
+++ b/camel/camel-certdb.c
@@ -173,7 +173,7 @@ camel_certdb_class_init (CamelCertDBClass *class)
 	class->header_load = certdb_header_load;
 	class->header_save = certdb_header_save;
 
-	class->cert_new  = certdb_cert_new;
+	class->cert_new = certdb_cert_new;
 	class->cert_load = certdb_cert_load;
 	class->cert_save = certdb_cert_save;
 	class->cert_free = certdb_cert_free;
diff --git a/camel/camel-charset-map-private.h b/camel/camel-charset-map-private.h
index 80fd9fc7e..549749771 100644
--- a/camel/camel-charset-map-private.h
+++ b/camel/camel-charset-map-private.h
@@ -11136,7 +11136,7 @@ static const struct {
 };
 
 #define charset_mask(x) \
-	(camel_charmap[(x) >> 8].bits0 ? camel_charmap[(x) >> 8].bits0[(x) & 0xff] << 0 : 0)	\
-	| (camel_charmap[(x) >> 8].bits1 ? camel_charmap[(x) >> 8].bits1[(x) & 0xff] << 8 : 0)	\
+	(camel_charmap[(x) >> 8].bits0 ? camel_charmap[(x) >> 8].bits0[(x) & 0xff] << 0 : 0) \
+	| (camel_charmap[(x) >> 8].bits1 ? camel_charmap[(x) >> 8].bits1[(x) & 0xff] << 8 : 0) \
 	| (camel_charmap[(x) >> 8].bits2 ? camel_charmap[(x) >> 8].bits2[(x) & 0xff] << 16 : 0)
 
diff --git a/camel/camel-db.c b/camel/camel-db.c
index 6aebd6195..329b2c93d 100644
--- a/camel/camel-db.c
+++ b/camel/camel-db.c
@@ -182,18 +182,18 @@ sync_push_request_timeout (CamelSqlite3File *cFile)
 	return FALSE;
 }
 
-#define def_subclassed(_nm, _params, _call)			\
-static gint							\
-camel_sqlite3_file_ ## _nm _params				\
-{								\
-	CamelSqlite3File *cFile;				\
-								\
-	g_return_val_if_fail (old_vfs != NULL, SQLITE_ERROR);	\
-	g_return_val_if_fail (pFile != NULL, SQLITE_ERROR);	\
-								\
-	cFile = (CamelSqlite3File *) pFile;		\
-	g_return_val_if_fail (cFile->old_vfs_file->pMethods != NULL, SQLITE_ERROR);	\
-	return cFile->old_vfs_file->pMethods->_nm _call;	\
+#define def_subclassed(_nm, _params, _call) \
+static gint \
+camel_sqlite3_file_ ## _nm _params \
+{ \
+	CamelSqlite3File *cFile; \
+ \
+	g_return_val_if_fail (old_vfs != NULL, SQLITE_ERROR); \
+	g_return_val_if_fail (pFile != NULL, SQLITE_ERROR); \
+ \
+	cFile = (CamelSqlite3File *) pFile; \
+	g_return_val_if_fail (cFile->old_vfs_file->pMethods != NULL, SQLITE_ERROR); \
+	return cFile->old_vfs_file->pMethods->_nm _call; \
 }
 
 def_subclassed (xRead, (sqlite3_file *pFile, gpointer pBuf, gint iAmt, sqlite3_int64 iOfst), (cFile->old_vfs_file, pBuf, iAmt, iOfst))
diff --git a/camel/camel-debug.c b/camel/camel-debug.c
index 787a7da98..d5e697d46 100644
--- a/camel/camel-debug.c
+++ b/camel/camel-debug.c
@@ -208,7 +208,7 @@ i386_length_and_rw_bits (gint len,
 
 #define I386_DR_SET_RW_LEN(i,rwlen) \
   do { \
-    dr_control_mirror &= ~(0x0f << (DR_CONTROL_SHIFT + DR_CONTROL_SIZE * (i)));   \
+    dr_control_mirror &= ~(0x0f << (DR_CONTROL_SHIFT + DR_CONTROL_SIZE * (i))); \
     dr_control_mirror |= ((rwlen) << (DR_CONTROL_SHIFT + DR_CONTROL_SIZE * (i))); \
   } while (0)
 
@@ -216,12 +216,12 @@ i386_length_and_rw_bits (gint len,
   dr_control_mirror |= (1 << (DR_LOCAL_ENABLE_SHIFT + DR_ENABLE_SIZE * (i)))
 
 #define set_dr(regnum, val) \
-		__asm__("movl %0,%%db" #regnum  \
+		__asm__("movl %0,%%db" #regnum \
 			: /* no output */ \
 			:"r" (val))
 
 #define get_dr(regnum, val) \
-		__asm__("movl %%db" #regnum ", %0"  \
+		__asm__("movl %%db" #regnum ", %0" \
 			:"=r" (val))
 
 /* fine idea, but it doesn't work, crashes in get_dr :-/ */
@@ -240,7 +240,7 @@ camel_debug_hwatch (gint 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));
+     control |= ( 1<< (DR_LOCAL_ENABLE_SHIFT + DR_ENABLE_SIZE * wp));
      control |= DR_LOCAL_SLOWDOWN;
      control &= ~DR_CONTROL_RESERVED;
 
diff --git a/camel/camel-enums.h b/camel/camel-enums.h
index 0a9cde397..5100bc66f 100644
--- a/camel/camel-enums.h
+++ b/camel/camel-enums.h
@@ -44,11 +44,11 @@ typedef enum {
 
 typedef enum { /*< flags >*/
 	CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY = 1 << 0,
-	CAMEL_FOLDER_FILTER_RECENT          = 1 << 2,
-	CAMEL_FOLDER_HAS_BEEN_DELETED       = 1 << 3,
-	CAMEL_FOLDER_IS_TRASH               = 1 << 4,
-	CAMEL_FOLDER_IS_JUNK                = 1 << 5,
-	CAMEL_FOLDER_FILTER_JUNK            = 1 << 6
+	CAMEL_FOLDER_FILTER_RECENT = 1 << 2,
+	CAMEL_FOLDER_HAS_BEEN_DELETED = 1 << 3,
+	CAMEL_FOLDER_IS_TRASH = 1 << 4,
+	CAMEL_FOLDER_IS_JUNK = 1 << 5,
+	CAMEL_FOLDER_FILTER_JUNK = 1 << 6
 } CamelFolderFlags;
 
 #define CAMEL_FOLDER_TYPE_BIT (10)
@@ -106,29 +106,29 @@ typedef enum { /*< flags >*/
 /* WARNING: This enum and CamelStoreInfoFlags must stay in sync.
  * FIXME: Eliminate the need for two separate types. */
 typedef enum { /*< flags >*/
-	CAMEL_FOLDER_NOSELECT      = 1 << 0,
-	CAMEL_FOLDER_NOINFERIORS   = 1 << 1,
-	CAMEL_FOLDER_CHILDREN      = 1 << 2,
-	CAMEL_FOLDER_NOCHILDREN    = 1 << 3,
-	CAMEL_FOLDER_SUBSCRIBED    = 1 << 4,
-	CAMEL_FOLDER_VIRTUAL       = 1 << 5,
-	CAMEL_FOLDER_SYSTEM        = 1 << 6,
-	CAMEL_FOLDER_VTRASH        = 1 << 7,
-	CAMEL_FOLDER_SHARED_TO_ME  = 1 << 8,
-	CAMEL_FOLDER_SHARED_BY_ME  = 1 << 9,
-	CAMEL_FOLDER_TYPE_NORMAL   = 0 << CAMEL_FOLDER_TYPE_BIT,
-	CAMEL_FOLDER_TYPE_INBOX    = 1 << CAMEL_FOLDER_TYPE_BIT,
-	CAMEL_FOLDER_TYPE_OUTBOX   = 2 << CAMEL_FOLDER_TYPE_BIT,
-	CAMEL_FOLDER_TYPE_TRASH    = 3 << CAMEL_FOLDER_TYPE_BIT,
-	CAMEL_FOLDER_TYPE_JUNK     = 4 << CAMEL_FOLDER_TYPE_BIT,
-	CAMEL_FOLDER_TYPE_SENT     = 5 << CAMEL_FOLDER_TYPE_BIT,
+	CAMEL_FOLDER_NOSELECT = 1 << 0,
+	CAMEL_FOLDER_NOINFERIORS = 1 << 1,
+	CAMEL_FOLDER_CHILDREN = 1 << 2,
+	CAMEL_FOLDER_NOCHILDREN = 1 << 3,
+	CAMEL_FOLDER_SUBSCRIBED = 1 << 4,
+	CAMEL_FOLDER_VIRTUAL = 1 << 5,
+	CAMEL_FOLDER_SYSTEM = 1 << 6,
+	CAMEL_FOLDER_VTRASH = 1 << 7,
+	CAMEL_FOLDER_SHARED_TO_ME = 1 << 8,
+	CAMEL_FOLDER_SHARED_BY_ME = 1 << 9,
+	CAMEL_FOLDER_TYPE_NORMAL = 0 << CAMEL_FOLDER_TYPE_BIT,
+	CAMEL_FOLDER_TYPE_INBOX = 1 << CAMEL_FOLDER_TYPE_BIT,
+	CAMEL_FOLDER_TYPE_OUTBOX = 2 << CAMEL_FOLDER_TYPE_BIT,
+	CAMEL_FOLDER_TYPE_TRASH = 3 << CAMEL_FOLDER_TYPE_BIT,
+	CAMEL_FOLDER_TYPE_JUNK = 4 << CAMEL_FOLDER_TYPE_BIT,
+	CAMEL_FOLDER_TYPE_SENT = 5 << CAMEL_FOLDER_TYPE_BIT,
 	CAMEL_FOLDER_TYPE_CONTACTS = 6 << CAMEL_FOLDER_TYPE_BIT,
-	CAMEL_FOLDER_TYPE_EVENTS   = 7 << CAMEL_FOLDER_TYPE_BIT,
-	CAMEL_FOLDER_TYPE_MEMOS    = 8 << CAMEL_FOLDER_TYPE_BIT,
-	CAMEL_FOLDER_TYPE_TASKS    = 9 << CAMEL_FOLDER_TYPE_BIT,
-	CAMEL_FOLDER_READONLY      = 1 << 16,
+	CAMEL_FOLDER_TYPE_EVENTS = 7 << CAMEL_FOLDER_TYPE_BIT,
+	CAMEL_FOLDER_TYPE_MEMOS = 8 << CAMEL_FOLDER_TYPE_BIT,
+	CAMEL_FOLDER_TYPE_TASKS = 9 << CAMEL_FOLDER_TYPE_BIT,
+	CAMEL_FOLDER_READONLY = 1 << 16,
 	/* empty gap from unused flag removal */
-	CAMEL_FOLDER_FLAGGED       = 1 << 18,
+	CAMEL_FOLDER_FLAGGED = 1 << 18,
 
 	CAMEL_FOLDER_FLAGS_LAST    = 1 << 24  /*< skip >*/
 } CamelFolderInfoFlags;
@@ -167,35 +167,35 @@ typedef enum { /*< flags >*/
  * Flags for converting text/plain content into text/html.
  **/
 typedef enum { /*< flags >*/
-	CAMEL_MIME_FILTER_TOHTML_PRE               = 1 << 0,
-	CAMEL_MIME_FILTER_TOHTML_CONVERT_NL        = 1 << 1,
-	CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES    = 1 << 2,
-	CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS      = 1 << 3,
-	CAMEL_MIME_FILTER_TOHTML_MARK_CITATION     = 1 << 4,
+	CAMEL_MIME_FILTER_TOHTML_PRE = 1 << 0,
+	CAMEL_MIME_FILTER_TOHTML_CONVERT_NL = 1 << 1,
+	CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES = 1 << 2,
+	CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS = 1 << 3,
+	CAMEL_MIME_FILTER_TOHTML_MARK_CITATION = 1 << 4,
 	CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES = 1 << 5,
-	CAMEL_MIME_FILTER_TOHTML_ESCAPE_8BIT       = 1 << 6,
-	CAMEL_MIME_FILTER_TOHTML_CITE              = 1 << 7,
-	CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT     = 1 << 8,
-	CAMEL_MIME_FILTER_TOHTML_FORMAT_FLOWED     = 1 << 9,
-	CAMEL_MIME_FILTER_TOHTML_QUOTE_CITATION    = 1 << 10
+	CAMEL_MIME_FILTER_TOHTML_ESCAPE_8BIT = 1 << 6,
+	CAMEL_MIME_FILTER_TOHTML_CITE = 1 << 7,
+	CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT = 1 << 8,
+	CAMEL_MIME_FILTER_TOHTML_FORMAT_FLOWED = 1 << 9,
+	CAMEL_MIME_FILTER_TOHTML_QUOTE_CITATION = 1 << 10
 } CamelMimeFilterToHTMLFlags;
 
 /* WARNING: This enum and CamelFolderInfoFlags must stay in sync.
  * FIXME: Eliminate the need for two separate types. */
 typedef enum { /*< flags >*/
-	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_TO_ME  = 1 << 8,
-	CAMEL_STORE_INFO_FOLDER_SHARED_BY_ME  = 1 << 9,
-	CAMEL_STORE_INFO_FOLDER_READONLY      = 1 << 16,
+	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_TO_ME = 1 << 8,
+	CAMEL_STORE_INFO_FOLDER_SHARED_BY_ME = 1 << 9,
+	CAMEL_STORE_INFO_FOLDER_READONLY = 1 << 16,
 	/* empty gap from unused flag removal */
-	CAMEL_STORE_INFO_FOLDER_FLAGGED       = 1 << 18,
+	CAMEL_STORE_INFO_FOLDER_FLAGGED = 1 << 18,
 
 	CAMEL_STORE_INFO_FOLDER_LAST          = 1 << 24  /*< skip >*/
 } CamelStoreInfoFlags;
@@ -332,18 +332,18 @@ typedef enum {
  *
  **/
 typedef enum { /*< flags >*/
-	CAMEL_PROVIDER_IS_REMOTE               = 1 << 0,
-	CAMEL_PROVIDER_IS_LOCAL                = 1 << 1,
-	CAMEL_PROVIDER_IS_EXTERNAL             = 1 << 2,
-	CAMEL_PROVIDER_IS_SOURCE               = 1 << 3,
-	CAMEL_PROVIDER_IS_STORAGE              = 1 << 4,
-	CAMEL_PROVIDER_SUPPORTS_SSL            = 1 << 5,
-	CAMEL_PROVIDER_HAS_LICENSE             = 1 << 6,
-	CAMEL_PROVIDER_DISABLE_SENT_FOLDER     = 1 << 7,
+	CAMEL_PROVIDER_IS_REMOTE = 1 << 0,
+	CAMEL_PROVIDER_IS_LOCAL = 1 << 1,
+	CAMEL_PROVIDER_IS_EXTERNAL = 1 << 2,
+	CAMEL_PROVIDER_IS_SOURCE = 1 << 3,
+	CAMEL_PROVIDER_IS_STORAGE = 1 << 4,
+	CAMEL_PROVIDER_SUPPORTS_SSL = 1 << 5,
+	CAMEL_PROVIDER_HAS_LICENSE = 1 << 6,
+	CAMEL_PROVIDER_DISABLE_SENT_FOLDER = 1 << 7,
 	CAMEL_PROVIDER_ALLOW_REAL_TRASH_FOLDER = 1 << 8,
-	CAMEL_PROVIDER_ALLOW_REAL_JUNK_FOLDER  = 1 << 9,
+	CAMEL_PROVIDER_ALLOW_REAL_JUNK_FOLDER = 1 << 9,
 	CAMEL_PROVIDER_SUPPORTS_MOBILE_DEVICES = 1 << 10,
-	CAMEL_PROVIDER_SUPPORTS_BATCH_FETCH    = 1 << 11,
+	CAMEL_PROVIDER_SUPPORTS_BATCH_FETCH = 1 << 11,
 	CAMEL_PROVIDER_SUPPORTS_PURGE_MESSAGE_CACHE = 1 << 12
 } CamelProviderFlags;
 
@@ -404,13 +404,13 @@ typedef enum {
 } CamelSortType;
 
 typedef enum { /*< flags >*/
-	CAMEL_STORE_VTRASH           = 1 << 0,
-	CAMEL_STORE_VJUNK            = 1 << 1,
-	CAMEL_STORE_PROXY            = 1 << 2,
-	CAMEL_STORE_IS_MIGRATING     = 1 << 3,
+	CAMEL_STORE_VTRASH = 1 << 0,
+	CAMEL_STORE_VJUNK = 1 << 1,
+	CAMEL_STORE_PROXY = 1 << 2,
+	CAMEL_STORE_IS_MIGRATING = 1 << 3,
 	CAMEL_STORE_REAL_JUNK_FOLDER = 1 << 4,
 	CAMEL_STORE_CAN_EDIT_FOLDERS = 1 << 5,
-	CAMEL_STORE_USE_CACHE_DIR    = 1 << 6
+	CAMEL_STORE_USE_CACHE_DIR = 1 << 6
 } CamelStoreFlags;
 
 /**
@@ -427,22 +427,22 @@ typedef enum { /*< flags >*/
  *   folder fetching.
  **/
 typedef enum { /*< flags >*/
-	CAMEL_STORE_FOLDER_INFO_FAST              = 1 << 0,
-	CAMEL_STORE_FOLDER_INFO_RECURSIVE         = 1 << 1,
-	CAMEL_STORE_FOLDER_INFO_SUBSCRIBED        = 1 << 2,
-	CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL        = 1 << 3,
+	CAMEL_STORE_FOLDER_INFO_FAST = 1 << 0,
+	CAMEL_STORE_FOLDER_INFO_RECURSIVE = 1 << 1,
+	CAMEL_STORE_FOLDER_INFO_SUBSCRIBED = 1 << 2,
+	CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL = 1 << 3,
 	CAMEL_STORE_FOLDER_INFO_SUBSCRIPTION_LIST = 1 << 4
 } CamelStoreGetFolderInfoFlags;
 
 typedef enum { /*< flags >*/
-	CAMEL_STORE_READ  = 1 << 0,
+	CAMEL_STORE_READ = 1 << 0,
 	CAMEL_STORE_WRITE = 1 << 1
 } CamelStorePermissionFlags;
 
 typedef enum { /*< flags >*/
 	CAMEL_TCP_STREAM_SSL_ENABLE_SSL2 = 1 << 0,
 	CAMEL_TCP_STREAM_SSL_ENABLE_SSL3 = 1 << 1,
-	CAMEL_TCP_STREAM_SSL_ENABLE_TLS  = 1 << 2
+	CAMEL_TCP_STREAM_SSL_ENABLE_TLS = 1 << 2
 } CamelTcpStreamSSLFlags;
 
 /* Note: If you change this, make sure you change the
diff --git a/camel/camel-file-utils.c b/camel/camel-file-utils.c
index cd33c95ab..db68cbda1 100644
--- a/camel/camel-file-utils.c
+++ b/camel/camel-file-utils.c
@@ -148,35 +148,35 @@ camel_file_util_decode_fixed_int32 (FILE *in,
 	}
 }
 
-#define CFU_ENCODE_T(type)						\
-gint									\
-camel_file_util_encode_##type (FILE *out, type value)			\
-{									\
-	gint i;								\
-									\
-	for (i = sizeof (type) - 1; i >= 0; i--) {			\
-		if (fputc ((value >> (i * 8)) & 0xff, out) == -1)	\
-			return -1;					\
-	}								\
-	return 0;							\
+#define CFU_ENCODE_T(type) \
+gint \
+camel_file_util_encode_##type (FILE *out, type value) \
+{ \
+	gint i; \
+ \
+	for (i = sizeof (type) - 1; i >= 0; i--) { \
+		if (fputc ((value >> (i * 8)) & 0xff, out) == -1) \
+			return -1; \
+	} \
+	return 0; \
 }
 
-#define CFU_DECODE_T(type)				\
-gint							\
-camel_file_util_decode_##type (FILE *in, type *dest)	\
-{							\
-	type save = 0;					\
-	gint i = sizeof (type) - 1;			\
-	gint v = EOF;					\
-							\
-	while (i >= 0 && (v = fgetc (in)) != EOF) {	\
-		save |= ((type) v) << (i * 8);		\
-		i--;					\
-	}						\
-	*dest = save;					\
-	if (v == EOF)					\
-		return -1;				\
-	return 0;					\
+#define CFU_DECODE_T(type) \
+gint \
+camel_file_util_decode_##type (FILE *in, type *dest) \
+{ \
+	type save = 0; \
+	gint i = sizeof (type) - 1; \
+	gint v = EOF; \
+ \
+	while (i >= 0 && (v = fgetc (in)) != EOF) { \
+		save |= ((type) v) << (i * 8); \
+		i--; \
+	} \
+	*dest = save; \
+	if (v == EOF) \
+		return -1; \
+	return 0; \
 }
 
 /**
diff --git a/camel/camel-filter-search.h b/camel/camel-filter-search.h
index 0b8680644..43e65d2a6 100644
--- a/camel/camel-filter-search.h
+++ b/camel/camel-filter-search.h
@@ -36,9 +36,9 @@ G_BEGIN_DECLS
 struct _CamelSession;
 
 enum {
-	CAMEL_SEARCH_ERROR    = -1,
-	CAMEL_SEARCH_NOMATCH  =  0,
-	CAMEL_SEARCH_MATCHED  =  1
+	CAMEL_SEARCH_ERROR = -1,
+	CAMEL_SEARCH_NOMATCH = 0,
+	CAMEL_SEARCH_MATCHED = 1
 };
 
 typedef CamelMimeMessage * (*CamelFilterSearchGetMessageFunc) (gpointer data, GError **error);
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index 75adfcdfe..7fa3f78c3 100644
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -69,9 +69,9 @@ struct _CamelFolderSearchPrivate {
 };
 
 typedef enum {
-	CAMEL_FOLDER_SEARCH_NONE         = 0,
+	CAMEL_FOLDER_SEARCH_NONE = 0,
 	CAMEL_FOLDER_SEARCH_ALWAYS_ENTER = 1 << 0,
-	CAMEL_FOLDER_SEARCH_IMMEDIATE    = 1 << 1
+	CAMEL_FOLDER_SEARCH_IMMEDIATE = 1 << 1
 } CamelFolderSearchFlags;
 
 static struct {
@@ -598,7 +598,7 @@ match_words_messages (CamelFolderSearch *search,
 		GPtrArray *v = search->summary_set ? search->summary_set : search->summary;
 
 		for (i = 0; i < v->len && !g_cancellable_is_cancelled (cancellable); i++) {
-			gchar *uid  = g_ptr_array_index (v, i);
+			gchar *uid = g_ptr_array_index (v, i);
 
 			if (match_words_message (
 				search->folder, uid, words,
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 43b51bea2..fc55dfa58 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -560,7 +560,7 @@ summary_header_to_db (CamelFolderSummary *summary,
 
 	/* we always write out the current version */
 	record->version = CAMEL_FOLDER_SUMMARY_VERSION;
-	record->flags  = summary->flags;
+	record->flags = summary->flags;
 	record->nextuid = summary->priv->nextuid;
 	record->time = summary->time;
 
@@ -684,7 +684,7 @@ message_info_to_db (CamelFolderSummary *summary,
 	record->uid = (gchar *) camel_pstring_strdup (camel_message_info_uid (mi));
 	record->flags = mi->flags;
 
-	record->read =  ((mi->flags & (CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_JUNK))) ? 1 : 0;
+	record->read = ((mi->flags & (CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_JUNK))) ? 1 : 0;
 	record->deleted = mi->flags & CAMEL_MESSAGE_DELETED ? 1 : 0;
 	record->replied = mi->flags & CAMEL_MESSAGE_ANSWERED ? 1 : 0;
 	record->important = mi->flags & CAMEL_MESSAGE_FLAGGED ? 1 : 0;
@@ -1199,14 +1199,14 @@ camel_folder_summary_class_init (CamelFolderSummaryClass *class)
 	class->content_info_from_db = content_info_from_db;
 	class->content_info_to_db = content_info_to_db;
 
-	class->message_info_new_from_header  = message_info_new_from_header;
+	class->message_info_new_from_header = message_info_new_from_header;
 	class->message_info_new_from_parser = message_info_new_from_parser;
 	class->message_info_new_from_message = message_info_new_from_message;
 	class->message_info_free = message_info_free;
 	class->message_info_clone = message_info_clone;
 	class->message_info_from_uid = message_info_from_uid;
 
-	class->content_info_new_from_header  = content_info_new_from_header;
+	class->content_info_new_from_header = content_info_new_from_header;
 	class->content_info_new_from_parser = content_info_new_from_parser;
 	class->content_info_new_from_message = content_info_new_from_message;
 	class->content_info_free = content_info_free;
@@ -2454,7 +2454,7 @@ mir_from_cols (CamelMIRecord *mir,
 				mir->flags = cols[i] ? strtoul (cols[i], NULL, 10) : 0;
 				break;
 			case CAMEL_DB_COLUMN_READ:
-				mir->read =  (cols[i]) ? ( ((strtoul (cols[i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
+				mir->read = (cols[i]) ? ( ((strtoul (cols[i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
 				break;
 			case CAMEL_DB_COLUMN_DELETED:
 				mir->deleted = (cols[i]) ? ( ((strtoul (cols[i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
@@ -2472,7 +2472,7 @@ mir_from_cols (CamelMIRecord *mir,
 				mir->attachment = (cols[i]) ? ( ((strtoul (cols[i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
 				break;
 			case CAMEL_DB_COLUMN_SIZE:
-				mir->size =  cols[i] ? strtoul (cols[i], NULL, 10) : 0;
+				mir->size = cols[i] ? strtoul (cols[i], NULL, 10) : 0;
 				break;
 			case CAMEL_DB_COLUMN_DSENT:
 				mir->dsent = cols[i] ? strtol (cols[i], NULL, 10) : 0;
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
index ba2ab7712..d4da154c7 100644
--- a/camel/camel-folder-summary.h
+++ b/camel/camel-folder-summary.h
@@ -223,8 +223,8 @@ struct _CamelMessageInfoBase {
  *    it is always created on the fly.
  **/
 typedef enum {
-	CAMEL_FOLDER_SUMMARY_DIRTY		= 1 << 0,
-	CAMEL_FOLDER_SUMMARY_IN_MEMORY_ONLY	= 1 << 1
+	CAMEL_FOLDER_SUMMARY_DIRTY = 1 << 0,
+	CAMEL_FOLDER_SUMMARY_IN_MEMORY_ONLY = 1 << 1
 } CamelFolderSummaryFlags;
 
 /**
diff --git a/camel/camel-folder-thread.h b/camel/camel-folder-thread.h
index bd0803995..1f9bfb622 100644
--- a/camel/camel-folder-thread.h
+++ b/camel/camel-folder-thread.h
@@ -41,8 +41,8 @@ typedef struct _CamelFolderThreadNode {
 } CamelFolderThreadNode;
 
 typedef struct _CamelFolderThread {
-	guint32 refcount  : 31;
-	guint32 subject   : 1;
+	guint32 refcount : 31;
+	guint32 subject : 1;
 
 	struct _CamelFolderThreadNode *tree;
 	CamelMemChunk *node_chunks;
diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c
index 303dadd17..974024052 100644
--- a/camel/camel-gpg-context.c
+++ b/camel/camel-gpg-context.c
@@ -1144,24 +1144,24 @@ gpg_ctx_parse_status (struct _GpgCtx *gpg,
 
 #endif
 
-#define status_backup(gpg, start, len) G_STMT_START {                     \
-	if (gpg->statusleft <= len) {                                     \
-		guint slen, soff;                                  \
-									  \
-		slen = soff = gpg->statusptr - gpg->statusbuf;            \
-		slen = slen ? slen : 1;                                   \
-									  \
-		while (slen < soff + len)                                 \
-			slen <<= 1;                                       \
-									  \
-		gpg->statusbuf = g_realloc (gpg->statusbuf, slen + 1);    \
-		gpg->statusptr = gpg->statusbuf + soff;                   \
-		gpg->statusleft = slen - soff;                            \
-	}                                                                 \
-									  \
-	memcpy (gpg->statusptr, start, len);                              \
-	gpg->statusptr += len;                                            \
-	gpg->statusleft -= len;                                           \
+#define status_backup(gpg, start, len) G_STMT_START { \
+	if (gpg->statusleft <= len) { \
+		guint slen, soff; \
+ \
+		slen = soff = gpg->statusptr - gpg->statusbuf; \
+		slen = slen ? slen : 1; \
+ \
+		while (slen < soff + len) \
+			slen <<= 1; \
+ \
+		gpg->statusbuf = g_realloc (gpg->statusbuf, slen + 1); \
+		gpg->statusptr = gpg->statusbuf + soff; \
+		gpg->statusleft = slen - soff; \
+	} \
+ \
+	memcpy (gpg->statusptr, start, len); \
+	gpg->statusptr += len; \
+	gpg->statusleft -= len; \
 } G_STMT_END
 
 static void
diff --git a/camel/camel-imapx-server.c b/camel/camel-imapx-server.c
index f514a6a0b..f600000d6 100644
--- a/camel/camel-imapx-server.c
+++ b/camel/camel-imapx-server.c
@@ -556,12 +556,12 @@ add_initial_untagged_descriptor (GHashTable *untagged_handlers,
                                  guint untagged_id)
 {
 	const CamelIMAPXUntaggedRespHandlerDesc *prev = NULL;
-	const CamelIMAPXUntaggedRespHandlerDesc *cur  = NULL;
+	const CamelIMAPXUntaggedRespHandlerDesc *cur = NULL;
 
 	g_return_if_fail (untagged_handlers != NULL);
 	g_return_if_fail (untagged_id < IMAPX_UNTAGGED_LAST_ID);
 
-	cur =  &(_untagged_descr[untagged_id]);
+	cur = &(_untagged_descr[untagged_id]);
 	prev = replace_untagged_descriptor (
 		untagged_handlers,
 		cur->untagged_response,
@@ -2890,7 +2890,7 @@ imapx_step (CamelIMAPXServer *is,
 	gint tok;
 	gboolean success = FALSE;
 
-	// poll ?  wait for other stuff? loop?
+	// poll ? wait for other stuff? loop?
 	tok = camel_imapx_stream_token (
 		stream, &token, &len, cancellable, error);
 
@@ -3946,7 +3946,7 @@ imapx_connect_to_server (CamelIMAPXServer *is,
 	CAMEL_IMAPX_STREAM (imapx_stream)->tagprefix = is->tagprefix;
 
 	while (1) {
-		// poll ?  wait for other stuff? loop?
+		// poll ? wait for other stuff? loop?
 		if (camel_application_is_exiting || is->priv->parser_quit) {
 			g_set_error (
 				error, G_IO_ERROR,
@@ -5550,7 +5550,7 @@ imapx_job_fetch_messages_start (CamelIMAPXJob *job,
 	fetch_limit = data->fetch_msg_limit;
 
 	if (ftype == CAMEL_FETCH_NEW_MESSAGES ||
-		(ftype ==  CAMEL_FETCH_OLD_MESSAGES && total <=0 )) {
+		(ftype == CAMEL_FETCH_OLD_MESSAGES && total <=0 )) {
 
 		gchar *uid;
 
diff --git a/camel/camel-imapx-utils.c b/camel/camel-imapx-utils.c
index bdf8de8ab..f2b0fd864 100644
--- a/camel/camel-imapx-utils.c
+++ b/camel/camel-imapx-utils.c
@@ -39,9 +39,9 @@ gint camel_imapx_debug_flags;
 extern gint camel_verbose_debug;
 
 #define debug_set_flag(flag) do { \
-	if ((CAMEL_IMAPX_DEBUG_ALL & CAMEL_IMAPX_DEBUG_ ## flag) &&	\
-	    camel_debug ("imapx:" #flag))				\
-		camel_imapx_debug_flags |= CAMEL_IMAPX_DEBUG_ ## flag;	\
+	if ((CAMEL_IMAPX_DEBUG_ALL & CAMEL_IMAPX_DEBUG_ ## flag) && \
+	    camel_debug ("imapx:" #flag)) \
+		camel_imapx_debug_flags |= CAMEL_IMAPX_DEBUG_ ## flag; \
 	} while (0)
 
 static void camel_imapx_set_debug_flags (void)
diff --git a/camel/camel-imapx-utils.h b/camel/camel-imapx-utils.h
index a57de22f6..7673a1b75 100644
--- a/camel/camel-imapx-utils.h
+++ b/camel/camel-imapx-utils.h
@@ -173,20 +173,20 @@ gchar *		camel_imapx_dup_uid_from_summary_index
 	((info) != NULL && ((info)->capa & IMAPX_CAPABILITY_##name) == 0)
 
 enum {
-	IMAPX_CAPABILITY_IMAP4			= (1 << 0),
-	IMAPX_CAPABILITY_IMAP4REV1		= (1 << 1),
-	IMAPX_CAPABILITY_STATUS			= (1 << 2),
-	IMAPX_CAPABILITY_NAMESPACE		= (1 << 3),
-	IMAPX_CAPABILITY_UIDPLUS		= (1 << 4),
-	IMAPX_CAPABILITY_LITERALPLUS		= (1 << 5),
-	IMAPX_CAPABILITY_STARTTLS		= (1 << 6),
-	IMAPX_CAPABILITY_IDLE			= (1 << 7),
-	IMAPX_CAPABILITY_CONDSTORE		= (1 << 8),
-	IMAPX_CAPABILITY_QRESYNC		= (1 << 9),
-	IMAPX_CAPABILITY_LIST_STATUS		= (1 << 10),
-	IMAPX_CAPABILITY_LIST_EXTENDED		= (1 << 11),
-	IMAPX_CAPABILITY_QUOTA			= (1 << 12),
-	IMAPX_CAPABILITY_MOVE			= (1 << 13)
+	IMAPX_CAPABILITY_IMAP4 = (1 << 0),
+	IMAPX_CAPABILITY_IMAP4REV1 = (1 << 1),
+	IMAPX_CAPABILITY_STATUS = (1 << 2),
+	IMAPX_CAPABILITY_NAMESPACE = (1 << 3),
+	IMAPX_CAPABILITY_UIDPLUS = (1 << 4),
+	IMAPX_CAPABILITY_LITERALPLUS = (1 << 5),
+	IMAPX_CAPABILITY_STARTTLS = (1 << 6),
+	IMAPX_CAPABILITY_IDLE = (1 << 7),
+	IMAPX_CAPABILITY_CONDSTORE = (1 << 8),
+	IMAPX_CAPABILITY_QRESYNC = (1 << 9),
+	IMAPX_CAPABILITY_LIST_STATUS = (1 << 10),
+	IMAPX_CAPABILITY_LIST_EXTENDED = (1 << 11),
+	IMAPX_CAPABILITY_QUOTA = (1 << 12),
+	IMAPX_CAPABILITY_MOVE = (1 << 13)
 };
 
 struct _capability_info {
diff --git a/camel/camel-lock.c b/camel/camel-lock.c
index 6cf3578d0..b6a1826be 100644
--- a/camel/camel-lock.c
+++ b/camel/camel-lock.c
@@ -97,7 +97,6 @@ camel_lock_dot (const gchar *path,
 		if (retry > 0)
 			sleep (CAMEL_LOCK_DOT_DELAY);
 
-
 		g_snprintf (locktmp, locktmp_len, "%sXXXXXX", path);
 		fdtmp = g_mkstemp (locktmp);
 		if (fdtmp == -1) {
diff --git a/camel/camel-mime-filter-gzip.c b/camel/camel-mime-filter-gzip.c
index 77eac48de..6184ac4a0 100644
--- a/camel/camel-mime-filter-gzip.c
+++ b/camel/camel-mime-filter-gzip.c
@@ -38,11 +38,11 @@
 /* rfc1952 */
 
 enum {
-	GZIP_FLAG_FTEXT     = (1 << 0),
-	GZIP_FLAG_FHCRC     = (1 << 1),
-	GZIP_FLAG_FEXTRA    = (1 << 2),
-	GZIP_FLAG_FNAME     = (1 << 3),
-	GZIP_FLAG_FCOMMENT  = (1 << 4),
+	GZIP_FLAG_FTEXT = (1 << 0),
+	GZIP_FLAG_FHCRC = (1 << 1),
+	GZIP_FLAG_FEXTRA = (1 << 2),
+	GZIP_FLAG_FNAME = (1 << 3),
+	GZIP_FLAG_FCOMMENT = (1 << 4),
 	GZIP_FLAG_RESERVED0 = (1 << 5),
 	GZIP_FLAG_RESERVED1 = (1 << 6),
 	GZIP_FLAG_RESERVED2 = (1 << 7)
diff --git a/camel/camel-mime-filter-tohtml.c b/camel/camel-mime-filter-tohtml.c
index 4d8e753b2..ef28c1e64 100644
--- a/camel/camel-mime-filter-tohtml.c
+++ b/camel/camel-mime-filter-tohtml.c
@@ -44,7 +44,7 @@ struct _CamelMimeFilterToHTMLPrivate {
 
 	guint blockquote_depth;
 
-	guint32 column   : 31;
+	guint32 column : 31;
 	guint32 pre_open : 1;
 };
 
diff --git a/camel/camel-mime-parser.c b/camel/camel-mime-parser.c
index 019125a28..682927598 100644
--- a/camel/camel-mime-parser.c
+++ b/camel/camel-mime-parser.c
@@ -1182,26 +1182,26 @@ header_append_mempool (struct _header_scan_state *s,
  * remove trailing \r chars (\n's assumed already removed)
  * and track the start offset of the header */
 /* Basically an optimised version of g_byte_array_append() */
-#define header_append(s, start, inptr)								\
-{												\
-	register gint headerlen = inptr - start;							\
-												\
-	if (headerlen > 0) {									\
-		if (headerlen >= (s->outend - s->outptr)) {					\
-			register gchar *outnew;							\
-			register gint olen = ((s->outend - s->outbuf) + headerlen) * 2 + 1;	\
-			outnew = g_realloc (s->outbuf, olen);					\
-			s->outptr = s->outptr - s->outbuf + outnew;				\
-			s->outbuf = outnew;							\
-			s->outend = outnew + olen;						\
-		}										\
-		if (start[headerlen - 1] == '\r')							\
-			headerlen--;								\
-		memcpy (s->outptr, start, headerlen);						\
-		s->outptr += headerlen;								\
-	}											\
-	if (s->header_start == -1)								\
-		s->header_start = (start - s->inbuf) + s->seek;					\
+#define header_append(s, start, inptr) \
+{ \
+	register gint headerlen = inptr - start; \
+ \
+	if (headerlen > 0) { \
+		if (headerlen >= (s->outend - s->outptr)) { \
+			register gchar *outnew; \
+			register gint olen = ((s->outend - s->outbuf) + headerlen) * 2 + 1; \
+			outnew = g_realloc (s->outbuf, olen); \
+			s->outptr = s->outptr - s->outbuf + outnew; \
+			s->outbuf = outnew; \
+			s->outend = outnew + olen; \
+		} \
+		if (start[headerlen - 1] == '\r') \
+			headerlen--; \
+		memcpy (s->outptr, start, headerlen); \
+		s->outptr += headerlen; \
+	} \
+	if (s->header_start == -1) \
+		s->header_start = (start - s->inbuf) + s->seek; \
 }
 
 static struct _header_scan_stack *
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index 3fb1ec407..747e857bf 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -523,15 +523,15 @@ camel_quoted_encode_step (guchar *in,
 	register gint sofar = *save;  /* keeps track of how many chars on a line */
 	register gint last = *statep; /* keeps track if last gchar to end was a space cr etc */
 
-	#define output_last()				\
-		if (sofar + 3 > 74) {			\
-			*outptr++ = '=';		\
-			*outptr++ = '\n';		\
-			sofar = 0;			\
-		}					\
-		*outptr++ = '=';			\
-		*outptr++ = tohex[(last >> 4) & 0xf];	\
-		*outptr++ = tohex[last & 0xf];		\
+	#define output_last() \
+		if (sofar + 3 > 74) { \
+			*outptr++ = '='; \
+			*outptr++ = '\n'; \
+			sofar = 0; \
+		} \
+		*outptr++ = '='; \
+		*outptr++ = tohex[(last >> 4) & 0xf]; \
+		*outptr++ = tohex[last & 0xf]; \
 		sofar += 3;
 
 	inptr = in;
diff --git a/camel/camel-mime-utils.h b/camel/camel-mime-utils.h
index a207a0bc8..29413d029 100644
--- a/camel/camel-mime-utils.h
+++ b/camel/camel-mime-utils.h
@@ -240,13 +240,13 @@ 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_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) */
diff --git a/camel/camel-msgport.c b/camel/camel-msgport.c
index 2e0050f19..fee65b996 100644
--- a/camel/camel-msgport.c
+++ b/camel/camel-msgport.c
@@ -48,7 +48,7 @@
 
 /* message flags */
 enum {
-	MSG_FLAG_SYNC_WITH_PIPE    = 1 << 0,
+	MSG_FLAG_SYNC_WITH_PIPE = 1 << 0,
 	MSG_FLAG_SYNC_WITH_PR_PIPE = 1 << 1
 };
 
diff --git a/camel/camel-net-utils.c b/camel/camel-net-utils.c
index 79003f3a3..79a41b957 100644
--- a/camel/camel-net-utils.c
+++ b/camel/camel-net-utils.c
@@ -92,78 +92,78 @@ G_LOCK_DEFINE_STATIC (gethost_mutex);
 
 #define ALIGN(x) (((x) + (sizeof (gchar *) - 1)) & ~(sizeof (gchar *) - 1))
 
-#define GETHOST_PROCESS(h, host, buf, buflen, herr) G_STMT_START {     \
-	gint num_aliases = 0, num_addrs = 0;                            \
-	gint req_length;                                                \
-	gchar *p;                                                       \
-	gint i;                                                         \
-								       \
-	/* check to make sure we have enough room in our buffer */     \
-	req_length = 0;                                                \
-	if (h->h_aliases) {                                            \
-		for (i = 0; h->h_aliases[i]; i++)                      \
-			req_length += strlen (h->h_aliases[i]) + 1;    \
-		num_aliases = i;                                       \
-	}                                                              \
-								       \
-	if (h->h_addr_list) {                                          \
-		for (i = 0; h->h_addr_list[i]; i++)                    \
-			req_length += h->h_length;                     \
-		num_addrs = i;                                         \
-	}                                                              \
-								       \
-	req_length += sizeof (gchar *) * (num_aliases + 1);             \
-	req_length += sizeof (gchar *) * (num_addrs + 1);               \
-	req_length += strlen (h->h_name) + 1;                          \
-								       \
-	if (buflen < req_length) {                                     \
-		*herr = ERANGE;                                        \
-		G_UNLOCK (gethost_mutex);                              \
-		return ERANGE;                                         \
-	}                                                              \
-								       \
-	/* we store the alias/addr pointers in the buffer */           \
-        /* their addresses here. */                                    \
-	p = buf;                                                       \
-	if (num_aliases) {                                             \
-		host->h_aliases = (gchar **) p;                         \
-		p += sizeof (gchar *) * (num_aliases + 1);              \
-	} else                                                         \
-		host->h_aliases = NULL;                                \
-                                                                       \
-	if (num_addrs) {                                               \
-		host->h_addr_list = (gchar **) p;                       \
-		p += sizeof (gchar *) * (num_addrs + 1);                \
-	} else                                                         \
-		host->h_addr_list = NULL;                              \
-								       \
-	/* copy the host name into the buffer */                       \
-	host->h_name = p;                                              \
-	strcpy (p, h->h_name);                                         \
-	p += strlen (h->h_name) + 1;                                   \
-	host->h_addrtype = h->h_addrtype;                              \
-	host->h_length = h->h_length;                                  \
-								       \
-	/* copy the aliases/addresses into the buffer */               \
-        /* and assign pointers into the hostent */                     \
-	*p = 0;                                                        \
-	if (num_aliases) {                                             \
-		for (i = 0; i < num_aliases; i++) {                    \
-			strcpy (p, h->h_aliases[i]);                   \
-			host->h_aliases[i] = p;                        \
-			p += strlen (h->h_aliases[i]);                 \
-		}                                                      \
-		host->h_aliases[num_aliases] = NULL;                   \
-	}                                                              \
-								       \
-	if (num_addrs) {                                               \
-		for (i = 0; i < num_addrs; i++) {                      \
-			memcpy (p, h->h_addr_list[i], h->h_length);    \
-			host->h_addr_list[i] = p;                      \
-			p += h->h_length;                              \
-		}                                                      \
-		host->h_addr_list[num_addrs] = NULL;                   \
-	}                                                              \
+#define GETHOST_PROCESS(h, host, buf, buflen, herr) G_STMT_START { \
+	gint num_aliases = 0, num_addrs = 0; \
+	gint req_length; \
+	gchar *p; \
+	gint i; \
+ \
+	/* check to make sure we have enough room in our buffer */ \
+	req_length = 0; \
+	if (h->h_aliases) { \
+		for (i = 0; h->h_aliases[i]; i++) \
+			req_length += strlen (h->h_aliases[i]) + 1; \
+		num_aliases = i; \
+	} \
+ \
+	if (h->h_addr_list) { \
+		for (i = 0; h->h_addr_list[i]; i++) \
+			req_length += h->h_length; \
+		num_addrs = i; \
+	} \
+ \
+	req_length += sizeof (gchar *) * (num_aliases + 1); \
+	req_length += sizeof (gchar *) * (num_addrs + 1); \
+	req_length += strlen (h->h_name) + 1; \
+ \
+	if (buflen < req_length) { \
+		*herr = ERANGE; \
+		G_UNLOCK (gethost_mutex); \
+		return ERANGE; \
+	} \
+ \
+	/* we store the alias/addr pointers in the buffer */ \
+        /* their addresses here. */ \
+	p = buf; \
+	if (num_aliases) { \
+		host->h_aliases = (gchar **) p; \
+		p += sizeof (gchar *) * (num_aliases + 1); \
+	} else \
+		host->h_aliases = NULL; \
+ \
+	if (num_addrs) { \
+		host->h_addr_list = (gchar **) p; \
+		p += sizeof (gchar *) * (num_addrs + 1); \
+	} else \
+		host->h_addr_list = NULL; \
+ \
+	/* copy the host name into the buffer */ \
+	host->h_name = p; \
+	strcpy (p, h->h_name); \
+	p += strlen (h->h_name) + 1; \
+	host->h_addrtype = h->h_addrtype; \
+	host->h_length = h->h_length; \
+ \
+	/* copy the aliases/addresses into the buffer */ \
+        /* and assign pointers into the hostent */ \
+	*p = 0; \
+	if (num_aliases) { \
+		for (i = 0; i < num_aliases; i++) { \
+			strcpy (p, h->h_aliases[i]); \
+			host->h_aliases[i] = p; \
+			p += strlen (h->h_aliases[i]); \
+		} \
+		host->h_aliases[num_aliases] = NULL; \
+	} \
+ \
+	if (num_addrs) { \
+		for (i = 0; i < num_addrs; i++) { \
+			memcpy (p, h->h_addr_list[i], h->h_length); \
+			host->h_addr_list[i] = p; \
+			p += h->h_length; \
+		} \
+		host->h_addr_list[num_addrs] = NULL; \
+	} \
 } G_STMT_END
 
 #ifdef ENABLE_IPv6
diff --git a/camel/camel-partition-table.c b/camel/camel-partition-table.c
index a6e929558..e9f5dd369 100644
--- a/camel/camel-partition-table.c
+++ b/camel/camel-partition-table.c
@@ -825,7 +825,7 @@ camel_key_table_set_data (CamelKeyTable *ki,
 	g_return_val_if_fail (CAMEL_IS_KEY_TABLE (ki), FALSE);
 	g_return_val_if_fail (keyid != 0, FALSE);
 
-	blockid =  keyid & (~(CAMEL_BLOCK_SIZE - 1));
+	blockid = keyid & (~(CAMEL_BLOCK_SIZE - 1));
 	index = keyid & (CAMEL_BLOCK_SIZE - 1);
 
 	bl = camel_block_file_get_block (ki->blocks, blockid);
@@ -862,7 +862,7 @@ camel_key_table_set_flags (CamelKeyTable *ki,
 	g_return_val_if_fail (CAMEL_IS_KEY_TABLE (ki), FALSE);
 	g_return_val_if_fail (keyid != 0, FALSE);
 
-	blockid =  keyid & (~(CAMEL_BLOCK_SIZE - 1));
+	blockid = keyid & (~(CAMEL_BLOCK_SIZE - 1));
 	index = keyid & (CAMEL_BLOCK_SIZE - 1);
 
 	bl = camel_block_file_get_block (ki->blocks, blockid);
@@ -910,7 +910,7 @@ camel_key_table_lookup (CamelKeyTable *ki,
 	if (flags)
 		*flags = 0;
 
-	blockid =  keyid & (~(CAMEL_BLOCK_SIZE - 1));
+	blockid = keyid & (~(CAMEL_BLOCK_SIZE - 1));
 	index = keyid & (CAMEL_BLOCK_SIZE - 1);
 
 	bl = camel_block_file_get_block (ki->blocks, blockid);
@@ -982,7 +982,7 @@ camel_key_table_next (CamelKeyTable *ki,
 		next++;
 
 	do {
-		blockid =  next & (~(CAMEL_BLOCK_SIZE - 1));
+		blockid = next & (~(CAMEL_BLOCK_SIZE - 1));
 		index = next & (CAMEL_BLOCK_SIZE - 1);
 
 		bl = camel_block_file_get_block (ki->blocks, blockid);
diff --git a/camel/camel-provider.h b/camel/camel-provider.h
index 9bb49e00e..e6e55d0a9 100644
--- a/camel/camel-provider.h
+++ b/camel/camel-provider.h
@@ -78,27 +78,27 @@ extern gchar *camel_provider_type_name[CAMEL_NUM_PROVIDER_TYPES];
 
 /* Providers use these macros to actually define their url_flags */
 typedef enum {
-	CAMEL_URL_ALLOW_USER       = CAMEL_URL_PART_USER,
-	CAMEL_URL_ALLOW_AUTH       = CAMEL_URL_PART_AUTH,
-	CAMEL_URL_ALLOW_PASSWORD   = CAMEL_URL_PART_PASSWORD,
-	CAMEL_URL_ALLOW_HOST       = CAMEL_URL_PART_HOST,
-	CAMEL_URL_ALLOW_PORT       = CAMEL_URL_PART_PORT,
-	CAMEL_URL_ALLOW_PATH       = CAMEL_URL_PART_PATH,
-
-	CAMEL_URL_NEED_USER        = CAMEL_URL_PART_USER << CAMEL_URL_PART_NEED,
-	CAMEL_URL_NEED_AUTH        = CAMEL_URL_PART_AUTH << CAMEL_URL_PART_NEED,
-	CAMEL_URL_NEED_PASSWORD    = CAMEL_URL_PART_PASSWORD << CAMEL_URL_PART_NEED,
-	CAMEL_URL_NEED_HOST        = CAMEL_URL_PART_HOST << CAMEL_URL_PART_NEED,
-	CAMEL_URL_NEED_PORT        = CAMEL_URL_PART_PORT << CAMEL_URL_PART_NEED,
-	CAMEL_URL_NEED_PATH        = CAMEL_URL_PART_PATH << CAMEL_URL_PART_NEED,
-	CAMEL_URL_NEED_PATH_DIR    = CAMEL_URL_PART_PATH_DIR << CAMEL_URL_PART_NEED,
-
-	CAMEL_URL_HIDDEN_USER      = CAMEL_URL_PART_USER << CAMEL_URL_PART_HIDDEN,
-	CAMEL_URL_HIDDEN_AUTH      = CAMEL_URL_PART_AUTH << CAMEL_URL_PART_HIDDEN,
-	CAMEL_URL_HIDDEN_PASSWORD  = CAMEL_URL_PART_PASSWORD << CAMEL_URL_PART_HIDDEN,
-	CAMEL_URL_HIDDEN_HOST      = CAMEL_URL_PART_HOST << CAMEL_URL_PART_HIDDEN,
-	CAMEL_URL_HIDDEN_PORT      = CAMEL_URL_PART_PORT << CAMEL_URL_PART_HIDDEN,
-	CAMEL_URL_HIDDEN_PATH      = CAMEL_URL_PART_PATH << CAMEL_URL_PART_HIDDEN,
+	CAMEL_URL_ALLOW_USER = CAMEL_URL_PART_USER,
+	CAMEL_URL_ALLOW_AUTH = CAMEL_URL_PART_AUTH,
+	CAMEL_URL_ALLOW_PASSWORD = CAMEL_URL_PART_PASSWORD,
+	CAMEL_URL_ALLOW_HOST = CAMEL_URL_PART_HOST,
+	CAMEL_URL_ALLOW_PORT = CAMEL_URL_PART_PORT,
+	CAMEL_URL_ALLOW_PATH = CAMEL_URL_PART_PATH,
+
+	CAMEL_URL_NEED_USER = CAMEL_URL_PART_USER << CAMEL_URL_PART_NEED,
+	CAMEL_URL_NEED_AUTH = CAMEL_URL_PART_AUTH << CAMEL_URL_PART_NEED,
+	CAMEL_URL_NEED_PASSWORD = CAMEL_URL_PART_PASSWORD << CAMEL_URL_PART_NEED,
+	CAMEL_URL_NEED_HOST = CAMEL_URL_PART_HOST << CAMEL_URL_PART_NEED,
+	CAMEL_URL_NEED_PORT = CAMEL_URL_PART_PORT << CAMEL_URL_PART_NEED,
+	CAMEL_URL_NEED_PATH = CAMEL_URL_PART_PATH << CAMEL_URL_PART_NEED,
+	CAMEL_URL_NEED_PATH_DIR = CAMEL_URL_PART_PATH_DIR << CAMEL_URL_PART_NEED,
+
+	CAMEL_URL_HIDDEN_USER = CAMEL_URL_PART_USER << CAMEL_URL_PART_HIDDEN,
+	CAMEL_URL_HIDDEN_AUTH = CAMEL_URL_PART_AUTH << CAMEL_URL_PART_HIDDEN,
+	CAMEL_URL_HIDDEN_PASSWORD = CAMEL_URL_PART_PASSWORD << CAMEL_URL_PART_HIDDEN,
+	CAMEL_URL_HIDDEN_HOST = CAMEL_URL_PART_HOST << CAMEL_URL_PART_HIDDEN,
+	CAMEL_URL_HIDDEN_PORT = CAMEL_URL_PART_PORT << CAMEL_URL_PART_HIDDEN,
+	CAMEL_URL_HIDDEN_PATH = CAMEL_URL_PART_PATH << CAMEL_URL_PART_HIDDEN,
 
 	CAMEL_URL_FRAGMENT_IS_PATH = 1 << 30, /* url uses fragment for folder name path, not path */
 	CAMEL_URL_PATH_IS_ABSOLUTE = 1 << 31,
diff --git a/camel/camel-sasl-ntlm.c b/camel/camel-sasl-ntlm.c
index 6c56b5149..96b74bb93 100644
--- a/camel/camel-sasl-ntlm.c
+++ b/camel/camel-sasl-ntlm.c
@@ -271,7 +271,7 @@ md4sum (const guchar *in,
 
 	for (i = 0; i < nbytes + pbytes + 8; i += 64) {
 		for (j = 0; j < 16; j++) {
-			X[j] =  (M[i + j * 4]) |
+			X[j] = (M[i + j * 4]) |
 				(M[i + j * 4 + 1] << 8) |
 				(M[i + j * 4 + 2] << 16) |
 				(M[i + j * 4 + 3] << 24);
@@ -339,20 +339,20 @@ md4sum (const guchar *in,
 		D += DD;
 	}
 
-	digest[0]  =  A        & 0xFF;
-	digest[1]  = (A >>  8) & 0xFF;
-	digest[2]  = (A >> 16) & 0xFF;
-	digest[3]  = (A >> 24) & 0xFF;
-	digest[4]  =  B        & 0xFF;
-	digest[5]  = (B >>  8) & 0xFF;
-	digest[6]  = (B >> 16) & 0xFF;
-	digest[7]  = (B >> 24) & 0xFF;
-	digest[8]  =  C        & 0xFF;
-	digest[9]  = (C >>  8) & 0xFF;
+	digest[0] = A & 0xFF;
+	digest[1] = (A >> 8) & 0xFF;
+	digest[2] = (A >> 16) & 0xFF;
+	digest[3] = (A >> 24) & 0xFF;
+	digest[4] = B & 0xFF;
+	digest[5] = (B >> 8) & 0xFF;
+	digest[6] = (B >> 16) & 0xFF;
+	digest[7] = (B >> 24) & 0xFF;
+	digest[8] = C & 0xFF;
+	digest[9] = (C >> 8) & 0xFF;
 	digest[10] = (C >> 16) & 0xFF;
 	digest[11] = (C >> 24) & 0xFF;
-	digest[12] =  D        & 0xFF;
-	digest[13] = (D >>  8) & 0xFF;
+	digest[12] = D & 0xFF;
+	digest[13] = (D >> 8) & 0xFF;
 	digest[14] = (D >> 16) & 0xFF;
 	digest[15] = (D >> 24) & 0xFF;
 }
@@ -571,7 +571,7 @@ des (guint32 ks[16][2],
 	work = (left ^ right) & 0xaaaaaaaa;
 	left ^= work;
 	right ^= work;
-	left = (left >> 1) | (left  << 31);
+	left = (left >> 1) | (left << 31);
 	work = ((left >> 8) ^ right) & 0xff00ff;
 	right ^= work;
 	left ^= work << 8;
diff --git a/camel/camel-search-private.c b/camel/camel-search-private.c
index 58c195075..e1e8debcb 100644
--- a/camel/camel-search-private.c
+++ b/camel/camel-search-private.c
@@ -257,14 +257,14 @@ camel_ustrstrcase (const gchar *haystack,
 	return NULL;
 }
 
-#define CAMEL_SEARCH_COMPARE(x, y, z) G_STMT_START {   \
-	if ((x) == (z)) {                              \
-		if ((y) == (z))                        \
-			return 0;                      \
-		else                                   \
-			return -1;                     \
-	} else if ((y) == (z))                         \
-		return 1;                              \
+#define CAMEL_SEARCH_COMPARE(x, y, z) G_STMT_START { \
+	if ((x) == (z)) { \
+		if ((y) == (z)) \
+			return 0; \
+		else \
+			return -1; \
+	} else if ((y) == (z)) \
+		return 1; \
 } G_STMT_END
 
 static gint
diff --git a/camel/camel-search-sql-sexp.c b/camel/camel-search-sql-sexp.c
index 774bba1ff..878c5d3db 100644
--- a/camel/camel-search-sql-sexp.c
+++ b/camel/camel-search-sql-sexp.c
@@ -98,7 +98,7 @@ func_and (CamelSExp *f,
 			continue;
 		}
 		if (r1->value.string && *r1->value.string)
-			g_string_append_printf (string, "%s%s", r1->value.string, ((argc > 1) && (i != argc - 1)) ?  " AND ":"");
+			g_string_append_printf (string, "%s%s", r1->value.string, ((argc > 1) && (i != argc - 1)) ? " AND ":"");
 		camel_sexp_result_free (f, r1);
 	}
 	g_string_append (string, " )");
@@ -133,7 +133,7 @@ func_or (CamelSExp *f,
 			camel_sexp_result_free (f, r1);
 			continue;
 		}
-		g_string_append_printf (string, "%s%s", r1->value.string, ((argc > 1) && (i != argc - 1)) ?  " OR ":"");
+		g_string_append_printf (string, "%s%s", r1->value.string, ((argc > 1) && (i != argc - 1)) ? " OR ":"");
 		camel_sexp_result_free (f, r1);
 	}
 	g_string_append (string, " )");
@@ -346,7 +346,7 @@ match_threads (struct _CamelSExp *f,
 
 	for (i = 1; i < argc; i++) {
 		r = camel_sexp_term_eval (f, argv[i]);
-		g_string_append_printf (str, "%s%s", r->value.string, ((argc > 1) && (i != argc - 1)) ?  " AND ":"");
+		g_string_append_printf (str, "%s%s", r->value.string, ((argc > 1) && (i != argc - 1)) ? " AND ":"");
 		camel_sexp_result_free (f, r);
 	}
 
diff --git a/camel/camel-session.c b/camel/camel-session.c
index 0ab9081e2..359807067 100644
--- a/camel/camel-session.c
+++ b/camel/camel-session.c
@@ -72,9 +72,9 @@ struct _CamelSessionPrivate {
 
 	GMainContext *main_context;
 
-	guint check_junk        : 1;
+	guint check_junk : 1;
 	guint network_available : 1;
-	guint online            : 1;
+	guint online : 1;
 };
 
 struct _AsyncContext {
diff --git a/camel/camel-store-summary.c b/camel/camel-store-summary.c
index 4d9f22aa4..8a4115a5d 100644
--- a/camel/camel-store-summary.c
+++ b/camel/camel-store-summary.c
@@ -262,7 +262,7 @@ camel_store_summary_class_init (CamelStoreSummaryClass *class)
 
 	class->summary_header_load = store_summary_summary_header_load;
 	class->summary_header_save = store_summary_summary_header_save;
-	class->store_info_new  = store_summary_store_info_new;
+	class->store_info_new = store_summary_store_info_new;
 	class->store_info_load = store_summary_store_info_load;
 	class->store_info_save = store_summary_store_info_save;
 	class->store_info_free = store_summary_store_info_free;
diff --git a/camel/camel-store.h b/camel/camel-store.h
index e5ee40f9c..930544136 100644
--- a/camel/camel-store.h
+++ b/camel/camel-store.h
@@ -107,8 +107,8 @@ typedef struct _CamelStorePrivate CamelStorePrivate;
 
 /* open mode for folder */
 typedef enum {
-	CAMEL_STORE_FOLDER_CREATE     = 1 << 0,
-	CAMEL_STORE_FOLDER_EXCL       = 1 << 1,
+	CAMEL_STORE_FOLDER_CREATE = 1 << 0,
+	CAMEL_STORE_FOLDER_EXCL = 1 << 1,
 	CAMEL_STORE_FOLDER_BODY_INDEX = 1 << 2,
 	CAMEL_STORE_FOLDER_PRIVATE    = 1 << 3  /* a private folder that
                                                    should not show up in
diff --git a/camel/camel-url-scanner.c b/camel/camel-url-scanner.c
index 0e1c4847f..8ebc3a8c7 100644
--- a/camel/camel-url-scanner.c
+++ b/camel/camel-url-scanner.c
@@ -132,14 +132,14 @@ static guchar url_scanner_table[256] = {
 };
 
 enum {
-	IS_CTRL		= (1 << 0),
-	IS_ALPHA        = (1 << 1),
-	IS_DIGIT        = (1 << 2),
-	IS_LWSP		= (1 << 3),
-	IS_SPACE	= (1 << 4),
-	IS_SPECIAL	= (1 << 5),
-	IS_DOMAIN       = (1 << 6),
-	IS_URLSAFE      = (1 << 7)
+	IS_CTRL = (1 << 0),
+	IS_ALPHA = (1 << 1),
+	IS_DIGIT = (1 << 2),
+	IS_LWSP = (1 << 3),
+	IS_SPACE = (1 << 4),
+	IS_SPECIAL = (1 << 5),
+	IS_DOMAIN = (1 << 6),
+	IS_URLSAFE = (1 << 7)
 };
 
 #define is_ctrl(x) ((url_scanner_table[(guchar)(x)] & IS_CTRL) != 0)
diff --git a/camel/camel-url.h b/camel/camel-url.h
index 660a10da9..9d1f7486b 100644
--- a/camel/camel-url.h
+++ b/camel/camel-url.h
@@ -52,8 +52,8 @@ struct _CamelURL {
 };
 
 typedef enum {
-	CAMEL_URL_HIDE_PARAMS   = 1 << 0,
-	CAMEL_URL_HIDE_AUTH     = 1 << 1
+	CAMEL_URL_HIDE_PARAMS = 1 << 0,
+	CAMEL_URL_HIDE_AUTH = 1 << 1
 } CamelURLFlags;
 
 #define CAMEL_URL_HIDE_ALL \
diff --git a/camel/camel-vee-summary.c b/camel/camel-vee-summary.c
index 0de3ae128..f3799990e 100644
--- a/camel/camel-vee-summary.c
+++ b/camel/camel-vee-summary.c
@@ -134,7 +134,7 @@ vee_info_user_flag (const CamelMessageInfo *mi,
 	gboolean ret;
 
 	HANDLE_NULL_INFO (FALSE);
-	ret =	camel_message_info_user_flag (rmi, id);
+	ret = camel_message_info_user_flag (rmi, id);
 	camel_message_info_free (rmi);
 
 	return ret;
diff --git a/camel/providers/local/camel-local-summary.c b/camel/providers/local/camel-local-summary.c
index 31cf14c58..2e6172ad2 100644
--- a/camel/providers/local/camel-local-summary.c
+++ b/camel/providers/local/camel-local-summary.c
@@ -127,7 +127,7 @@ camel_local_summary_class_init (CamelLocalSummaryClass *class)
 	folder_summary_class->content_info_size = sizeof (CamelMessageContentInfo);
 	folder_summary_class->summary_header_from_db = summary_header_from_db;
 	folder_summary_class->summary_header_to_db = summary_header_to_db;
-	folder_summary_class->message_info_new_from_header  = message_info_new_from_header;
+	folder_summary_class->message_info_new_from_header = message_info_new_from_header;
 
 	class->load = local_summary_load;
 	class->check = local_summary_check;
diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c
index 49395f742..9aa6a34d3 100644
--- a/camel/providers/local/camel-maildir-store.c
+++ b/camel/providers/local/camel-maildir-store.c
@@ -1102,7 +1102,7 @@ scan_old_dir_info (CamelStore *store,
 					fi->display_name = g_strdup (d->d_name);
 					snew->fi = fi;
 
-					last->next =  snew->fi;
+					last->next = snew->fi;
 					last = snew->fi;
 					snew->fi->parent = sn->fi;
 
diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c
index af0eba22b..0239f6f5f 100644
--- a/camel/providers/local/camel-mbox-summary.c
+++ b/camel/providers/local/camel-mbox-summary.c
@@ -165,7 +165,7 @@ camel_mbox_summary_class_init (CamelMboxSummaryClass *class)
 	folder_summary_class->summary_header_to_db = summary_header_to_db;
 	folder_summary_class->message_info_from_db = message_info_from_db;
 	folder_summary_class->message_info_to_db = message_info_to_db;
-	folder_summary_class->message_info_new_from_header  = message_info_new_from_header;
+	folder_summary_class->message_info_new_from_header = message_info_new_from_header;
 	folder_summary_class->message_info_new_from_parser = message_info_new_from_parser;
 	folder_summary_class->info_set_user_flag = mbox_info_set_user_flag;
 	folder_summary_class->info_set_user_tag = mbox_info_set_user_tag;
diff --git a/camel/providers/local/camel-mh-summary.c b/camel/providers/local/camel-mh-summary.c
index d5c7737f3..ffa73c624 100644
--- a/camel/providers/local/camel-mh-summary.c
+++ b/camel/providers/local/camel-mh-summary.c
@@ -351,8 +351,8 @@ mh_summary_sync (CamelLocalSummary *cls,
 
 static gint
 mh_summary_decode_x_evolution (CamelLocalSummary *cls,
-			       const gchar *xev,
-			       CamelLocalMessageInfo *info)
+                               const gchar *xev,
+                               CamelLocalMessageInfo *info)
 {
 	CamelLocalSummaryClass *local_summary_class;
 	CamelMhSummary *mh_summary;
diff --git a/camel/providers/nntp/camel-nntp-summary.c b/camel/providers/nntp/camel-nntp-summary.c
index 6f8f712d6..440ee2b40 100644
--- a/camel/providers/nntp/camel-nntp-summary.c
+++ b/camel/providers/nntp/camel-nntp-summary.c
@@ -488,7 +488,7 @@ camel_nntp_summary_check (CamelNNTPSummary *cns,
 				const gchar *uid;
 				const gchar *msgid;
 
-				uid  = g_ptr_array_index (known_uids, i);
+				uid = g_ptr_array_index (known_uids, i);
 				n = strtoul (uid, NULL, 10);
 
 				if (n < f || n > l) {
diff --git a/camel/providers/pop3/camel-pop3-engine.h b/camel/providers/pop3/camel-pop3-engine.h
index cc5800197..e6327b23f 100644
--- a/camel/providers/pop3/camel-pop3-engine.h
+++ b/camel/providers/pop3/camel-pop3-engine.h
@@ -81,7 +81,7 @@ 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_TOP = 1 << 3,
 	CAMEL_POP3_CAP_PIPE = 1 << 4,
 	CAMEL_POP3_CAP_STLS = 1 << 5
 };
diff --git a/camel/tests/message/test2.c b/camel/tests/message/test2.c
index 7360f64cf..41f220300 100644
--- a/camel/tests/message/test2.c
+++ b/camel/tests/message/test2.c
@@ -90,7 +90,7 @@ check_address_line_decode (gint i,
 	addr = camel_internet_address_new ();
 	check (camel_address_decode (CAMEL_ADDRESS (addr), line) == 1);
 	check (camel_internet_address_get (CAMEL_INTERNET_ADDRESS (addr), 0, &dname, &demail));
-	check_msg (g_strcmp0 (dname, name) == 0  || (!name && dname && !*dname), "decoded name = '%s', but should be '%s'", dname, name);
+	check_msg (g_strcmp0 (dname, name) == 0 || (!name && dname && !*dname), "decoded name = '%s', but should be '%s'", dname, name);
 	check_msg (g_strcmp0 (demail, email) == 0, "decoded email = '%s', but should be '%s'", demail, email);
 	check_unref (addr, 1);
 	pull ();
diff --git a/libebackend/e-authentication-mediator.c b/libebackend/e-authentication-mediator.c
index 7550a5759..697c95d97 100644
--- a/libebackend/e-authentication-mediator.c
+++ b/libebackend/e-authentication-mediator.c
@@ -1274,7 +1274,7 @@ e_authentication_mediator_dismiss (EAuthenticationMediator *mediator)
  **/
 void
 e_authentication_mediator_server_error (EAuthenticationMediator *mediator,
-					const GError *error)
+                                        const GError *error)
 {
 	gchar *name;
 
diff --git a/libebackend/e-backend-enums.h b/libebackend/e-backend-enums.h
index 5685bafed..7d244fc34 100644
--- a/libebackend/e-backend-enums.h
+++ b/libebackend/e-backend-enums.h
@@ -78,8 +78,8 @@ typedef enum {
  * Since: 3.6
  **/
 typedef enum { /*< flags >*/
-	E_SOURCE_PERMISSION_NONE      = 0,
-	E_SOURCE_PERMISSION_WRITABLE  = 1 << 0,
+	E_SOURCE_PERMISSION_NONE = 0,
+	E_SOURCE_PERMISSION_WRITABLE = 1 << 0,
 	E_SOURCE_PERMISSION_REMOVABLE = 1 << 1
 } ESourcePermissionFlags;
 
diff --git a/libebackend/e-sqlite3-vfs.c b/libebackend/e-sqlite3-vfs.c
index b5bce5832..d8ae3b9b9 100644
--- a/libebackend/e-sqlite3-vfs.c
+++ b/libebackend/e-sqlite3-vfs.c
@@ -139,18 +139,18 @@ sync_push_request_timeout (ESqlite3File *cFile)
 	return FALSE;
 }
 
-#define def_subclassed(_nm, _params, _call)			\
-static gint							\
-e_sqlite3_file_ ## _nm _params				\
-{								\
-	ESqlite3File *cFile;				\
-								\
-	g_return_val_if_fail (old_vfs != NULL, SQLITE_ERROR);	\
-	g_return_val_if_fail (pFile != NULL, SQLITE_ERROR);	\
-								\
-	cFile = (ESqlite3File *) pFile;		\
-	g_return_val_if_fail (cFile->old_vfs_file->pMethods != NULL, SQLITE_ERROR);	\
-	return cFile->old_vfs_file->pMethods->_nm _call;	\
+#define def_subclassed(_nm, _params, _call) \
+static gint \
+e_sqlite3_file_ ## _nm _params \
+{ \
+	ESqlite3File *cFile; \
+ \
+	g_return_val_if_fail (old_vfs != NULL, SQLITE_ERROR); \
+	g_return_val_if_fail (pFile != NULL, SQLITE_ERROR); \
+ \
+	cFile = (ESqlite3File *) pFile; \
+	g_return_val_if_fail (cFile->old_vfs_file->pMethods != NULL, SQLITE_ERROR); \
+	return cFile->old_vfs_file->pMethods->_nm _call; \
 }
 
 def_subclassed (xRead, (sqlite3_file *pFile, gpointer pBuf, gint iAmt, sqlite3_int64 iOfst), (cFile->old_vfs_file, pBuf, iAmt, iOfst))
diff --git a/libedataserver/e-collator.c b/libedataserver/e-collator.c
index 88c8709fe..3ce6b89eb 100644
--- a/libedataserver/e-collator.c
+++ b/libedataserver/e-collator.c
@@ -57,7 +57,7 @@ G_DEFINE_QUARK (e-collator-error-quark, e_collator_error)
 
 G_DEFINE_BOXED_TYPE (ECollator,
 		     e_collator,
-		     e_collator_ref, 
+		     e_collator_ref,
 		     e_collator_unref)
 
 struct _ECollator
@@ -89,21 +89,21 @@ print_available_locales (void)
 
 	u_init (&status);
 
-	g_printerr ("List of available locales (default locale is: %s)\n", uloc_getDefault());
+	g_printerr ("List of available locales (default locale is: %s)\n", uloc_getDefault ());
 
-	count = uloc_countAvailable();
+	count = uloc_countAvailable ();
 	for (i = 0; i < count; i++) {
 		UEnumeration *keywords;
 		const gchar *keyword;
 
-		uloc_getDisplayName(uloc_getAvailable(i), NULL, result, 100, &status);
+		uloc_getDisplayName (uloc_getAvailable (i), NULL, result, 100, &status);
 
 		u_austrncpy (printable, result, sizeof (printable));
 
 		/* print result */
-		g_printerr ("\t%s - %s", uloc_getAvailable(i), printable);
+		g_printerr ("\t%s - %s", uloc_getAvailable (i), printable);
 
-		keywords = uloc_openKeywords (uloc_getAvailable(i), &status);
+		keywords = uloc_openKeywords (uloc_getAvailable (i), &status);
 		if (keywords) {
 			UErrorCode kstatus = U_ZERO_ERROR;
 
@@ -122,9 +122,9 @@ print_available_locales (void)
 #endif
 
 static gchar *
-canonicalize_locale (const gchar  *posix_locale,
-		     gchar       **language_code,
-		     GError      **error)
+canonicalize_locale (const gchar *posix_locale,
+                     gchar **language_code,
+                     GError **error)
 {
 	UErrorCode status = U_ZERO_ERROR;
 	gchar  locale_buffer[LOCALE_BUFFER_LEN];
@@ -137,11 +137,12 @@ canonicalize_locale (const gchar  *posix_locale,
 	len = uloc_canonicalize (posix_locale, locale_buffer, LOCALE_BUFFER_LEN, &status);
 
 	if (U_FAILURE (status)) {
-		g_set_error (error, E_COLLATOR_ERROR,
-			     E_COLLATOR_ERROR_INVALID_LOCALE,
-			     "Failed to interpret locale '%s' (%s)",
-			     posix_locale,
-			     u_errorName (status));
+		g_set_error (
+			error, E_COLLATOR_ERROR,
+			E_COLLATOR_ERROR_INVALID_LOCALE,
+			"Failed to interpret locale '%s' (%s)",
+			posix_locale,
+			u_errorName (status));
 		return NULL;
 	}
 
@@ -157,11 +158,12 @@ canonicalize_locale (const gchar  *posix_locale,
 	len = uloc_getLanguage (icu_locale, language_buffer, 8, &status);
 
 	if (U_FAILURE (status)) {
-		g_set_error (error, E_COLLATOR_ERROR,
-			     E_COLLATOR_ERROR_INVALID_LOCALE,
-			     "Failed to interpret language for locale '%s': %s",
-			     icu_locale,
-			     u_errorName (status));
+		g_set_error (
+			error, E_COLLATOR_ERROR,
+			E_COLLATOR_ERROR_INVALID_LOCALE,
+			"Failed to interpret language for locale '%s': %s",
+			icu_locale,
+			u_errorName (status));
 		g_free (icu_locale);
 		return NULL;
 	}
@@ -194,12 +196,12 @@ canonicalize_locale (const gchar  *posix_locale,
  * is valid UTF-8
  */
 static const UChar *
-convert_to_ustring (const gchar  *string,
-		    UChar        *buffer,
-		    gint          buffer_len,
-		    gint         *result_len,
-		    UChar       **free_me,
-		    GError      **error)
+convert_to_ustring (const gchar *string,
+                    UChar *buffer,
+                    gint buffer_len,
+                    gint *result_len,
+                    UChar **free_me,
+                    GError **error)
 {
 	UErrorCode status = U_ZERO_ERROR;
 	const gchar *source_utf8;
@@ -216,12 +218,13 @@ convert_to_ustring (const gchar  *string,
 	}
 
 	/* First pass, try converting to UChar in the given buffer */
-	converted_buffer = u_strFromUTF8Lenient (buffer,
-						 buffer_len,
-						 &converted_len,
-						 source_utf8,
-						 -1,
-						 &status);
+	converted_buffer = u_strFromUTF8Lenient (
+		buffer,
+		buffer_len,
+		&converted_len,
+		source_utf8,
+		-1,
+		&status);
 
 	/* Set the result length right away... */
 	*result_len = converted_len;
@@ -235,12 +238,13 @@ convert_to_ustring (const gchar  *string,
 	if (converted_len > buffer_len) {
 		*free_me = g_new (UChar, converted_len);
 
-		converted_buffer = u_strFromUTF8Lenient (*free_me,
-							 converted_len,
-							 NULL,
-							 source_utf8,
-							 -1,
-							 &status);
+		converted_buffer = u_strFromUTF8Lenient (
+			*free_me,
+			converted_len,
+			NULL,
+			source_utf8,
+			-1,
+			&status);
 
 		if (U_FAILURE (status)) {
 			g_free (*free_me);
@@ -254,10 +258,11 @@ convert_to_ustring (const gchar  *string,
 	g_free (alloc_utf8);
 
 	if (U_FAILURE (status))
-		g_set_error (error, E_COLLATOR_ERROR,
-			     E_COLLATOR_ERROR_CONVERSION,
-			     "Error occured while converting character encoding (%s)",
-			     u_errorName (status));
+		g_set_error (
+			error, E_COLLATOR_ERROR,
+			E_COLLATOR_ERROR_CONVERSION,
+			"Error occured while converting character encoding (%s)",
+			u_errorName (status));
 
 	return converted_buffer;
 }
@@ -279,8 +284,8 @@ convert_to_ustring (const gchar  *string,
  * Since: 3.12
  */
 ECollator *
-e_collator_new (const gchar     *locale,
-		GError         **error)
+e_collator_new (const gchar *locale,
+                GError **error)
 {
 	ECollator *collator;
 	UCollator *coll;
@@ -301,11 +306,12 @@ e_collator_new (const gchar     *locale,
 	coll = ucol_open (icu_locale, &status);
 
 	if (U_FAILURE (status)) {
-		g_set_error (error, E_COLLATOR_ERROR,
-			     E_COLLATOR_ERROR_OPEN,
-			     "Unable to open collator for locale '%s' (%s)",
-			     icu_locale,
-			     u_errorName (status));
+		g_set_error (
+			error, E_COLLATOR_ERROR,
+			E_COLLATOR_ERROR_OPEN,
+			"Unable to open collator for locale '%s' (%s)",
+			icu_locale,
+			u_errorName (status));
 
 		g_free (language_code);
 		g_free (icu_locale);
@@ -328,11 +334,12 @@ e_collator_new (const gchar     *locale,
 		collator->transliterator = _e_transliterator_cxx_new ("Han-Latin");
 
 	collator->alpha_index = _e_alphabet_index_cxx_new_for_language (language_code);
-	collator->labels = _e_alphabet_index_cxx_get_labels (collator->alpha_index,
-							     &collator->n_labels,
-							     &collator->underflow,
-							     &collator->inflow,
-							     &collator->overflow);
+	collator->labels = _e_alphabet_index_cxx_get_labels (
+		collator->alpha_index,
+		&collator->n_labels,
+		&collator->underflow,
+		&collator->inflow,
+		&collator->overflow);
 
 	g_free (language_code);
 
@@ -408,9 +415,9 @@ e_collator_unref (ECollator *collator)
  * Since: 3.12
  */
 gchar *
-e_collator_generate_key (ECollator    *collator,
-			 const gchar  *str,
-			 GError      **error)
+e_collator_generate_key (ECollator *collator,
+                         const gchar *str,
+                         GError **error)
 {
 	UChar  source_buffer[CONVERT_BUFFER_LEN];
 	UChar *free_me = NULL;
@@ -433,12 +440,13 @@ e_collator_generate_key (ECollator    *collator,
 		input_str = str;
 	}
 
-	source = convert_to_ustring (input_str,
-				     source_buffer,
-				     CONVERT_BUFFER_LEN,
-				     &source_len,
-				     &free_me,
-				     error);
+	source = convert_to_ustring (
+		input_str,
+		source_buffer,
+		CONVERT_BUFFER_LEN,
+		&source_len,
+		&free_me,
+		error);
 
 	if (!source) {
 		g_free (translit_str);
@@ -449,8 +457,9 @@ e_collator_generate_key (ECollator    *collator,
 	alphabet_index = _e_alphabet_index_cxx_get_index (collator->alpha_index, input_str);
 
 	/* First try to generate a key in a predefined buffer size */
-	key_len = ucol_getSortKey (collator->coll, source, source_len,
-				   (guchar *)stack_buffer, COLLATION_KEY_BUFFER_LEN);
+	key_len = ucol_getSortKey (
+		collator->coll, source, source_len,
+		(guchar *) stack_buffer, COLLATION_KEY_BUFFER_LEN);
 
 	if (key_len > COLLATION_KEY_BUFFER_LEN) {
 
@@ -467,8 +476,9 @@ e_collator_generate_key (ECollator    *collator,
 		snprintf (collation_key, 4, "%03d-", alphabet_index);
 
 		/* Get the sort key and put it in &collation_key[4] */
-		ucol_getSortKey (collator->coll, source, source_len,
-				 (guchar *)(collation_key + 4), key_len);
+		ucol_getSortKey (
+			collator->coll, source, source_len,
+			(guchar *)(collation_key + 4), key_len);
 
 		/* Just being paranoid, make sure we're null terminated since the API
 		 * doesn't specify if the result length is null character inclusive
@@ -489,7 +499,7 @@ e_collator_generate_key (ECollator    *collator,
 	g_free (free_me);
 	g_free (translit_str);
 
-	return (gchar *)collation_key;
+	return (gchar *) collation_key;
 }
 
 /**
@@ -515,8 +525,8 @@ e_collator_generate_key (ECollator    *collator,
  * Since: 3.12
  */
 gchar *
-e_collator_generate_key_for_index (ECollator       *collator,
-				   gint             index)
+e_collator_generate_key_for_index (ECollator *collator,
+                                   gint index)
 {
 	g_return_val_if_fail (collator != NULL, NULL);
 	g_return_val_if_fail (index >= 0 && index < collator->n_labels, NULL);
@@ -544,11 +554,11 @@ e_collator_generate_key_for_index (ECollator       *collator,
  * Since: 3.12
  */
 gboolean
-e_collator_collate (ECollator    *collator,
-		    const gchar  *str_a,
-		    const gchar  *str_b,
-		    gint         *result,
-		    GError      **error)
+e_collator_collate (ECollator *collator,
+                    const gchar *str_a,
+                    const gchar *str_b,
+                    gint *result,
+                    GError **error)
 {
 	gchar *sort_key_a, *sort_key_b;
 
@@ -591,11 +601,11 @@ e_collator_collate (ECollator    *collator,
  * Since: 3.12
  */
 const gchar *const  *
-e_collator_get_index_labels (ECollator       *collator,
-			     gint            *n_labels,
-			     gint            *underflow,
-			     gint            *inflow,
-			     gint            *overflow)
+e_collator_get_index_labels (ECollator *collator,
+                             gint *n_labels,
+                             gint *underflow,
+                             gint *inflow,
+                             gint *overflow)
 {
 	g_return_val_if_fail (collator != NULL, NULL);
 
@@ -608,7 +618,7 @@ e_collator_get_index_labels (ECollator       *collator,
 	if (overflow)
 		*overflow = collator->overflow;
 
-	return (const gchar *const  *)collator->labels;
+	return (const gchar *const  *) collator->labels;
 }
 
 /**
@@ -624,8 +634,8 @@ e_collator_get_index_labels (ECollator       *collator,
  * Since: 3.12
  */
 gint
-e_collator_get_index (ECollator       *collator,
-		      const gchar     *str)
+e_collator_get_index (ECollator *collator,
+                      const gchar *str)
 {
 	gint index;
 	gchar *translit_str = NULL;
diff --git a/libedataserver/e-data-server-util.c b/libedataserver/e-data-server-util.c
index 61b140448..1408fe659 100644
--- a/libedataserver/e-data-server-util.c
+++ b/libedataserver/e-data-server-util.c
@@ -1689,20 +1689,20 @@ setup (void)
 
 #include "libedataserver-private.h" /* For prototypes */
 
-#define GETTER_IMPL(varbl)			\
-{						\
-	setup ();				\
-	return varbl;				\
+#define GETTER_IMPL(varbl) \
+{ \
+	setup (); \
+	return varbl; \
 }
 
-#define PRIVATE_GETTER(varbl)			\
-const gchar *					\
-_libedataserver_get_##varbl (void)		\
+#define PRIVATE_GETTER(varbl) \
+const gchar * \
+_libedataserver_get_##varbl (void) \
 	GETTER_IMPL (varbl)
 
-#define PUBLIC_GETTER(varbl)			\
-const gchar *					\
-e_util_get_##varbl (void)			\
+#define PUBLIC_GETTER(varbl) \
+const gchar * \
+e_util_get_##varbl (void) \
 	GETTER_IMPL (varbl)
 
 PRIVATE_GETTER (extensiondir)
diff --git a/libedataserver/e-gdbus-templates.h b/libedataserver/e-gdbus-templates.h
index 23e532133..e7274477a 100644
--- a/libedataserver/e-gdbus-templates.h
+++ b/libedataserver/e-gdbus-templates.h
@@ -61,11 +61,11 @@ gboolean	e_gdbus_async_op_keeper_cancel_op_sync		(EGdbusAsyncOpKeeper *object, g
 
 enum {
 	E_GDBUS_TYPE_IS_ASYNC	= 1 << 0, /* if set, then OPID and GError precedes to actual parameter */
-	E_GDBUS_TYPE_VOID	= 1 << 1,
-	E_GDBUS_TYPE_BOOLEAN	= 1 << 2,
-	E_GDBUS_TYPE_STRING	= 1 << 3,
-	E_GDBUS_TYPE_STRV	= 1 << 4,
-	E_GDBUS_TYPE_UINT	= 1 << 5
+	E_GDBUS_TYPE_VOID = 1 << 1,
+	E_GDBUS_TYPE_BOOLEAN = 1 << 2,
+	E_GDBUS_TYPE_STRING = 1 << 3,
+	E_GDBUS_TYPE_STRV = 1 << 4,
+	E_GDBUS_TYPE_UINT = 1 << 5
 };
 
 /* _where is a target component name, like ' ## _where ## ' or 'cal'
@@ -75,263 +75,263 @@ enum {
  * _param_type is parameter type, as string, like "s"
  * all except _param_type are identificators, not strings
 */
-#define E_DECLARE_GDBUS_ARG(_where, _mname, _mtype, _param_name, _param_type)				\
-	static const GDBusArgInfo e_gdbus_ ## _where ## _ ## _mtype ## _mname ## _param_name =		\
-	{												\
-		-1,											\
-		(gchar *) # _param_name,								\
-		(gchar *) _param_type,									\
-		(GDBusAnnotationInfo **) NULL,								\
+#define E_DECLARE_GDBUS_ARG(_where, _mname, _mtype, _param_name, _param_type) \
+	static const GDBusArgInfo e_gdbus_ ## _where ## _ ## _mtype ## _mname ## _param_name = \
+	{ \
+		-1, \
+		(gchar *) # _param_name, \
+		(gchar *) _param_type, \
+		(GDBusAnnotationInfo **) NULL, \
 	};
 
-#define E_DECLARE_GDBUS_NOTIFY_SIGNAL_0(_where, _sname)							\
-	static const GDBusSignalInfo e_gdbus_ ## _where ## _signal_ ## _sname =				\
-	{												\
-		-1,											\
-		(gchar *) # _sname,									\
-		(GDBusArgInfo **) NULL,									\
-		(GDBusAnnotationInfo **) NULL,								\
+#define E_DECLARE_GDBUS_NOTIFY_SIGNAL_0(_where, _sname) \
+	static const GDBusSignalInfo e_gdbus_ ## _where ## _signal_ ## _sname = \
+	{ \
+		-1, \
+		(gchar *) # _sname, \
+		(GDBusArgInfo **) NULL, \
+		(GDBusAnnotationInfo **) NULL, \
 	};
 
-#define E_DECLARE_GDBUS_NOTIFY_SIGNAL_1(_where, _sname, _p1_name, _p1_type)				\
-	E_DECLARE_GDBUS_ARG (_where, _sname, signal, _p1_name, _p1_type)				\
-													\
-	static const GDBusArgInfo * const e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname[] =	\
-	{												\
-		&e_gdbus_ ## _where ## _signal ## _sname ## _p1_name,					\
-		NULL											\
-	};												\
-													\
-	static const GDBusSignalInfo e_gdbus_ ## _where ## _signal_ ## _sname =				\
-	{												\
-		-1,											\
-		(gchar *) # _sname,									\
-		(GDBusArgInfo **) &e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname,		\
-		(GDBusAnnotationInfo **) NULL,								\
+#define E_DECLARE_GDBUS_NOTIFY_SIGNAL_1(_where, _sname, _p1_name, _p1_type) \
+	E_DECLARE_GDBUS_ARG (_where, _sname, signal, _p1_name, _p1_type) \
+ \
+	static const GDBusArgInfo * const e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname[] = \
+	{ \
+		&e_gdbus_ ## _where ## _signal ## _sname ## _p1_name, \
+		NULL \
+	}; \
+ \
+	static const GDBusSignalInfo e_gdbus_ ## _where ## _signal_ ## _sname = \
+	{ \
+		-1, \
+		(gchar *) # _sname, \
+		(GDBusArgInfo **) &e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname, \
+		(GDBusAnnotationInfo **) NULL, \
 	};
 
-#define E_DECLARE_GDBUS_NOTIFY_SIGNAL_2(_where, _sname, _p1_name, _p1_type, _p2_name, _p2_type)		\
-	E_DECLARE_GDBUS_ARG (_where, _sname, signal, _p1_name, _p1_type)				\
-	E_DECLARE_GDBUS_ARG (_where, _sname, signal, _p2_name, _p2_type)				\
-													\
-	static const GDBusArgInfo * const e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname[] =	\
-	{												\
-		&e_gdbus_ ## _where ## _signal ## _sname ## _p1_name,					\
-		&e_gdbus_ ## _where ## _signal ## _sname ## _p2_name,					\
-		NULL											\
-	};												\
-													\
-	static const GDBusSignalInfo e_gdbus_ ## _where ## _signal_ ## _sname =				\
-	{												\
-		-1,											\
-		(gchar *) # _sname,									\
-		(GDBusArgInfo **) &e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname,		\
-		(GDBusAnnotationInfo **) NULL,								\
+#define E_DECLARE_GDBUS_NOTIFY_SIGNAL_2(_where, _sname, _p1_name, _p1_type, _p2_name, _p2_type) \
+	E_DECLARE_GDBUS_ARG (_where, _sname, signal, _p1_name, _p1_type) \
+	E_DECLARE_GDBUS_ARG (_where, _sname, signal, _p2_name, _p2_type) \
+ \
+	static const GDBusArgInfo * const e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname[] = \
+	{ \
+		&e_gdbus_ ## _where ## _signal ## _sname ## _p1_name, \
+		&e_gdbus_ ## _where ## _signal ## _sname ## _p2_name, \
+		NULL \
+	}; \
+ \
+	static const GDBusSignalInfo e_gdbus_ ## _where ## _signal_ ## _sname = \
+	{ \
+		-1, \
+		(gchar *) # _sname, \
+		(GDBusArgInfo **) &e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname, \
+		(GDBusAnnotationInfo **) NULL, \
 	};
 
-#define E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_0(_where, _sname)						\
-	E_DECLARE_GDBUS_ARG (_where, _sname, signal, opid, "u")						\
-	E_DECLARE_GDBUS_ARG (_where, _sname, signal, dbus_error_name, "s")				\
-	E_DECLARE_GDBUS_ARG (_where, _sname, signal, dbus_error_message, "s")				\
-													\
-	static const GDBusArgInfo * const e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname[] =	\
-	{												\
-		&e_gdbus_ ## _where ## _signal ## _sname ## opid,					\
-		&e_gdbus_ ## _where ## _signal ## _sname ## dbus_error_name,				\
-		&e_gdbus_ ## _where ## _signal ## _sname ## dbus_error_message,				\
-		NULL											\
-	};												\
-													\
-	static const GDBusSignalInfo e_gdbus_ ## _where ## _signal_ ## _sname =				\
-	{												\
-		-1,											\
-		(gchar *) # _sname,									\
-		(GDBusArgInfo **) &e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname,		\
-		(GDBusAnnotationInfo **) NULL,								\
+#define E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_0(_where, _sname) \
+	E_DECLARE_GDBUS_ARG (_where, _sname, signal, opid, "u") \
+	E_DECLARE_GDBUS_ARG (_where, _sname, signal, dbus_error_name, "s") \
+	E_DECLARE_GDBUS_ARG (_where, _sname, signal, dbus_error_message, "s") \
+ \
+	static const GDBusArgInfo * const e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname[] = \
+	{ \
+		&e_gdbus_ ## _where ## _signal ## _sname ## opid, \
+		&e_gdbus_ ## _where ## _signal ## _sname ## dbus_error_name, \
+		&e_gdbus_ ## _where ## _signal ## _sname ## dbus_error_message, \
+		NULL \
+	}; \
+ \
+	static const GDBusSignalInfo e_gdbus_ ## _where ## _signal_ ## _sname = \
+	{ \
+		-1, \
+		(gchar *) # _sname, \
+		(GDBusArgInfo **) &e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname, \
+		(GDBusAnnotationInfo **) NULL, \
 	};
 
-#define E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_1(_where, _sname, _p1_name, _p1_type)				\
-	E_DECLARE_GDBUS_ARG (_where, _sname, signal, opid, "u")						\
-	E_DECLARE_GDBUS_ARG (_where, _sname, signal, dbus_error_name, "s")				\
-	E_DECLARE_GDBUS_ARG (_where, _sname, signal, dbus_error_message, "s")				\
-	E_DECLARE_GDBUS_ARG (_where, _sname, signal, _p1_name, _p1_type)				\
-													\
-	static const GDBusArgInfo * const e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname[] =	\
-	{												\
-		&e_gdbus_ ## _where ## _signal ## _sname ## opid,					\
-		&e_gdbus_ ## _where ## _signal ## _sname ## dbus_error_name,				\
-		&e_gdbus_ ## _where ## _signal ## _sname ## dbus_error_message,				\
-		&e_gdbus_ ## _where ## _signal ## _sname ## _p1_name,					\
-		NULL											\
-	};												\
-													\
-	static const GDBusSignalInfo e_gdbus_ ## _where ## _signal_ ## _sname =				\
-	{												\
-		-1,											\
-		(gchar *) # _sname,									\
-		(GDBusArgInfo **) &e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname,		\
-		(GDBusAnnotationInfo **) NULL,								\
+#define E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_1(_where, _sname, _p1_name, _p1_type) \
+	E_DECLARE_GDBUS_ARG (_where, _sname, signal, opid, "u") \
+	E_DECLARE_GDBUS_ARG (_where, _sname, signal, dbus_error_name, "s") \
+	E_DECLARE_GDBUS_ARG (_where, _sname, signal, dbus_error_message, "s") \
+	E_DECLARE_GDBUS_ARG (_where, _sname, signal, _p1_name, _p1_type) \
+ \
+	static const GDBusArgInfo * const e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname[] = \
+	{ \
+		&e_gdbus_ ## _where ## _signal ## _sname ## opid, \
+		&e_gdbus_ ## _where ## _signal ## _sname ## dbus_error_name, \
+		&e_gdbus_ ## _where ## _signal ## _sname ## dbus_error_message, \
+		&e_gdbus_ ## _where ## _signal ## _sname ## _p1_name, \
+		NULL \
+	}; \
+ \
+	static const GDBusSignalInfo e_gdbus_ ## _where ## _signal_ ## _sname = \
+	{ \
+		-1, \
+		(gchar *) # _sname, \
+		(GDBusArgInfo **) &e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname, \
+		(GDBusAnnotationInfo **) NULL, \
 	};
 
-#define E_DECLARE_GDBUS_SYNC_METHOD_0(_where, _mname)							\
-	static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname =				\
-	{												\
-		-1,											\
-		(gchar *) # _mname,									\
-		(GDBusArgInfo **) NULL,									\
-		(GDBusArgInfo **) NULL,									\
-		(GDBusAnnotationInfo **) NULL,								\
+#define E_DECLARE_GDBUS_SYNC_METHOD_0(_where, _mname) \
+	static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
+	{ \
+		-1, \
+		(gchar *) # _mname, \
+		(GDBusArgInfo **) NULL, \
+		(GDBusArgInfo **) NULL, \
+		(GDBusAnnotationInfo **) NULL, \
 	};
 
-#define E_DECLARE_GDBUS_SYNC_METHOD_1(_where, _mname, _p1_name, _p1_type)				\
-	E_DECLARE_GDBUS_ARG (_where, _mname, method_in, _p1_name, _p1_type)				\
-													\
-	static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname[] =	\
-	{												\
-		&e_gdbus_ ## _where ## _method_in ## _mname ## _p1_name,				\
-		NULL											\
-	};												\
-													\
-	static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname =				\
-	{												\
-		-1,											\
-		(gchar *) # _mname,									\
-		(GDBusArgInfo **) &e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname,		\
-		(GDBusArgInfo **) NULL,									\
-		(GDBusAnnotationInfo **) NULL,								\
+#define E_DECLARE_GDBUS_SYNC_METHOD_1(_where, _mname, _p1_name, _p1_type) \
+	E_DECLARE_GDBUS_ARG (_where, _mname, method_in, _p1_name, _p1_type) \
+ \
+	static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname[] = \
+	{ \
+		&e_gdbus_ ## _where ## _method_in ## _mname ## _p1_name, \
+		NULL \
+	}; \
+ \
+	static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
+	{ \
+		-1, \
+		(gchar *) # _mname, \
+		(GDBusArgInfo **) &e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname, \
+		(GDBusArgInfo **) NULL, \
+		(GDBusAnnotationInfo **) NULL, \
 	};
 
-#define E_DECLARE_GDBUS_SYNC_METHOD_0_WITH_RETURN(_where, _mname, _r1_name, _r1_type)			\
-	E_DECLARE_GDBUS_ARG (_where, _mname, method_out, _r1_name, _r1_type)				\
-													\
-	static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] =	\
-	{												\
-		&e_gdbus_ ## _where ## _method_out ## _mname ## _r1_name,				\
-		NULL											\
-	};												\
-													\
-	static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname =				\
-	{												\
-		-1,											\
-		(gchar *) # _mname,									\
-		(GDBusArgInfo **) NULL,									\
-		(GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname,		\
-		(GDBusAnnotationInfo **) NULL,								\
+#define E_DECLARE_GDBUS_SYNC_METHOD_0_WITH_RETURN(_where, _mname, _r1_name, _r1_type) \
+	E_DECLARE_GDBUS_ARG (_where, _mname, method_out, _r1_name, _r1_type) \
+ \
+	static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] = \
+	{ \
+		&e_gdbus_ ## _where ## _method_out ## _mname ## _r1_name, \
+		NULL \
+	}; \
+ \
+	static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
+	{ \
+		-1, \
+		(gchar *) # _mname, \
+		(GDBusArgInfo **) NULL, \
+		(GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname, \
+		(GDBusAnnotationInfo **) NULL, \
 	};
 
 #define E_DECLARE_GDBUS_SYNC_METHOD_1_WITH_RETURN(_where, _mname, _p1_name, _p1_type, _r1_name, _r1_type)\
-	E_DECLARE_GDBUS_ARG (_where, _mname, method_in, _p1_name, _p1_type)				\
-	E_DECLARE_GDBUS_ARG (_where, _mname, method_out, _r1_name, _r1_type)				\
-													\
-	static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname[] =	\
-	{												\
-		&e_gdbus_ ## _where ## _method_in ## _mname ## _p1_name,				\
-		NULL											\
-	};												\
-													\
-	static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] =	\
-	{												\
-		&e_gdbus_ ## _where ## _method_out ## _mname ## _r1_name,				\
-		NULL											\
-	};												\
-													\
-	static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname =				\
-	{												\
-		-1,											\
-		(gchar *) # _mname,									\
-		(GDBusArgInfo **) &e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname,		\
-		(GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname,		\
-		(GDBusAnnotationInfo **) NULL,								\
+	E_DECLARE_GDBUS_ARG (_where, _mname, method_in, _p1_name, _p1_type) \
+	E_DECLARE_GDBUS_ARG (_where, _mname, method_out, _r1_name, _r1_type) \
+ \
+	static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname[] = \
+	{ \
+		&e_gdbus_ ## _where ## _method_in ## _mname ## _p1_name, \
+		NULL \
+	}; \
+ \
+	static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] = \
+	{ \
+		&e_gdbus_ ## _where ## _method_out ## _mname ## _r1_name, \
+		NULL \
+	}; \
+ \
+	static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
+	{ \
+		-1, \
+		(gchar *) # _mname, \
+		(GDBusArgInfo **) &e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname, \
+		(GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname, \
+		(GDBusAnnotationInfo **) NULL, \
 	};
 
-#define E_DECLARE_GDBUS_ASYNC_METHOD_0(_where, _mname)							\
-	E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_0 (_where, _mname ## _done)					\
-	E_DECLARE_GDBUS_ARG (_where, _mname, method_out, opid, "u")					\
-													\
-	static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] =	\
-	{												\
-		&e_gdbus_ ## _where ## _method_out ## _mname ## opid,					\
-		NULL											\
-	};												\
-													\
-	static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname =				\
-	{												\
-		-1,											\
-		(gchar *) # _mname,									\
-		(GDBusArgInfo **) NULL,									\
-		(GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname,		\
-		(GDBusAnnotationInfo **) NULL,								\
+#define E_DECLARE_GDBUS_ASYNC_METHOD_0(_where, _mname) \
+	E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_0 (_where, _mname ## _done) \
+	E_DECLARE_GDBUS_ARG (_where, _mname, method_out, opid, "u") \
+ \
+	static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] = \
+	{ \
+		&e_gdbus_ ## _where ## _method_out ## _mname ## opid, \
+		NULL \
+	}; \
+ \
+	static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
+	{ \
+		-1, \
+		(gchar *) # _mname, \
+		(GDBusArgInfo **) NULL, \
+		(GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname, \
+		(GDBusAnnotationInfo **) NULL, \
 	};
 
-#define E_DECLARE_GDBUS_ASYNC_METHOD_1(_where, _mname, _p1_name, _p1_type)				\
-	E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_0 (_where, _mname ## _done)					\
-	E_DECLARE_GDBUS_ARG (_where, _mname, method_in, _p1_name, _p1_type)				\
-	E_DECLARE_GDBUS_ARG (_where, _mname, method_out, opid, "u")					\
-													\
-	static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname[] =	\
-	{												\
-		&e_gdbus_ ## _where ## _method_in ## _mname ## _p1_name,				\
-		NULL											\
-	};												\
-													\
-	static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] =	\
-	{												\
-		&e_gdbus_ ## _where ## _method_out ## _mname ## opid,					\
-		NULL											\
-	};												\
-													\
-	static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname =				\
-	{												\
-		-1,											\
-		(gchar *) # _mname,									\
-		(GDBusArgInfo **) &e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname,		\
-		(GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname,		\
-		(GDBusAnnotationInfo **) NULL,								\
+#define E_DECLARE_GDBUS_ASYNC_METHOD_1(_where, _mname, _p1_name, _p1_type) \
+	E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_0 (_where, _mname ## _done) \
+	E_DECLARE_GDBUS_ARG (_where, _mname, method_in, _p1_name, _p1_type) \
+	E_DECLARE_GDBUS_ARG (_where, _mname, method_out, opid, "u") \
+ \
+	static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname[] = \
+	{ \
+		&e_gdbus_ ## _where ## _method_in ## _mname ## _p1_name, \
+		NULL \
+	}; \
+ \
+	static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] = \
+	{ \
+		&e_gdbus_ ## _where ## _method_out ## _mname ## opid, \
+		NULL \
+	}; \
+ \
+	static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
+	{ \
+		-1, \
+		(gchar *) # _mname, \
+		(GDBusArgInfo **) &e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname, \
+		(GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname, \
+		(GDBusAnnotationInfo **) NULL, \
 	};
 
-#define E_DECLARE_GDBUS_ASYNC_METHOD_0_WITH_RETURN(_where, _mname, _r1_name, _r1_type)			\
-	E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_1 (_where, _mname ## _done, _r1_name, _r1_type)		\
-	E_DECLARE_GDBUS_ARG (_where, _mname, method_out, opid, "u")					\
-													\
-	static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] =	\
-	{												\
-		&e_gdbus_ ## _where ## _method_out ## _mname ## opid,					\
-		NULL											\
-	};												\
-													\
-	static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname =				\
-	{												\
-		-1,											\
-		(gchar *) # _mname,									\
-		(GDBusArgInfo **) NULL,									\
-		(GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname,		\
-		(GDBusAnnotationInfo **) NULL,								\
+#define E_DECLARE_GDBUS_ASYNC_METHOD_0_WITH_RETURN(_where, _mname, _r1_name, _r1_type) \
+	E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_1 (_where, _mname ## _done, _r1_name, _r1_type) \
+	E_DECLARE_GDBUS_ARG (_where, _mname, method_out, opid, "u") \
+ \
+	static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] = \
+	{ \
+		&e_gdbus_ ## _where ## _method_out ## _mname ## opid, \
+		NULL \
+	}; \
+ \
+	static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
+	{ \
+		-1, \
+		(gchar *) # _mname, \
+		(GDBusArgInfo **) NULL, \
+		(GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname, \
+		(GDBusAnnotationInfo **) NULL, \
 	};
 
 #define E_DECLARE_GDBUS_ASYNC_METHOD_1_WITH_RETURN(_where, _mname, _p1_name, _p1_type, _r1_name, _r1_type)\
-	E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_1 (_where, _mname ## _done, _r1_name, _r1_type)		\
-	E_DECLARE_GDBUS_ARG (_where, _mname, method_in, _p1_name, _p1_type)				\
-	E_DECLARE_GDBUS_ARG (_where, _mname, method_out, opid, "u")					\
-													\
-	static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname[] =	\
-	{												\
-		&e_gdbus_ ## _where ## _method_in ## _mname ## _p1_name,				\
-		NULL											\
-	};												\
-													\
-	static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] =	\
-	{												\
-		&e_gdbus_ ## _where ## _method_out ## _mname ## opid,					\
-		NULL											\
-	};												\
-													\
-	static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname =				\
-	{												\
-		-1,											\
-		(gchar *) # _mname,									\
-		(GDBusArgInfo **) &e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname,		\
-		(GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname,		\
-		(GDBusAnnotationInfo **) NULL,								\
+	E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_1 (_where, _mname ## _done, _r1_name, _r1_type) \
+	E_DECLARE_GDBUS_ARG (_where, _mname, method_in, _p1_name, _p1_type) \
+	E_DECLARE_GDBUS_ARG (_where, _mname, method_out, opid, "u") \
+ \
+	static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname[] = \
+	{ \
+		&e_gdbus_ ## _where ## _method_in ## _mname ## _p1_name, \
+		NULL \
+	}; \
+ \
+	static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] = \
+	{ \
+		&e_gdbus_ ## _where ## _method_out ## _mname ## opid, \
+		NULL \
+	}; \
+ \
+	static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
+	{ \
+		-1, \
+		(gchar *) # _mname, \
+		(GDBusArgInfo **) &e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname, \
+		(GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname, \
+		(GDBusAnnotationInfo **) NULL, \
 	};
 
 #define E_DECLARED_GDBUS_SIGNAL_INFO_NAME(_where, _sname) e_gdbus_ ## _where ## _signal_ ## _sname
@@ -339,323 +339,323 @@ enum {
 
 /* this requires signal_emission_hook_cb_ ## _sig_name hook defined,
  * which can be created with one of E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_... macros */
-#define E_INIT_GDBUS_SIGNAL_VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id)					\
-	signals[_sig_id] = g_signal_new (# _sig_name_var,									\
-			G_TYPE_FROM_INTERFACE (iface),										\
-			G_SIGNAL_RUN_LAST,											\
-			G_STRUCT_OFFSET (_iface_struct, _sig_name_var),								\
-			NULL,													\
-			NULL,													\
-			NULL,													\
-			G_TYPE_NONE,												\
-			0);													\
-																\
+#define E_INIT_GDBUS_SIGNAL_VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id) \
+	signals[_sig_id] = g_signal_new (# _sig_name_var, \
+			G_TYPE_FROM_INTERFACE (iface), \
+			G_SIGNAL_RUN_LAST, \
+			G_STRUCT_OFFSET (_iface_struct, _sig_name_var), \
+			NULL, \
+			NULL, \
+			NULL, \
+			G_TYPE_NONE, \
+			0); \
+ \
 	g_signal_add_emission_hook (signals[_sig_id], 0, signal_emission_hook_cb_ ## _sig_name_var, (gpointer) _dbus_sig_name_str, NULL);\
-	g_hash_table_insert (_signal_name_to_id, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (_sig_id));			\
+	g_hash_table_insert (_signal_name_to_id, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (_sig_id)); \
 	g_hash_table_insert (_signal_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (E_GDBUS_TYPE_VOID));
 
-#define E_INIT_GDBUS_SIGNAL_TMPL_TYPED(_mtype, _gtype, _iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id)		\
-	signals[_sig_id] = g_signal_new (# _sig_name_var,									\
-			G_TYPE_FROM_INTERFACE (iface),										\
-			G_SIGNAL_RUN_LAST,											\
-			G_STRUCT_OFFSET (_iface_struct, _sig_name_var),								\
-			NULL,													\
-			NULL,													\
-			NULL,													\
-			G_TYPE_NONE,												\
-			1,													\
-			G_TYPE_ ## _gtype);											\
-																\
+#define E_INIT_GDBUS_SIGNAL_TMPL_TYPED(_mtype, _gtype, _iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id) \
+	signals[_sig_id] = g_signal_new (# _sig_name_var, \
+			G_TYPE_FROM_INTERFACE (iface), \
+			G_SIGNAL_RUN_LAST, \
+			G_STRUCT_OFFSET (_iface_struct, _sig_name_var), \
+			NULL, \
+			NULL, \
+			NULL, \
+			G_TYPE_NONE, \
+			1, \
+			G_TYPE_ ## _gtype); \
+ \
 	g_signal_add_emission_hook (signals[_sig_id], 0, signal_emission_hook_cb_ ## _sig_name_var, (gpointer) _dbus_sig_name_str, NULL);\
-	g_hash_table_insert (_signal_name_to_id, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (_sig_id));			\
+	g_hash_table_insert (_signal_name_to_id, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (_sig_id)); \
 	g_hash_table_insert (_signal_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (E_GDBUS_TYPE_ ## _gtype));
 
-#define E_INIT_GDBUS_SIGNAL_BOOLEAN(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id)					\
+#define E_INIT_GDBUS_SIGNAL_BOOLEAN(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id) \
 	E_INIT_GDBUS_SIGNAL_TMPL_TYPED (BOOLEAN, BOOLEAN, _iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id)
 
-#define E_INIT_GDBUS_SIGNAL_STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id)					\
+#define E_INIT_GDBUS_SIGNAL_STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id) \
 	E_INIT_GDBUS_SIGNAL_TMPL_TYPED (STRING, STRING, _iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id)
 
-#define E_INIT_GDBUS_SIGNAL_STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id)					\
+#define E_INIT_GDBUS_SIGNAL_STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id) \
 	E_INIT_GDBUS_SIGNAL_TMPL_TYPED (BOXED, STRV, _iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id)
 
-#define E_INIT_GDBUS_SIGNAL_UINT(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id)					\
+#define E_INIT_GDBUS_SIGNAL_UINT(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id) \
 	E_INIT_GDBUS_SIGNAL_TMPL_TYPED (UINT, UINT, _iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id)
 
-#define E_INIT_GDBUS_SIGNAL_UINT_STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id)				\
-	signals[_sig_id] = g_signal_new (# _sig_name_var,									\
-			G_TYPE_FROM_INTERFACE (iface),										\
-			G_SIGNAL_RUN_LAST,											\
-			G_STRUCT_OFFSET (_iface_struct, _sig_name_var),								\
-			NULL,													\
-			NULL,													\
-			NULL,													\
-			G_TYPE_NONE,												\
-			2,													\
-			G_TYPE_UINT, G_TYPE_STRING);										\
-																\
+#define E_INIT_GDBUS_SIGNAL_UINT_STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id) \
+	signals[_sig_id] = g_signal_new (# _sig_name_var, \
+			G_TYPE_FROM_INTERFACE (iface), \
+			G_SIGNAL_RUN_LAST, \
+			G_STRUCT_OFFSET (_iface_struct, _sig_name_var), \
+			NULL, \
+			NULL, \
+			NULL, \
+			G_TYPE_NONE, \
+			2, \
+			G_TYPE_UINT, G_TYPE_STRING); \
+ \
 	g_signal_add_emission_hook (signals[_sig_id], 0, signal_emission_hook_cb_ ## _sig_name_var, (gpointer) _dbus_sig_name_str, NULL);\
-	g_hash_table_insert (_signal_name_to_id, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (_sig_id));			\
+	g_hash_table_insert (_signal_name_to_id, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (_sig_id)); \
 	g_hash_table_insert (_signal_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (E_GDBUS_TYPE_UINT | E_GDBUS_TYPE_STRING));
 
-#define E_INIT_GDBUS_METHOD_DONE_VOID(_iface_struct, _sig_name_var, _done_sig_id)						\
-	signals[_done_sig_id] = g_signal_new (# _sig_name_var "_done",								\
-			G_TYPE_FROM_INTERFACE (iface),										\
-			G_SIGNAL_RUN_LAST,											\
-			G_STRUCT_OFFSET (_iface_struct, _sig_name_var ## _done),						\
-			NULL,													\
-			NULL,													\
-			NULL,													\
-			G_TYPE_NONE,												\
-			2,													\
-			G_TYPE_UINT, G_TYPE_ERROR);										\
-	g_signal_add_emission_hook (signals[_done_sig_id], 0,									\
-			signal_emission_hook_cb_ ## _sig_name_var ## _done, (gpointer) # _sig_name_var "_done", NULL);		\
-	g_hash_table_insert (_signal_name_to_id, (gpointer) # _sig_name_var "_done", GUINT_TO_POINTER (_done_sig_id));		\
+#define E_INIT_GDBUS_METHOD_DONE_VOID(_iface_struct, _sig_name_var, _done_sig_id) \
+	signals[_done_sig_id] = g_signal_new (# _sig_name_var "_done", \
+			G_TYPE_FROM_INTERFACE (iface), \
+			G_SIGNAL_RUN_LAST, \
+			G_STRUCT_OFFSET (_iface_struct, _sig_name_var ## _done), \
+			NULL, \
+			NULL, \
+			NULL, \
+			G_TYPE_NONE, \
+			2, \
+			G_TYPE_UINT, G_TYPE_ERROR); \
+	g_signal_add_emission_hook (signals[_done_sig_id], 0, \
+			signal_emission_hook_cb_ ## _sig_name_var ## _done, (gpointer) # _sig_name_var "_done", NULL); \
+	g_hash_table_insert (_signal_name_to_id, (gpointer) # _sig_name_var "_done", GUINT_TO_POINTER (_done_sig_id)); \
 	g_hash_table_insert (_signal_name_to_type, (gpointer) # _sig_name_var "_done", GUINT_TO_POINTER (E_GDBUS_TYPE_IS_ASYNC | E_GDBUS_TYPE_VOID));
 
-#define E_INIT_GDBUS_METHOD_DONE_ASYNC_TMPL_TYPED(_mtype, _gtype, _iface_struct, _sig_name_var, _done_sig_id)			\
-	signals[_done_sig_id] = g_signal_new (# _sig_name_var "_done",								\
-			G_TYPE_FROM_INTERFACE (iface),										\
-			G_SIGNAL_RUN_LAST,											\
-			G_STRUCT_OFFSET (_iface_struct, _sig_name_var ## _done),						\
-			NULL,													\
-			NULL,													\
-			NULL,													\
-			G_TYPE_NONE,												\
-			3,													\
-			G_TYPE_UINT, G_TYPE_ERROR, G_TYPE_ ## _gtype);								\
-	g_signal_add_emission_hook (signals[_done_sig_id], 0,									\
-			signal_emission_hook_cb_ ## _sig_name_var ## _done, (gpointer) # _sig_name_var "_done", NULL);		\
-	g_hash_table_insert (_signal_name_to_id, (gpointer) # _sig_name_var "_done", GUINT_TO_POINTER (_done_sig_id));		\
+#define E_INIT_GDBUS_METHOD_DONE_ASYNC_TMPL_TYPED(_mtype, _gtype, _iface_struct, _sig_name_var, _done_sig_id) \
+	signals[_done_sig_id] = g_signal_new (# _sig_name_var "_done", \
+			G_TYPE_FROM_INTERFACE (iface), \
+			G_SIGNAL_RUN_LAST, \
+			G_STRUCT_OFFSET (_iface_struct, _sig_name_var ## _done), \
+			NULL, \
+			NULL, \
+			NULL, \
+			G_TYPE_NONE, \
+			3, \
+			G_TYPE_UINT, G_TYPE_ERROR, G_TYPE_ ## _gtype); \
+	g_signal_add_emission_hook (signals[_done_sig_id], 0, \
+			signal_emission_hook_cb_ ## _sig_name_var ## _done, (gpointer) # _sig_name_var "_done", NULL); \
+	g_hash_table_insert (_signal_name_to_id, (gpointer) # _sig_name_var "_done", GUINT_TO_POINTER (_done_sig_id)); \
 	g_hash_table_insert (_signal_name_to_type, (gpointer) # _sig_name_var "_done", GUINT_TO_POINTER (E_GDBUS_TYPE_IS_ASYNC | E_GDBUS_TYPE_ ## _gtype));
 
-#define E_INIT_GDBUS_METHOD_DONE_BOOLEAN(_iface_struct, _sig_name_var, _done_sig_id)						\
+#define E_INIT_GDBUS_METHOD_DONE_BOOLEAN(_iface_struct, _sig_name_var, _done_sig_id) \
 	E_INIT_GDBUS_METHOD_DONE_ASYNC_TMPL_TYPED (BOOLEAN, BOOLEAN, _iface_struct, _sig_name_var, _done_sig_id)
 
-#define E_INIT_GDBUS_METHOD_DONE_STRING(_iface_struct, _sig_name_var, _done_sig_id)						\
+#define E_INIT_GDBUS_METHOD_DONE_STRING(_iface_struct, _sig_name_var, _done_sig_id) \
 	E_INIT_GDBUS_METHOD_DONE_ASYNC_TMPL_TYPED (STRING, STRING, _iface_struct, _sig_name_var, _done_sig_id)
 
-#define E_INIT_GDBUS_METHOD_DONE_STRV(_iface_struct, _sig_name_var, _done_sig_id)						\
+#define E_INIT_GDBUS_METHOD_DONE_STRV(_iface_struct, _sig_name_var, _done_sig_id) \
 	E_INIT_GDBUS_METHOD_DONE_ASYNC_TMPL_TYPED (BOXED, STRV, _iface_struct, _sig_name_var, _done_sig_id)
 
-#define E_INIT_GDBUS_METHOD_DONE_UINT(_iface_struct, _sig_name_var, _done_sig_id)						\
+#define E_INIT_GDBUS_METHOD_DONE_UINT(_iface_struct, _sig_name_var, _done_sig_id) \
 	E_INIT_GDBUS_METHOD_DONE_ASYNC_TMPL_TYPED (UINT, UINT, _iface_struct, _sig_name_var, _done_sig_id)
 
 /* do not use this directly, there is missing _method_name_to_type insertion */
-#define E_INIT_GDBUS_METHOD_CALL_TMPL_VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)			\
-	signals[_method_sig_id] = g_signal_new ("handle-" # _sig_name_var,							\
-			G_TYPE_FROM_INTERFACE (iface),										\
-			G_SIGNAL_RUN_LAST,											\
-			G_STRUCT_OFFSET (_iface_struct, handle_ ## _sig_name_var),						\
-			NULL, NULL, NULL,											\
-			G_TYPE_BOOLEAN,												\
-			1,													\
-			G_TYPE_DBUS_METHOD_INVOCATION);										\
+#define E_INIT_GDBUS_METHOD_CALL_TMPL_VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
+	signals[_method_sig_id] = g_signal_new ("handle-" # _sig_name_var, \
+			G_TYPE_FROM_INTERFACE (iface), \
+			G_SIGNAL_RUN_LAST, \
+			G_STRUCT_OFFSET (_iface_struct, handle_ ## _sig_name_var), \
+			NULL, NULL, NULL, \
+			G_TYPE_BOOLEAN, \
+			1, \
+			G_TYPE_DBUS_METHOD_INVOCATION); \
 	g_hash_table_insert (_method_name_to_id, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (_method_sig_id));
 
 /* do not use this directly, there is missing _method_name_to_type insertion */
-#define E_INIT_GDBUS_METHOD_CALL_TMPL_TYPED(_mtype, _gtype, _iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)	\
-	signals[_method_sig_id] = g_signal_new ("handle-" # _sig_name_var,							\
-			G_TYPE_FROM_INTERFACE (iface),										\
-			G_SIGNAL_RUN_LAST,											\
-			G_STRUCT_OFFSET (_iface_struct, handle_ ## _sig_name_var),						\
-			NULL, NULL, NULL,											\
-			G_TYPE_BOOLEAN,												\
-			2,													\
-			G_TYPE_DBUS_METHOD_INVOCATION,										\
-			G_TYPE_ ## _gtype);											\
-	g_hash_table_insert (_method_name_to_id, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (_method_sig_id));		\
-
-#define E_INIT_GDBUS_METHOD_CALL_ASYNC_TMPL_TYPED(_mtype, _gtype, _iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)	\
-	E_INIT_GDBUS_METHOD_CALL_TMPL_TYPED (_mtype, _gtype, _iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)	\
+#define E_INIT_GDBUS_METHOD_CALL_TMPL_TYPED(_mtype, _gtype, _iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
+	signals[_method_sig_id] = g_signal_new ("handle-" # _sig_name_var, \
+			G_TYPE_FROM_INTERFACE (iface), \
+			G_SIGNAL_RUN_LAST, \
+			G_STRUCT_OFFSET (_iface_struct, handle_ ## _sig_name_var), \
+			NULL, NULL, NULL, \
+			G_TYPE_BOOLEAN, \
+			2, \
+			G_TYPE_DBUS_METHOD_INVOCATION, \
+			G_TYPE_ ## _gtype); \
+	g_hash_table_insert (_method_name_to_id, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (_method_sig_id)); \
+
+#define E_INIT_GDBUS_METHOD_CALL_ASYNC_TMPL_TYPED(_mtype, _gtype, _iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
+	E_INIT_GDBUS_METHOD_CALL_TMPL_TYPED (_mtype, _gtype, _iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
 	g_hash_table_insert (_method_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (E_GDBUS_TYPE_ ## _gtype | E_GDBUS_TYPE_IS_ASYNC));
 
-#define E_INIT_GDBUS_METHOD_VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)				\
-	E_INIT_GDBUS_METHOD_CALL_TMPL_VOID (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)			\
+#define E_INIT_GDBUS_METHOD_VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
+	E_INIT_GDBUS_METHOD_CALL_TMPL_VOID (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
 	g_hash_table_insert (_method_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (E_GDBUS_TYPE_VOID));
 
-#define E_INIT_GDBUS_METHOD_BOOLEAN(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)				\
+#define E_INIT_GDBUS_METHOD_BOOLEAN(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
 	E_INIT_GDBUS_METHOD_CALL_TMPL_TYPED (BOOLEAN, BOOLEAN, _iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)\
 	g_hash_table_insert (_method_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (E_GDBUS_TYPE_BOOLEAN));
 
-#define E_INIT_GDBUS_METHOD_STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)				\
-	E_INIT_GDBUS_METHOD_CALL_TMPL_TYPED (STRING, STRING, _iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)	\
+#define E_INIT_GDBUS_METHOD_STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
+	E_INIT_GDBUS_METHOD_CALL_TMPL_TYPED (STRING, STRING, _iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
 	g_hash_table_insert (_method_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (E_GDBUS_TYPE_STRING));
 
-#define E_INIT_GDBUS_METHOD_STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)				\
-	E_INIT_GDBUS_METHOD_CALL_TMPL_TYPED (BOXED, STRV, _iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)	\
+#define E_INIT_GDBUS_METHOD_STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
+	E_INIT_GDBUS_METHOD_CALL_TMPL_TYPED (BOXED, STRV, _iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
 	g_hash_table_insert (_method_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (E_GDBUS_TYPE_STRV));
 
-#define E_INIT_GDBUS_METHOD_UINT(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)				\
-	E_INIT_GDBUS_METHOD_CALL_TMPL_TYPED (UINT, UINT, _iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)	\
+#define E_INIT_GDBUS_METHOD_UINT(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
+	E_INIT_GDBUS_METHOD_CALL_TMPL_TYPED (UINT, UINT, _iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
 	g_hash_table_insert (_method_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (E_GDBUS_TYPE_UINT));
 
-#define E_INIT_GDBUS_METHOD_CALL_VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)				\
-	E_INIT_GDBUS_METHOD_CALL_TMPL_VOID (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)			\
+#define E_INIT_GDBUS_METHOD_CALL_VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
+	E_INIT_GDBUS_METHOD_CALL_TMPL_VOID (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
 	g_hash_table_insert (_method_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (E_GDBUS_TYPE_VOID | E_GDBUS_TYPE_IS_ASYNC));
 
-#define E_INIT_GDBUS_METHOD_CALL_BOOLEAN(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)			\
+#define E_INIT_GDBUS_METHOD_CALL_BOOLEAN(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
 	E_INIT_GDBUS_METHOD_CALL_ASYNC_TMPL_TYPED (BOOLEAN, BOOLEAN, _iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
 
-#define E_INIT_GDBUS_METHOD_CALL_STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)			\
+#define E_INIT_GDBUS_METHOD_CALL_STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
 	E_INIT_GDBUS_METHOD_CALL_ASYNC_TMPL_TYPED (STRING, STRING, _iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
 
-#define E_INIT_GDBUS_METHOD_CALL_STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)				\
+#define E_INIT_GDBUS_METHOD_CALL_STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
 	E_INIT_GDBUS_METHOD_CALL_ASYNC_TMPL_TYPED (BOXED, STRV, _iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
 
-#define E_INIT_GDBUS_METHOD_CALL_UINT(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)				\
+#define E_INIT_GDBUS_METHOD_CALL_UINT(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
 	E_INIT_GDBUS_METHOD_CALL_ASYNC_TMPL_TYPED (UINT, UINT, _iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
 
-#define E_INIT_GDBUS_METHOD_ASYNC_VOID__VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id, _done_sig_id)	\
-	E_INIT_GDBUS_METHOD_CALL_VOID (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)			\
+#define E_INIT_GDBUS_METHOD_ASYNC_VOID__VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id, _done_sig_id) \
+	E_INIT_GDBUS_METHOD_CALL_VOID (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
 	E_INIT_GDBUS_METHOD_DONE_VOID (_iface_struct, _sig_name_var, _done_sig_id)
 
-#define E_INIT_GDBUS_METHOD_ASYNC_VOID__STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id, _done_sig_id)	\
-	E_INIT_GDBUS_METHOD_CALL_VOID   (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)			\
+#define E_INIT_GDBUS_METHOD_ASYNC_VOID__STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id, _done_sig_id) \
+	E_INIT_GDBUS_METHOD_CALL_VOID   (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
 	E_INIT_GDBUS_METHOD_DONE_STRING (_iface_struct, _sig_name_var, _done_sig_id)
 
-#define E_INIT_GDBUS_METHOD_ASYNC_VOID__STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id, _done_sig_id)	\
-	E_INIT_GDBUS_METHOD_CALL_VOID (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)			\
+#define E_INIT_GDBUS_METHOD_ASYNC_VOID__STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id, _done_sig_id) \
+	E_INIT_GDBUS_METHOD_CALL_VOID (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
 	E_INIT_GDBUS_METHOD_DONE_STRV (_iface_struct, _sig_name_var, _done_sig_id)
 
-#define E_INIT_GDBUS_METHOD_ASYNC_BOOLEAN__VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id, _done_sig_id)	\
-	E_INIT_GDBUS_METHOD_CALL_BOOLEAN (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)			\
+#define E_INIT_GDBUS_METHOD_ASYNC_BOOLEAN__VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id, _done_sig_id) \
+	E_INIT_GDBUS_METHOD_CALL_BOOLEAN (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
 	E_INIT_GDBUS_METHOD_DONE_VOID    (_iface_struct, _sig_name_var, _done_sig_id)
 
-#define E_INIT_GDBUS_METHOD_ASYNC_UINT__VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id, _done_sig_id)	\
-	E_INIT_GDBUS_METHOD_CALL_UINT (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)			\
+#define E_INIT_GDBUS_METHOD_ASYNC_UINT__VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id, _done_sig_id) \
+	E_INIT_GDBUS_METHOD_CALL_UINT (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
 	E_INIT_GDBUS_METHOD_DONE_VOID (_iface_struct, _sig_name_var, _done_sig_id)
 
-#define E_INIT_GDBUS_METHOD_ASYNC_STRING__VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id, _done_sig_id)	\
-	E_INIT_GDBUS_METHOD_CALL_STRING (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)			\
+#define E_INIT_GDBUS_METHOD_ASYNC_STRING__VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id, _done_sig_id) \
+	E_INIT_GDBUS_METHOD_CALL_STRING (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
 	E_INIT_GDBUS_METHOD_DONE_VOID   (_iface_struct, _sig_name_var, _done_sig_id)
 
-#define E_INIT_GDBUS_METHOD_ASYNC_STRV__VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id, _done_sig_id)	\
-	E_INIT_GDBUS_METHOD_CALL_STRV (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)			\
+#define E_INIT_GDBUS_METHOD_ASYNC_STRV__VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id, _done_sig_id) \
+	E_INIT_GDBUS_METHOD_CALL_STRV (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
 	E_INIT_GDBUS_METHOD_DONE_VOID (_iface_struct, _sig_name_var, _done_sig_id)
 
 #define E_INIT_GDBUS_METHOD_ASYNC_STRING__STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id, _done_sig_id)\
-	E_INIT_GDBUS_METHOD_CALL_STRING (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)			\
+	E_INIT_GDBUS_METHOD_CALL_STRING (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
 	E_INIT_GDBUS_METHOD_DONE_STRING (_iface_struct, _sig_name_var, _done_sig_id)
 
-#define E_INIT_GDBUS_METHOD_ASYNC_STRING__STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id, _done_sig_id)	\
-	E_INIT_GDBUS_METHOD_CALL_STRING (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)			\
+#define E_INIT_GDBUS_METHOD_ASYNC_STRING__STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id, _done_sig_id) \
+	E_INIT_GDBUS_METHOD_CALL_STRING (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
 	E_INIT_GDBUS_METHOD_DONE_STRV   (_iface_struct, _sig_name_var, _done_sig_id)
 
-#define E_INIT_GDBUS_METHOD_ASYNC_STRV__STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id, _done_sig_id)	\
-	E_INIT_GDBUS_METHOD_CALL_STRV (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)			\
+#define E_INIT_GDBUS_METHOD_ASYNC_STRV__STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id, _done_sig_id) \
+	E_INIT_GDBUS_METHOD_CALL_STRV (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
 	E_INIT_GDBUS_METHOD_DONE_STRING (_iface_struct, _sig_name_var, _done_sig_id)
 
-#define E_INIT_GDBUS_METHOD_ASYNC_STRV__STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id, _done_sig_id)	\
-	E_INIT_GDBUS_METHOD_CALL_STRV (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)			\
+#define E_INIT_GDBUS_METHOD_ASYNC_STRV__STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id, _done_sig_id) \
+	E_INIT_GDBUS_METHOD_CALL_STRV (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
 	E_INIT_GDBUS_METHOD_DONE_STRV (_iface_struct, _sig_name_var, _done_sig_id)
 
-#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_VOID(_iface_name, _sig_name)										\
-	static gboolean																	\
-	signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, gpointer user_data)	\
-	{																		\
-		return e_gdbus_signal_emission_hook_void (ihint, n_param_values, param_values, user_data, _iface_name);					\
+#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_VOID(_iface_name, _sig_name) \
+	static gboolean \
+	signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, gpointer user_data) \
+	{ \
+		return e_gdbus_signal_emission_hook_void (ihint, n_param_values, param_values, user_data, _iface_name); \
 	}
 
-#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_BOOLEAN(_iface_name, _sig_name)										\
-	static gboolean																	\
-	signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, gpointer user_data)	\
-	{																		\
-		return e_gdbus_signal_emission_hook_boolean (ihint, n_param_values, param_values, user_data, _iface_name);				\
+#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_BOOLEAN(_iface_name, _sig_name) \
+	static gboolean \
+	signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, gpointer user_data) \
+	{ \
+		return e_gdbus_signal_emission_hook_boolean (ihint, n_param_values, param_values, user_data, _iface_name); \
 	}
 
-#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_STRING(_iface_name, _sig_name)										\
-	static gboolean																	\
-	signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, gpointer user_data)	\
-	{																		\
-		return e_gdbus_signal_emission_hook_string (ihint, n_param_values, param_values, user_data, _iface_name);				\
+#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_STRING(_iface_name, _sig_name) \
+	static gboolean \
+	signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, gpointer user_data) \
+	{ \
+		return e_gdbus_signal_emission_hook_string (ihint, n_param_values, param_values, user_data, _iface_name); \
 	}
 
-#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_STRV(_iface_name, _sig_name)										\
-	static gboolean																	\
-	signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, gpointer user_data)	\
-	{																		\
-		return e_gdbus_signal_emission_hook_strv (ihint, n_param_values, param_values, user_data, _iface_name);					\
+#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_STRV(_iface_name, _sig_name) \
+	static gboolean \
+	signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, gpointer user_data) \
+	{ \
+		return e_gdbus_signal_emission_hook_strv (ihint, n_param_values, param_values, user_data, _iface_name); \
 	}
 
-#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_UINT(_iface_name, _sig_name)										\
-	static gboolean																	\
-	signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, gpointer user_data)	\
-	{																		\
-		return e_gdbus_signal_emission_hook_uint (ihint, n_param_values, param_values, user_data, _iface_name);					\
+#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_UINT(_iface_name, _sig_name) \
+	static gboolean \
+	signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, gpointer user_data) \
+	{ \
+		return e_gdbus_signal_emission_hook_uint (ihint, n_param_values, param_values, user_data, _iface_name); \
 	}
 
-#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_UINT_STRING(_iface_name, _sig_name)										\
-	static gboolean																	\
-	signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, gpointer user_data)	\
-	{																		\
-		return e_gdbus_signal_emission_hook_uint_string (ihint, n_param_values, param_values, user_data, _iface_name);					\
+#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_UINT_STRING(_iface_name, _sig_name) \
+	static gboolean \
+	signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, gpointer user_data) \
+	{ \
+		return e_gdbus_signal_emission_hook_uint_string (ihint, n_param_values, param_values, user_data, _iface_name); \
 	}
 
-#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_VOID(_iface_name, _sig_name)										\
-	static gboolean																	\
-	signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, gpointer user_data)	\
-	{																		\
-		return e_gdbus_signal_emission_hook_async_void (ihint, n_param_values, param_values, user_data, _iface_name);				\
+#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_VOID(_iface_name, _sig_name) \
+	static gboolean \
+	signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, gpointer user_data) \
+	{ \
+		return e_gdbus_signal_emission_hook_async_void (ihint, n_param_values, param_values, user_data, _iface_name); \
 	}
 
-#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_BOOLEAN(_iface_name, _sig_name)									\
-	static gboolean																	\
-	signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, gpointer user_data)	\
-	{																		\
-		return e_gdbus_signal_emission_hook_async_boolean (ihint, n_param_values, param_values, user_data, _iface_name);			\
+#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_BOOLEAN(_iface_name, _sig_name) \
+	static gboolean \
+	signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, gpointer user_data) \
+	{ \
+		return e_gdbus_signal_emission_hook_async_boolean (ihint, n_param_values, param_values, user_data, _iface_name); \
 	}
 
-#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_STRING(_iface_name, _sig_name)									\
-	static gboolean																	\
-	signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, gpointer user_data)	\
-	{																		\
-		return e_gdbus_signal_emission_hook_async_string (ihint, n_param_values, param_values, user_data, _iface_name);				\
+#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_STRING(_iface_name, _sig_name) \
+	static gboolean \
+	signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, gpointer user_data) \
+	{ \
+		return e_gdbus_signal_emission_hook_async_string (ihint, n_param_values, param_values, user_data, _iface_name); \
 	}
 
-#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_STRV(_iface_name, _sig_name)										\
-	static gboolean																	\
-	signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, gpointer user_data)	\
-	{																		\
-		return e_gdbus_signal_emission_hook_async_strv (ihint, n_param_values, param_values, user_data, _iface_name);				\
+#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_STRV(_iface_name, _sig_name) \
+	static gboolean \
+	signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, gpointer user_data) \
+	{ \
+		return e_gdbus_signal_emission_hook_async_strv (ihint, n_param_values, param_values, user_data, _iface_name); \
 	}
 
-#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_UINT(_iface_name, _sig_name)										\
-	static gboolean																	\
-	signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, gpointer user_data)	\
-	{																		\
-		return e_gdbus_signal_emission_hook_async_uint (ihint, n_param_values, param_values, user_data, _iface_name);				\
+#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_UINT(_iface_name, _sig_name) \
+	static gboolean \
+	signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const GValue *param_values, gpointer user_data) \
+	{ \
+		return e_gdbus_signal_emission_hook_async_uint (ihint, n_param_values, param_values, user_data, _iface_name); \
 	}
 
-#define E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_VOID(_iface_name, _sig_name)									\
+#define E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_VOID(_iface_name, _sig_name) \
 	E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_VOID (_iface_name, _sig_name ## _done)
 
-#define E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_BOOLEAN(_iface_name, _sig_name)									\
+#define E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_BOOLEAN(_iface_name, _sig_name) \
 	E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_BOOLEAN (_iface_name, _sig_name ## _done)
 
-#define E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_STRING(_iface_name, _sig_name)									\
+#define E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_STRING(_iface_name, _sig_name) \
 	E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_STRING (_iface_name, _sig_name ## _done)
 
-#define E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_STRV(_iface_name, _sig_name)									\
+#define E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_STRV(_iface_name, _sig_name) \
 	E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_STRV (_iface_name, _sig_name ## _done)
 
-#define E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_UINT(_iface_name, _sig_name)									\
+#define E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_UINT(_iface_name, _sig_name) \
 	E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_UINT (_iface_name, _sig_name ## _done)
 
-#define E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_VOID(_sig_name)												\
+#define E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_VOID(_sig_name) \
 	g_signal_connect (proxy, # _sig_name "_done", G_CALLBACK (e_gdbus_proxy_async_method_done_void), NULL);
 
-#define E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_BOOLEAN(_sig_name)												\
+#define E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_BOOLEAN(_sig_name) \
 	g_signal_connect (proxy, # _sig_name "_done", G_CALLBACK (e_gdbus_proxy_async_method_done_boolean), NULL);
 
-#define E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_STRING(_sig_name)												\
+#define E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_STRING(_sig_name) \
 	g_signal_connect (proxy, # _sig_name "_done", G_CALLBACK (e_gdbus_proxy_async_method_done_string), NULL);
 
-#define E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_STRV(_sig_name)												\
+#define E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_STRV(_sig_name) \
 	g_signal_connect (proxy, # _sig_name "_done", G_CALLBACK (e_gdbus_proxy_async_method_done_strv), NULL);
 
-#define E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_UINT(_sig_name)												\
+#define E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_UINT(_sig_name) \
 	g_signal_connect (proxy, # _sig_name "_done", G_CALLBACK (e_gdbus_proxy_async_method_done_uint), NULL);
 
 void e_gdbus_proxy_emit_signal (GDBusProxy *proxy, GVariant *parameters, guint signal_id, guint signal_type);
diff --git a/libedataserver/e-list-iterator.c b/libedataserver/e-list-iterator.c
index 4e30a90a6..c2cd42e91 100644
--- a/libedataserver/e-list-iterator.c
+++ b/libedataserver/e-list-iterator.c
@@ -39,15 +39,15 @@ e_list_iterator_class_init (EListIteratorClass *class)
 
 	iterator_class = E_ITERATOR_CLASS (class);
 	iterator_class->invalidate = e_list_iterator_invalidate;
-	iterator_class->get        = e_list_iterator_get;
-	iterator_class->reset      = e_list_iterator_reset;
-	iterator_class->last       = e_list_iterator_last;
-	iterator_class->next       = e_list_iterator_next;
-	iterator_class->prev       = e_list_iterator_prev;
-	iterator_class->remove     = e_list_iterator_remove;
-	iterator_class->insert     = e_list_iterator_insert;
-	iterator_class->set        = e_list_iterator_set;
-	iterator_class->is_valid   = e_list_iterator_is_valid;
+	iterator_class->get = e_list_iterator_get;
+	iterator_class->reset = e_list_iterator_reset;
+	iterator_class->last = e_list_iterator_last;
+	iterator_class->next = e_list_iterator_next;
+	iterator_class->prev = e_list_iterator_prev;
+	iterator_class->remove = e_list_iterator_remove;
+	iterator_class->insert = e_list_iterator_insert;
+	iterator_class->set = e_list_iterator_set;
+	iterator_class->is_valid = e_list_iterator_is_valid;
 }
 
 /**
diff --git a/libedataserver/e-list.c b/libedataserver/e-list.c
index 18ce58487..881267035 100644
--- a/libedataserver/e-list.c
+++ b/libedataserver/e-list.c
@@ -76,8 +76,8 @@ e_list_construct (EList *list,
                   EListFreeFunc free,
                   gpointer closure)
 {
-	list->copy    = copy;
-	list->free    = free;
+	list->copy = copy;
+	list->free = free;
 	list->closure = closure;
 }
 
@@ -92,10 +92,10 @@ e_list_duplicate (EList *list)
 {
 	EList *dupe = g_object_new (E_TYPE_LIST, NULL);
 
-	dupe->copy    = list->copy;
-	dupe->free    = list->free;
+	dupe->copy = list->copy;
+	dupe->free = list->free;
 	dupe->closure = list->closure;
-	dupe->list    = g_list_copy (list->list);
+	dupe->list = g_list_copy (list->list);
 	if (dupe->copy) {
 		GList *listlist;
 		for (listlist = dupe->list; listlist; listlist = listlist->next) {
diff --git a/libedataserver/e-proxy.c b/libedataserver/e-proxy.c
index 48b8ce145..b72f0b681 100644
--- a/libedataserver/e-proxy.c
+++ b/libedataserver/e-proxy.c
@@ -31,7 +31,7 @@
 #ifdef _WIN32
 #include <winsock2.h>
 #ifndef IN6_ARE_ADDR_EQUAL
-#define IN6_ARE_ADDR_EQUAL(a, b)	\
+#define IN6_ARE_ADDR_EQUAL(a, b) \
     (memcmp ((gpointer)(a), (gpointer)(b), sizeof (struct in6_addr)) == 0)
 #endif
 #else
@@ -362,7 +362,7 @@ ep_need_proxy_http (EProxy *proxy,
 			for (l = priv->ign_addrs; l; l = l->next) {
 				p_addr = (ProxyHostAddr *) l->data;
 				if (p_addr->type == PROXY_IPV4) {
-					addr_in =  ((struct in_addr *) p_addr->addr);
+					addr_in = ((struct in_addr *) p_addr->addr);
 					mask = ((struct in_addr *) p_addr->mask);
 					if ((in.s_addr & mask->s_addr) == addr_in->s_addr) {
 						d (g_print ("Host [%s] doesn't require proxy\n", host));
@@ -389,7 +389,7 @@ ep_need_proxy_http (EProxy *proxy,
 					   IN6_IS_ADDR_V4MAPPED (&net6)) {
 					guint32 v4addr;
 
-					addr_in =  ((struct in_addr *) p_addr->addr);
+					addr_in = ((struct in_addr *) p_addr->addr);
 					mask = ((struct in_addr *) p_addr->mask);
 
 					v4addr = net6.s6_addr[12] << 24
diff --git a/libedataserver/e-source-enums.h b/libedataserver/e-source-enums.h
index 40cdb4828..dc833ffc1 100644
--- a/libedataserver/e-source-enums.h
+++ b/libedataserver/e-source-enums.h
@@ -71,11 +71,11 @@ typedef enum {
  * Since: 3.8
  **/
 typedef enum {
-	E_TRUST_PROMPT_RESPONSE_UNKNOWN			= -1,
-	E_TRUST_PROMPT_RESPONSE_REJECT			=  0,
-	E_TRUST_PROMPT_RESPONSE_ACCEPT			=  1,
-	E_TRUST_PROMPT_RESPONSE_ACCEPT_TEMPORARILY	=  2,
-	E_TRUST_PROMPT_RESPONSE_REJECT_TEMPORARILY	=  3
+	E_TRUST_PROMPT_RESPONSE_UNKNOWN = -1,
+	E_TRUST_PROMPT_RESPONSE_REJECT = 0,
+	E_TRUST_PROMPT_RESPONSE_ACCEPT = 1,
+	E_TRUST_PROMPT_RESPONSE_ACCEPT_TEMPORARILY = 2,
+	E_TRUST_PROMPT_RESPONSE_REJECT_TEMPORARILY = 3
 } ETrustPromptResponse;
 
 #endif /* E_SOURCE_ENUMS_H */
diff --git a/libedataserver/e-source-registry.c b/libedataserver/e-source-registry.c
index 51d851f72..54b445282 100644
--- a/libedataserver/e-source-registry.c
+++ b/libedataserver/e-source-registry.c
@@ -1883,9 +1883,9 @@ source_registry_authenticate_dismissed_cb (EDBusAuthenticator *dbus_auth,
 /* Helper for e_source_registry_authenticate_sync() */
 static void
 source_registry_authenticate_server_error_cb (EDBusAuthenticator *dbus_auth,
-					      const gchar *name,
-					      const gchar *message,
-					      AuthContext *auth_context)
+                                              const gchar *name,
+                                              const gchar *message,
+                                              AuthContext *auth_context)
 {
 	/* Be careful not to overwrite an existing error */
 	if (auth_context->auth_result != E_SOURCE_AUTHENTICATION_ERROR) {
diff --git a/libedataserver/e-time-utils.c b/libedataserver/e-time-utils.c
index c56e22af6..83d4635c1 100644
--- a/libedataserver/e-time-utils.c
+++ b/libedataserver/e-time-utils.c
@@ -234,9 +234,9 @@ localtime_r (t,
 #define match_char(ch1, ch2) if (ch1 != ch2) return NULL
 #if defined _LIBC && defined __GNUC__ && __GNUC__ >= 2
 # define match_string(cs1, s2) \
-  ({ gsize len = strlen (cs1);						      \
-     gint result = __strncasecmp_l ((cs1), (s2), len, locale) == 0;	      \
-     if (result) (s2) += len;						      \
+  ({ gsize len = strlen (cs1); \
+     gint result = __strncasecmp_l ((cs1), (s2), len, locale) == 0; \
+     if (result) (s2) += len; \
      result; })
 #else
 /* Oh come on.  Get a reasonable compiler.  */
@@ -246,51 +246,51 @@ localtime_r (t,
 /* We intentionally do not use isdigit() for testing because this will
  * lead to problems with the wide character version.  */
 #define get_number(from, to, n) \
-  do {									      \
-    gint __n = n;							      \
-    val = 0;								      \
-    while (*rp == ' ')							      \
-      ++rp;								      \
-    if (*rp < '0' || *rp > '9')						      \
-      return NULL;							      \
-    do {								      \
-      val *= 10;							      \
-      val += *rp++ - '0';						      \
-    } while (--__n > 0 && val * 10 <= to && *rp >= '0' && *rp <= '9');	      \
-    if (val < from || val > to)						      \
-      return NULL;							      \
+  do { \
+    gint __n = n; \
+    val = 0; \
+    while (*rp == ' ') \
+      ++rp; \
+    if (*rp < '0' || *rp > '9') \
+      return NULL; \
+    do { \
+      val *= 10; \
+      val += *rp++ - '0'; \
+    } while (--__n > 0 && val * 10 <= to && *rp >= '0' && *rp <= '9'); \
+    if (val < from || val > to) \
+      return NULL; \
   } while (0)
 #ifdef _NL_CURRENT
 # define get_alt_number(from, to, n) \
-  ({									      \
-     __label__ do_normal;						      \
-									      \
-     if (*decided != raw)						      \
-       {								      \
-	 val = _nl_parse_alt_digit (&rp HELPER_LOCALE_ARG);		      \
-	 if (val == -1 && *decided != loc)				      \
-	   {								      \
-	     *decided = loc;						      \
-	     goto do_normal;						      \
-	   }								      \
-	if (val < from || val > to)					      \
-	  return NULL;							      \
-       }								      \
-     else								      \
-       {								      \
-       do_normal:							      \
-	 get_number (from, to, n);					      \
-       }								      \
-    0;									      \
+  ({ \
+     __label__ do_normal; \
+ \
+     if (*decided != raw) \
+       { \
+	 val = _nl_parse_alt_digit (&rp HELPER_LOCALE_ARG); \
+	 if (val == -1 && *decided != loc) \
+	   { \
+	     *decided = loc; \
+	     goto do_normal; \
+	   } \
+	if (val < from || val > to) \
+	  return NULL; \
+       } \
+     else \
+       { \
+       do_normal: \
+	 get_number (from, to, n); \
+       } \
+    0; \
   })
 #else
 # define get_alt_number(from, to, n) \
-  /* We don't have the alternate representation.  */			      \
+  /* We don't have the alternate representation.  */ \
   get_number (from, to, n)
 #endif
 #define recursive(new_fmt) \
-  (*(new_fmt) != '\0'							      \
-   && (rp = __strptime_internal (rp, (new_fmt), tm,			      \
+  (*(new_fmt) != '\0' \
+   && (rp = __strptime_internal (rp, (new_fmt), tm, \
 				 decided, era_cnt LOCALE_ARG)) != NULL)
 
 #ifdef _LIBC
@@ -377,7 +377,7 @@ static const gushort __mon_yday[2][13] =
 #ifndef __isleap
 /* Nonzero if YEAR is a leap year (every 4 years,
  * except every 100th isn't, and every 400th is).  */
-# define __isleap(year)	\
+# define __isleap(year) \
   ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))
 #endif
 
@@ -1506,7 +1506,7 @@ parse_with_strptime (const gchar *value,
 		return E_TIME_PARSE_NONE;
 	}
 
-	parse_ret =  E_TIME_PARSE_INVALID;
+	parse_ret = E_TIME_PARSE_INVALID;
 	locale_str = g_locale_from_utf8 (value, -1, NULL, NULL, NULL);
 	pos = (const gchar *) locale_str;
 
@@ -1593,7 +1593,7 @@ has_correct_date (const struct tm *value)
 	g_return_val_if_fail (value != NULL, FALSE);
 	g_return_val_if_fail (value->tm_mon >= 0 && value->tm_mon < 12, FALSE);
 
-	year = value->tm_year  + 1900;
+	year = value->tm_year + 1900;
 	days = days_in_month[value->tm_mon];
 	if (value->tm_mon == 1 &&
 		((year <= 1752) ? (!(year % 4)) :
@@ -1744,7 +1744,7 @@ e_time_parse_date_and_time_ex (const gchar *value,
 			t = time (NULL);
 			today_tm = localtime (&t);
 			result->tm_mday = today_tm->tm_mday;
-			result->tm_mon  = today_tm->tm_mon;
+			result->tm_mon = today_tm->tm_mon;
 			result->tm_year = today_tm->tm_year;
 		}
 	}
diff --git a/modules/trust-prompt/e-asn1-object.c b/modules/trust-prompt/e-asn1-object.c
index c2d811b91..c74b6253b 100644
--- a/modules/trust-prompt/e-asn1-object.c
+++ b/modules/trust-prompt/e-asn1-object.c
@@ -347,7 +347,7 @@ process_subject_public_key_info (CERTSubjectPublicKeyInfo *spki,
 	 * let's convert the lenght into a temporary SECItem.
 	*/
 	data.data = spki->subjectPublicKey.data;
-	data.len  = spki->subjectPublicKey.len / 8;
+	data.len = spki->subjectPublicKey.len / 8;
 
 	process_raw_bytes (&data, &text);
 	printableItem = e_asn1_object_new ();
@@ -372,7 +372,7 @@ process_ns_cert_type_extensions (SECItem *extData,
 	guchar nsCertType;
 
 	decoded.data = NULL;
-	decoded.len  = 0;
+	decoded.len = 0;
 	if (SECSuccess != SEC_ASN1DecodeItem (NULL, &decoded,
 					     SEC_ASN1_GET (SEC_BitStringTemplate), extData)) {
 		g_string_append (text, _("Error: Unable to process extension"));
@@ -422,7 +422,7 @@ process_key_usage_extensions (SECItem *extData,
 	guchar keyUsage;
 
 	decoded.data = NULL;
-	decoded.len  = 0;
+	decoded.len = 0;
 	if (SECSuccess != SEC_ASN1DecodeItem (NULL, &decoded,
 					     SEC_ASN1_GET (SEC_BitStringTemplate), extData)) {
 		g_string_append (text, _("Error: Unable to process extension"));
@@ -731,7 +731,7 @@ create_tbs_certificate_asn1_struct (CERTCertificate *cert,
 		 * length in a temporary SECItem
 		*/
 		data.data = cert->issuerID.data;
-		data.len  = cert->issuerID.len / 8;
+		data.len = cert->issuerID.len / 8;
 
 		subitem = e_asn1_object_new ();
 
@@ -750,7 +750,7 @@ create_tbs_certificate_asn1_struct (CERTCertificate *cert,
 		 * length in a temporary SECItem
 		*/
 		data.data = cert->issuerID.data;
-		data.len  = cert->issuerID.len / 8;
+		data.len = cert->issuerID.len / 8;
 
 		subitem = e_asn1_object_new ();
 
@@ -822,7 +822,7 @@ fill_asn1_from_cert (EASN1Object *asn1,
 	 * length to be in bytes, so let's convert the
 	 * length in a temporary SECItem */
 	temp.data = cert->signatureWrap.signature.data;
-	temp.len  = cert->signatureWrap.signature.len / 8;
+	temp.len = cert->signatureWrap.signature.len / 8;
 	process_raw_bytes (&temp, &text);
 	e_asn1_object_set_display_value (sequence, text);
 	e_asn1_object_append_child (asn1, sequence);
diff --git a/modules/trust-prompt/e-asn1-object.h b/modules/trust-prompt/e-asn1-object.h
index 39b79a7b1..7bf838a71 100644
--- a/modules/trust-prompt/e-asn1-object.h
+++ b/modules/trust-prompt/e-asn1-object.h
@@ -41,29 +41,29 @@ enum {
 	/*
 	 *  Identifiers for the possible types of object.
 	 */
-	E_ASN1_OBJECT_TYPE_END_CONTENTS     = 0,
-	E_ASN1_OBJECT_TYPE_BOOLEAN          = 1,
-	E_ASN1_OBJECT_TYPE_INTEGER          = 2,
-	E_ASN1_OBJECT_TYPE_BIT_STRING       = 3,
-	E_ASN1_OBJECT_TYPE_OCTET_STRING     = 4,
-	E_ASN1_OBJECT_TYPE_NULL             = 5,
-	E_ASN1_OBJECT_TYPE_OBJECT_ID        = 6,
-	E_ASN1_OBJECT_TYPE_ENUMERATED       = 10,
-	E_ASN1_OBJECT_TYPE_UTF8_STRING      = 12,
-	E_ASN1_OBJECT_TYPE_SEQUENCE         = 16,
-	E_ASN1_OBJECT_TYPE_SET              = 17,
+	E_ASN1_OBJECT_TYPE_END_CONTENTS = 0,
+	E_ASN1_OBJECT_TYPE_BOOLEAN = 1,
+	E_ASN1_OBJECT_TYPE_INTEGER = 2,
+	E_ASN1_OBJECT_TYPE_BIT_STRING = 3,
+	E_ASN1_OBJECT_TYPE_OCTET_STRING = 4,
+	E_ASN1_OBJECT_TYPE_NULL = 5,
+	E_ASN1_OBJECT_TYPE_OBJECT_ID = 6,
+	E_ASN1_OBJECT_TYPE_ENUMERATED = 10,
+	E_ASN1_OBJECT_TYPE_UTF8_STRING = 12,
+	E_ASN1_OBJECT_TYPE_SEQUENCE = 16,
+	E_ASN1_OBJECT_TYPE_SET = 17,
 	E_ASN1_OBJECT_TYPE_PRINTABLE_STRING = 19,
-	E_ASN1_OBJECT_TYPE_T61_STRING       = 20,
-	E_ASN1_OBJECT_TYPE_IA5_STRING       = 22,
-	E_ASN1_OBJECT_TYPE_UTC_TIME         = 23,
-	E_ASN1_OBJECT_TYPE_GEN_TIME         = 24,
-	E_ASN1_OBJECT_TYPE_VISIBLE_STRING   = 26,
+	E_ASN1_OBJECT_TYPE_T61_STRING = 20,
+	E_ASN1_OBJECT_TYPE_IA5_STRING = 22,
+	E_ASN1_OBJECT_TYPE_UTC_TIME = 23,
+	E_ASN1_OBJECT_TYPE_GEN_TIME = 24,
+	E_ASN1_OBJECT_TYPE_VISIBLE_STRING = 26,
 	E_ASN1_OBJECT_TYPE_UNIVERSAL_STRING = 28,
-	E_ASN1_OBJECT_TYPE_BMP_STRING       = 30,
-	E_ASN1_OBJECT_TYPE_HIGH_TAG_NUMBER  = 31,
+	E_ASN1_OBJECT_TYPE_BMP_STRING = 30,
+	E_ASN1_OBJECT_TYPE_HIGH_TAG_NUMBER = 31,
 	E_ASN1_OBJECT_TYPE_CONTEXT_SPECIFIC = 32,
-	E_ASN1_OBJECT_TYPE_APPLICATION      = 33,
-	E_ASN1_OBJECT_TYPE_PRIVATE          = 34
+	E_ASN1_OBJECT_TYPE_APPLICATION = 33,
+	E_ASN1_OBJECT_TYPE_PRIVATE = 34
 };
 
 struct _EASN1Object {
diff --git a/services/evolution-source-registry/evolution-source-registry-migrate-sources.c b/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
index c207ee79d..603068867 100644
--- a/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
+++ b/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
@@ -404,7 +404,7 @@ migrate_parse_commit_changes (ParseType parse_type,
 	g_print (
 		"    Checking for old cache dir '%s'... %s\n",
 		old_directory,
-		old_directory_exists ?  "found" : "not found");
+		old_directory_exists ? "found" : "not found");
 
 	if (old_directory_exists) {
 		g_print (
@@ -448,7 +448,7 @@ migrate_parse_commit_changes (ParseType parse_type,
 	g_print (
 		"    Checking for old data dir '%s'... %s\n",
 		old_directory,
-		old_directory_exists ?  "found" : "not found");
+		old_directory_exists ? "found" : "not found");
 
 	if (old_directory_exists) {
 		g_print (
diff --git a/tests/libebook-contacts/test-untyped-phones.c b/tests/libebook-contacts/test-untyped-phones.c
index 828462b90..5aac8c1c0 100644
--- a/tests/libebook-contacts/test-untyped-phones.c
+++ b/tests/libebook-contacts/test-untyped-phones.c
@@ -4,13 +4,13 @@
 
 /* TEL;WORK:... should map to PHONE_BUSINESS
  * TEL;FAX:... should map to OTHER_FAX. */
-#define VCARD					\
-  "BEGIN:VCARD\n"				\
-  "FN:Janet Jackson\n"				\
-  "N:Janet\n"					\
-  "TEL;WORK:123-123-1234\n"			\
-  "TEL;VOICE:456-456-4567\n"			\
-  "TEL;FAX:321-321-4321\n"			\
+#define VCARD \
+  "BEGIN:VCARD\n" \
+  "FN:Janet Jackson\n" \
+  "N:Janet\n" \
+  "TEL;WORK:123-123-1234\n" \
+  "TEL;VOICE:456-456-4567\n" \
+  "TEL;FAX:321-321-4321\n" \
   "END:VCARD\n"
 
 static void
diff --git a/tests/libebook/client/test-client-custom-summary.c b/tests/libebook/client/test-client-custom-summary.c
index 70a619bfd..a6a0f1d1e 100644
--- a/tests/libebook/client/test-client-custom-summary.c
+++ b/tests/libebook/client/test-client-custom-summary.c
@@ -56,7 +56,7 @@ setup_custom_book (ESource *scratch,
 		0);
 }
 
-static ETestServerClosure setup_custom_closure  = { E_TEST_SERVER_ADDRESS_BOOK, setup_custom_book, 0, TRUE, NULL };
+static ETestServerClosure setup_custom_closure = { E_TEST_SERVER_ADDRESS_BOOK, setup_custom_book, 0, TRUE, NULL };
 static ETestServerClosure setup_default_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, TRUE, NULL };
 
 /* Define this macro to expect E_CLIENT_ERROR_NOT_SUPPORTED
@@ -181,8 +181,8 @@ setup_book (ClientTestFixture *fixture)
 		gchar *vcard;
 		EContact *contact;
 
-		vcard    = new_vcard_from_test_case (case_name);
-		contact  = e_contact_new_from_vcard (vcard);
+		vcard = new_vcard_from_test_case (case_name);
+		contact = e_contact_new_from_vcard (vcard);
 		contacts = g_slist_prepend (contacts, contact);
 		g_free (vcard);
 		g_free (case_name);
diff --git a/tests/libebook/client/test-client-e164-param.c b/tests/libebook/client/test-client-e164-param.c
index f96d5af6b..ccff37230 100644
--- a/tests/libebook/client/test-client-e164-param.c
+++ b/tests/libebook/client/test-client-e164-param.c
@@ -86,7 +86,7 @@ test_add_e164_param (ETestServerFixture *fixture,
 	book_client = E_TEST_SERVER_UTILS_SERVICE (fixture, EBookClient);
 	g_print ("%p\n", book_client);
 
-	vcard   = new_vcard_from_test_case (data->vcard_name);
+	vcard = new_vcard_from_test_case (data->vcard_name);
 	contact = e_contact_new_from_vcard (vcard);
 	g_free (vcard);
 
diff --git a/tests/libebook/client/test-client-photo-is-uri.c b/tests/libebook/client/test-client-photo-is-uri.c
index 1a0b33ca7..1ab7f706a 100644
--- a/tests/libebook/client/test-client-photo-is-uri.c
+++ b/tests/libebook/client/test-client-photo-is-uri.c
@@ -110,8 +110,8 @@ give_james_brown_micheal_jacksons_face (EBookClient *book)
 	micheal_face = e_contact_get (micheal, E_CONTACT_PHOTO);
 	g_assert (micheal_face->type == E_CONTACT_PHOTO_TYPE_URI);
 
-	james_face  = g_new (EContactPhoto, 1);
-	james_face->type     = E_CONTACT_PHOTO_TYPE_URI;
+	james_face = g_new (EContactPhoto, 1);
+	james_face->type = E_CONTACT_PHOTO_TYPE_URI;
 	james_face->data.uri = g_strdup (micheal_face->data.uri);
 
 	e_contact_set (james, E_CONTACT_PHOTO, james_face);
@@ -285,8 +285,8 @@ add_contact_uri (EBookClient *book)
 
 	contact = e_contact_new ();
 
-	photo           = g_new (EContactPhoto, 1);
-	photo->type     = E_CONTACT_PHOTO_TYPE_URI;
+	photo = g_new (EContactPhoto, 1);
+	photo->type = E_CONTACT_PHOTO_TYPE_URI;
 	photo->data.uri = g_strdup ("http://en.wikipedia.org/wiki/File:Jamesbrown4.jpg");
 
 	/* set the photo */
diff --git a/tests/libebook/client/test-client-preserve-uid.c b/tests/libebook/client/test-client-preserve-uid.c
index 6558b3dbf..6865cddff 100644
--- a/tests/libebook/client/test-client-preserve-uid.c
+++ b/tests/libebook/client/test-client-preserve-uid.c
@@ -41,7 +41,7 @@ test_preserve_uid (ETestServerFixture *fixture,
 
 	book_client = E_TEST_SERVER_UTILS_SERVICE (fixture, EBookClient);
 
-	vcard   = new_vcard_from_test_case ("simple-1");
+	vcard = new_vcard_from_test_case ("simple-1");
 	contact = e_contact_new_from_vcard (vcard);
 	g_free (vcard);
 
@@ -69,7 +69,7 @@ test_uid_conflict (ETestServerFixture *fixture,
 	/* Hijack the first test case, ensure we already have the contact added */
 	test_preserve_uid (fixture, user_data);
 
-	vcard   = new_vcard_from_test_case ("simple-2");
+	vcard = new_vcard_from_test_case ("simple-2");
 	contact = e_contact_new_from_vcard (vcard);
 	g_free (vcard);
 
diff --git a/tests/libebook/client/test-client-revision-view.c b/tests/libebook/client/test-client-revision-view.c
index 88a72ec70..f5f24bd8e 100644
--- a/tests/libebook/client/test-client-revision-view.c
+++ b/tests/libebook/client/test-client-revision-view.c
@@ -36,7 +36,7 @@ setup_book (EBookClient *book_client)
 	for (i = 0; i < N_TEST_CONTACTS; i++)
 	{
 		EContact *contact = e_contact_new ();
-		gchar    *name      = g_strdup_printf ("Contact #%d", i + 1);
+		gchar    *name = g_strdup_printf ("Contact #%d", i + 1);
 
 		e_contact_set (contact, E_CONTACT_FULL_NAME, name);
 		e_contact_set (contact, E_CONTACT_NICKNAME, name);
diff --git a/tests/libebook/client/test-client-uid-only-view.c b/tests/libebook/client/test-client-uid-only-view.c
index a989c4e24..c122f0e8c 100644
--- a/tests/libebook/client/test-client-uid-only-view.c
+++ b/tests/libebook/client/test-client-uid-only-view.c
@@ -24,7 +24,7 @@ static UIDOnlyClosure book_closure_uids_only = { { E_TEST_SERVER_ADDRESS_BOOK, N
 #  define SETUP_TIMER(timer)  GTimer *timer = g_timer_new ();
 #  define START_TIMER(timer)  g_timer_start (timer);
 #  define STOP_TIMER(timer)   g_timer_stop (timer);
-#  define PRINT_TIMER(timer, activity)  \
+#  define PRINT_TIMER(timer, activity) \
 	printf ("%s finished in %02.6f seconds\n", activity, g_timer_elapsed (timer, NULL));
 #else
 #  define SETUP_TIMER(timer)
@@ -34,7 +34,7 @@ static UIDOnlyClosure book_closure_uids_only = { { E_TEST_SERVER_ADDRESS_BOOK, N
 #endif
 
 static gboolean loading_view = FALSE;
-static gboolean uids_only    = FALSE;
+static gboolean uids_only = FALSE;
 
 /****************************************************************
  *                     Modify/Setup the EBook                   *
@@ -60,7 +60,7 @@ setup_book (EBookClient *book_client)
 	for (i = 0; i < N_TEST_CONTACTS; i++)
 	{
 		EContact *contact = e_contact_new ();
-		gchar    *name      = g_strdup_printf ("Contact #%d", i + 1);
+		gchar    *name = g_strdup_printf ("Contact #%d", i + 1);
 		gchar    *emails[5] = {
 			g_strdup_printf ("contact%d@first.email.com", i),
 			g_strdup_printf ("contact%d@second.email.com", i),
diff --git a/tests/libebook/client/test-client-view-operations.c b/tests/libebook/client/test-client-view-operations.c
index 54699d55c..886f7136b 100644
--- a/tests/libebook/client/test-client-view-operations.c
+++ b/tests/libebook/client/test-client-view-operations.c
@@ -166,7 +166,7 @@ test_view_thread_async (ThreadData *data)
 	ESource         *source;
 	GError          *error = NULL;
 
-	context    = g_main_context_new ();
+	context = g_main_context_new ();
 	data->loop = g_main_loop_new (context, FALSE);
 	g_main_context_push_thread_default (context);
 
@@ -250,7 +250,7 @@ test_view_thread_sync (ThreadData *data)
 	ESource         *source;
 	GError          *error = NULL;
 
-	context    = g_main_context_new ();
+	context = g_main_context_new ();
 	data->loop = g_main_loop_new (context, FALSE);
 	g_main_context_push_thread_default (context);
 
@@ -293,8 +293,8 @@ create_test_thread (const gchar *book_uid,
 {
 	ThreadData  *data = g_slice_new0 (ThreadData);
 
-	data->book_uid    = book_uid;
-	data->closure     = (ETestServerClosure *) user_data;
+	data->book_uid = book_uid;
+	data->closure = (ETestServerClosure *) user_data;
 
 	g_mutex_init (&data->complete_mutex);
 	g_cond_init (&data->complete_cond);
diff --git a/tests/libebook/client/test-client-write-write.c b/tests/libebook/client/test-client-write-write.c
index 442530275..7d188ce49 100644
--- a/tests/libebook/client/test-client-write-write.c
+++ b/tests/libebook/client/test-client-write-write.c
@@ -189,7 +189,7 @@ test_write_thread (ThreadData *data)
 	ESource         *source;
 	GError          *error = NULL;
 
-	context    = g_main_context_new ();
+	context = g_main_context_new ();
 	data->loop = g_main_loop_new (context, FALSE);
 	g_main_context_push_thread_default (context);
 
@@ -233,10 +233,10 @@ create_test_thread (const gchar *book_uid,
 	ThreadData  *data = g_slice_new0 (ThreadData);
 	const gchar *name = e_contact_field_name (field);
 
-	data->book_uid    = book_uid;
+	data->book_uid = book_uid;
 	data->contact_uid = contact_uid;
-	data->field       = field;
-	data->value       = value;
+	data->field = field;
+	data->value = value;
 
 	data->thread = g_thread_new (name, (GThreadFunc) test_write_thread, data);
 
diff --git a/tests/libebook/test-ebook-commit-contact.c b/tests/libebook/test-ebook-commit-contact.c
index 5f05a0180..21b6c2b06 100644
--- a/tests/libebook/test-ebook-commit-contact.c
+++ b/tests/libebook/test-ebook-commit-contact.c
@@ -13,7 +13,7 @@ static ETestServerClosure book_closure =
 
 /* Global data */
 static EBook *book = NULL;
-static gchar *uid  = NULL;
+static gchar *uid = NULL;
 
 static void
 verify_precommit_and_prepare_contact (EContact *contact)
diff --git a/tests/libecal/client/test-client-revision-view.c b/tests/libecal/client/test-client-revision-view.c
index 396298b3e..bd63bb397 100644
--- a/tests/libecal/client/test-client-revision-view.c
+++ b/tests/libecal/client/test-client-revision-view.c
@@ -59,8 +59,8 @@ objects_added_cb (GObject *object,
 	GMainLoop *loop = (GMainLoop *) data;
 
 	for (l = objects; l; l = l->next) {
-		icalcomponent      *component     = l->data;
-		struct icaltimetype recurrence    = icalcomponent_get_recurrenceid (component);
+		icalcomponent      *component = l->data;
+		struct icaltimetype recurrence = icalcomponent_get_recurrenceid (component);
 		struct icaltimetype last_modified = get_last_modified (component);
 
 		g_print (
@@ -84,8 +84,8 @@ objects_modified_cb (GObject *object,
 	GMainLoop *loop = (GMainLoop *) data;
 
 	for (l = objects; l; l = l->next) {
-		icalcomponent      *component     = l->data;
-		struct icaltimetype recurrence    = icalcomponent_get_recurrenceid (component);
+		icalcomponent      *component = l->data;
+		struct icaltimetype recurrence = icalcomponent_get_recurrenceid (component);
 		struct icaltimetype last_modified = get_last_modified (component);
 
 		g_print (
diff --git a/tests/test-server-utils/e-test-server-utils.c b/tests/test-server-utils/e-test-server-utils.c
index 45ecbd432..a31bb6145 100644
--- a/tests/test-server-utils/e-test-server-utils.c
+++ b/tests/test-server-utils/e-test-server-utils.c
@@ -324,7 +324,7 @@ e_test_server_utils_setup (ETestServerFixture *fixture,
                            gconstpointer user_data)
 {
 	ETestServerClosure *closure = (ETestServerClosure *) user_data;
-	FixturePair         pair    = { fixture, closure };
+	FixturePair         pair = { fixture, closure };
 
 	/* Create work directory */
 	g_assert (g_mkdir_with_parents (EDS_TEST_WORK_DIR, 0755) == 0);
diff --git a/tests/test-server-utils/test-fixture.c b/tests/test-server-utils/test-fixture.c
index e9760631f..db91cdefb 100644
--- a/tests/test-server-utils/test-fixture.c
+++ b/tests/test-server-utils/test-fixture.c
@@ -25,9 +25,9 @@
 #define N_CYCLES 10
 
 static ETestServerClosure registry_closure = { E_TEST_SERVER_NONE, NULL, 0 };
-static ETestServerClosure book_closure     = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 };
+static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 };
 static ETestServerClosure calendar_closure = { E_TEST_SERVER_CALENDAR, NULL, E_CAL_CLIENT_SOURCE_TYPE_EVENTS };
-static ETestServerClosure deprecated_book_closure     = { E_TEST_SERVER_DEPRECATED_ADDRESS_BOOK, NULL, 0 };
+static ETestServerClosure deprecated_book_closure = { E_TEST_SERVER_DEPRECATED_ADDRESS_BOOK, NULL, 0 };
 static ETestServerClosure deprecated_calendar_closure = { E_TEST_SERVER_DEPRECATED_CALENDAR, NULL, E_CAL_SOURCE_TYPE_EVENT };
 
 static void