Miscellaneous cleanups.

23 files changed, 104 insertions, 104 deletions

diff --git a/modules/addressbook/e-book-shell-content.c b/modules/addressbook/e-book-shell-content.c
index 2802e8e14b..b92930d2b9 100644
--- a/modules/addressbook/e-book-shell-content.c
+++ b/modules/addressbook/e-book-shell-content.c
@@ -41,7 +41,7 @@ struct _EBookShellContentPrivate {
 	GtkOrientation orientation;
 
 	gboolean preview_show_maps;
-	guint preview_visible	: 1;
+	guint preview_visible : 1;
 };
 
 enum {
diff --git a/modules/addressbook/e-book-shell-content.h b/modules/addressbook/e-book-shell-content.h
index 5eabd0670c..0fbbf38898 100644
--- a/modules/addressbook/e-book-shell-content.h
+++ b/modules/addressbook/e-book-shell-content.h
@@ -56,12 +56,12 @@ typedef struct _EBookShellContentClass EBookShellContentClass;
 typedef struct _EBookShellContentPrivate EBookShellContentPrivate;
 
 enum {
-	E_BOOK_SHELL_CONTENT_SELECTION_SINGLE		= 1 << 0,
-	E_BOOK_SHELL_CONTENT_SELECTION_MULTIPLE		= 1 << 1,
-	E_BOOK_SHELL_CONTENT_SELECTION_HAS_EMAIL	= 1 << 2,
-	E_BOOK_SHELL_CONTENT_SELECTION_IS_CONTACT_LIST	= 1 << 3,
-	E_BOOK_SHELL_CONTENT_SOURCE_IS_BUSY		= 1 << 4,
-	E_BOOK_SHELL_CONTENT_SOURCE_IS_EDITABLE		= 1 << 5
+	E_BOOK_SHELL_CONTENT_SELECTION_SINGLE = 1 << 0,
+	E_BOOK_SHELL_CONTENT_SELECTION_MULTIPLE = 1 << 1,
+	E_BOOK_SHELL_CONTENT_SELECTION_HAS_EMAIL = 1 << 2,
+	E_BOOK_SHELL_CONTENT_SELECTION_IS_CONTACT_LIST = 1 << 3,
+	E_BOOK_SHELL_CONTENT_SOURCE_IS_BUSY = 1 << 4,
+	E_BOOK_SHELL_CONTENT_SOURCE_IS_EDITABLE = 1 << 5
 };
 
 struct _EBookShellContent {
diff --git a/modules/addressbook/e-book-shell-sidebar.h b/modules/addressbook/e-book-shell-sidebar.h
index c0007a7617..75f999cff7 100644
--- a/modules/addressbook/e-book-shell-sidebar.h
+++ b/modules/addressbook/e-book-shell-sidebar.h
@@ -50,13 +50,13 @@ typedef struct _EBookShellSidebarClass EBookShellSidebarClass;
 typedef struct _EBookShellSidebarPrivate EBookShellSidebarPrivate;
 
 enum {
-	E_BOOK_SHELL_SIDEBAR_HAS_PRIMARY_SOURCE			= 1 << 0,
-	E_BOOK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_WRITABLE		= 1 << 1,
-	E_BOOK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOVABLE	= 1 << 2,
-	E_BOOK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_CREATABLE	= 1 << 3,
-	E_BOOK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_DELETABLE	= 1 << 4,
-	E_BOOK_SHELL_SIDEBAR_PRIMARY_SOURCE_IN_COLLECTION	= 1 << 5,
-	E_BOOK_SHELL_SIDEBAR_SOURCE_SUPPORTS_REFRESH		= 1 << 6
+	E_BOOK_SHELL_SIDEBAR_HAS_PRIMARY_SOURCE = 1 << 0,
+	E_BOOK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_WRITABLE = 1 << 1,
+	E_BOOK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOVABLE = 1 << 2,
+	E_BOOK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_CREATABLE = 1 << 3,
+	E_BOOK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_DELETABLE = 1 << 4,
+	E_BOOK_SHELL_SIDEBAR_PRIMARY_SOURCE_IN_COLLECTION = 1 << 5,
+	E_BOOK_SHELL_SIDEBAR_SOURCE_SUPPORTS_REFRESH = 1 << 6
 };
 
 struct _EBookShellSidebar {
diff --git a/modules/addressbook/e-book-shell-view-private.h b/modules/addressbook/e-book-shell-view-private.h
index ba11ee1460..a7d943b868 100644
--- a/modules/addressbook/e-book-shell-view-private.h
+++ b/modules/addressbook/e-book-shell-view-private.h
@@ -65,7 +65,7 @@ G_BEGIN_DECLS
  * Positive values are reserved for categories. */
 enum {
 	CONTACT_FILTER_ANY_CATEGORY = -2,
-	CONTACT_FILTER_UNMATCHED    = -1
+	CONTACT_FILTER_UNMATCHED = -1
 };
 
 /* List these in the order to be displayed. */
diff --git a/modules/backup-restore/e-mail-config-restore-page.c b/modules/backup-restore/e-mail-config-restore-page.c
index e39c2dfe8c..4751a2e0a8 100644
--- a/modules/backup-restore/e-mail-config-restore-page.c
+++ b/modules/backup-restore/e-mail-config-restore-page.c
@@ -359,7 +359,7 @@ evolution_backup_restore_validate_backup_file (const gchar *filename)
 	quotedfname = g_shell_quote (filename);
 	toolfname = g_build_filename (basedir, "evolution-backup", NULL);
 
-	command =  g_strdup_printf ("%s --check %s", toolfname, quotedfname);
+	command = g_strdup_printf ("%s --check %s", toolfname, quotedfname);
 	result = system (command);
 
 	g_free (command);
diff --git a/modules/backup-restore/evolution-backup-restore.c b/modules/backup-restore/evolution-backup-restore.c
index 88f1e71b07..12a11193e6 100644
--- a/modules/backup-restore/evolution-backup-restore.c
+++ b/modules/backup-restore/evolution-backup-restore.c
@@ -86,7 +86,7 @@ G_DEFINE_DYNAMIC_TYPE (
 	E_TYPE_EXTENSION)
 
 enum {
-	BR_OK    = 1 << 0,
+	BR_OK = 1 << 0,
 	BR_START = 1 << 1
 };
 
diff --git a/modules/backup-restore/evolution-backup-tool.c b/modules/backup-restore/evolution-backup-tool.c
index 65e525c696..4b75f8a790 100644
--- a/modules/backup-restore/evolution-backup-tool.c
+++ b/modules/backup-restore/evolution-backup-tool.c
@@ -166,11 +166,11 @@ replace_variables (const gchar *str,
 	strip_datadir = strip_home_dir (e_get_user_data_dir ());
 	strip_configdir = strip_home_dir (e_get_user_config_dir ());
 
-	#define repl(_find, _replace)						\
-		use = replace_string (res ? res->str : str, _find, _replace);	\
-		g_return_val_if_fail (use != NULL, NULL);			\
-		if (res)							\
-			g_string_free (res, TRUE);				\
+	#define repl(_find, _replace) \
+		use = replace_string (res ? res->str : str, _find, _replace); \
+		g_return_val_if_fail (use != NULL, NULL); \
+		if (res) \
+			g_string_free (res, TRUE); \
 		res = use;
 
 	repl ("$HOME", g_get_home_dir ());
diff --git a/modules/cal-config-caldav/e-caldav-chooser.c b/modules/cal-config-caldav/e-caldav-chooser.c
index 2c4f4110b5..c0a96ec183 100644
--- a/modules/cal-config-caldav/e-caldav-chooser.c
+++ b/modules/cal-config-caldav/e-caldav-chooser.c
@@ -78,10 +78,10 @@ enum {
 };
 
 typedef enum {
-	SUPPORTS_VEVENT   = 1 << 0,
-	SUPPORTS_VTODO    = 1 << 1,
+	SUPPORTS_VEVENT = 1 << 0,
+	SUPPORTS_VTODO = 1 << 1,
 	SUPPORTS_VJOURNAL = 1 << 2,
-	SUPPORTS_ALL      = 0x7
+	SUPPORTS_ALL = 0x7
 } SupportedComponentSet;
 
 enum {
diff --git a/modules/calendar/e-cal-shell-content.h b/modules/calendar/e-cal-shell-content.h
index d5aabd8d1e..489d8b69c0 100644
--- a/modules/calendar/e-cal-shell-content.h
+++ b/modules/calendar/e-cal-shell-content.h
@@ -55,14 +55,14 @@ typedef struct _ECalShellContentClass ECalShellContentClass;
 typedef struct _ECalShellContentPrivate ECalShellContentPrivate;
 
 enum {
-	E_CAL_SHELL_CONTENT_SELECTION_SINGLE		= 1 << 0,
-	E_CAL_SHELL_CONTENT_SELECTION_MULTIPLE		= 1 << 1,
-	E_CAL_SHELL_CONTENT_SELECTION_IS_EDITABLE	= 1 << 2,
-	E_CAL_SHELL_CONTENT_SELECTION_IS_INSTANCE	= 1 << 3,
-	E_CAL_SHELL_CONTENT_SELECTION_IS_MEETING	= 1 << 4,
-	E_CAL_SHELL_CONTENT_SELECTION_IS_ORGANIZER	= 1 << 5,
-	E_CAL_SHELL_CONTENT_SELECTION_IS_RECURRING	= 1 << 6,
-	E_CAL_SHELL_CONTENT_SELECTION_CAN_DELEGATE	= 1 << 7
+	E_CAL_SHELL_CONTENT_SELECTION_SINGLE = 1 << 0,
+	E_CAL_SHELL_CONTENT_SELECTION_MULTIPLE = 1 << 1,
+	E_CAL_SHELL_CONTENT_SELECTION_IS_EDITABLE = 1 << 2,
+	E_CAL_SHELL_CONTENT_SELECTION_IS_INSTANCE = 1 << 3,
+	E_CAL_SHELL_CONTENT_SELECTION_IS_MEETING = 1 << 4,
+	E_CAL_SHELL_CONTENT_SELECTION_IS_ORGANIZER = 1 << 5,
+	E_CAL_SHELL_CONTENT_SELECTION_IS_RECURRING = 1 << 6,
+	E_CAL_SHELL_CONTENT_SELECTION_CAN_DELEGATE = 1 << 7
 };
 
 struct _ECalShellContent {
diff --git a/modules/calendar/e-cal-shell-sidebar.h b/modules/calendar/e-cal-shell-sidebar.h
index a243245d3a..f927aa7a69 100644
--- a/modules/calendar/e-cal-shell-sidebar.h
+++ b/modules/calendar/e-cal-shell-sidebar.h
@@ -52,13 +52,13 @@ typedef struct _ECalShellSidebarClass ECalShellSidebarClass;
 typedef struct _ECalShellSidebarPrivate ECalShellSidebarPrivate;
 
 enum {
-	E_CAL_SHELL_SIDEBAR_HAS_PRIMARY_SOURCE			= 1 << 0,
-	E_CAL_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_WRITABLE		= 1 << 1,
-	E_CAL_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOVABLE		= 1 << 2,
-	E_CAL_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_CREATABLE	= 1 << 3,
-	E_CAL_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_DELETABLE	= 1 << 4,
-	E_CAL_SHELL_SIDEBAR_PRIMARY_SOURCE_IN_COLLECTION	= 1 << 5,
-	E_CAL_SHELL_SIDEBAR_SOURCE_SUPPORTS_REFRESH		= 1 << 6
+	E_CAL_SHELL_SIDEBAR_HAS_PRIMARY_SOURCE = 1 << 0,
+	E_CAL_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_WRITABLE = 1 << 1,
+	E_CAL_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOVABLE = 1 << 2,
+	E_CAL_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_CREATABLE = 1 << 3,
+	E_CAL_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_DELETABLE = 1 << 4,
+	E_CAL_SHELL_SIDEBAR_PRIMARY_SOURCE_IN_COLLECTION = 1 << 5,
+	E_CAL_SHELL_SIDEBAR_SOURCE_SUPPORTS_REFRESH = 1 << 6
 };
 
 struct _ECalShellSidebar {
diff --git a/modules/calendar/e-cal-shell-view-private.h b/modules/calendar/e-cal-shell-view-private.h
index e9da71050d..d0c29c6319 100644
--- a/modules/calendar/e-cal-shell-view-private.h
+++ b/modules/calendar/e-cal-shell-view-private.h
@@ -70,11 +70,11 @@ G_BEGIN_DECLS
 /* Filter items are displayed in ascending order.
  * Non-negative values are reserved for categories. */
 enum {
-	CALENDAR_FILTER_ANY_CATEGORY			= -5,
-	CALENDAR_FILTER_UNMATCHED			= -4,
-	CALENDAR_FILTER_ACTIVE_APPOINTMENTS		= -3,
-	CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS	= -2,
-	CALENDAR_FILTER_OCCURS_LESS_THAN_5_TIMES	= -1
+	CALENDAR_FILTER_ANY_CATEGORY = -5,
+	CALENDAR_FILTER_UNMATCHED = -4,
+	CALENDAR_FILTER_ACTIVE_APPOINTMENTS = -3,
+	CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS = -2,
+	CALENDAR_FILTER_OCCURS_LESS_THAN_5_TIMES = -1
 };
 
 /* Search items are displayed in ascending order. */
diff --git a/modules/calendar/e-memo-shell-content.c b/modules/calendar/e-memo-shell-content.c
index dca724df13..95be0dc7db 100644
--- a/modules/calendar/e-memo-shell-content.c
+++ b/modules/calendar/e-memo-shell-content.c
@@ -47,7 +47,7 @@ struct _EMemoShellContentPrivate {
 
 	gchar *current_uid;
 
-	guint preview_visible	: 1;
+	guint preview_visible : 1;
 };
 
 enum {
diff --git a/modules/calendar/e-memo-shell-content.h b/modules/calendar/e-memo-shell-content.h
index 7e5dfc2a32..d283e9e8be 100644
--- a/modules/calendar/e-memo-shell-content.h
+++ b/modules/calendar/e-memo-shell-content.h
@@ -53,10 +53,10 @@ typedef struct _EMemoShellContentClass EMemoShellContentClass;
 typedef struct _EMemoShellContentPrivate EMemoShellContentPrivate;
 
 enum {
-	E_MEMO_SHELL_CONTENT_SELECTION_SINGLE		= 1 << 0,
-	E_MEMO_SHELL_CONTENT_SELECTION_MULTIPLE		= 1 << 1,
-	E_MEMO_SHELL_CONTENT_SELECTION_CAN_EDIT		= 1 << 2,
-	E_MEMO_SHELL_CONTENT_SELECTION_HAS_URL		= 1 << 3
+	E_MEMO_SHELL_CONTENT_SELECTION_SINGLE = 1 << 0,
+	E_MEMO_SHELL_CONTENT_SELECTION_MULTIPLE = 1 << 1,
+	E_MEMO_SHELL_CONTENT_SELECTION_CAN_EDIT = 1 << 2,
+	E_MEMO_SHELL_CONTENT_SELECTION_HAS_URL = 1 << 3
 };
 
 struct _EMemoShellContent {
diff --git a/modules/calendar/e-memo-shell-sidebar.h b/modules/calendar/e-memo-shell-sidebar.h
index 6fc7336845..bbc84b6476 100644
--- a/modules/calendar/e-memo-shell-sidebar.h
+++ b/modules/calendar/e-memo-shell-sidebar.h
@@ -52,13 +52,13 @@ typedef struct _EMemoShellSidebarClass EMemoShellSidebarClass;
 typedef struct _EMemoShellSidebarPrivate EMemoShellSidebarPrivate;
 
 enum {
-	E_MEMO_SHELL_SIDEBAR_HAS_PRIMARY_SOURCE			= 1 << 0,
-	E_MEMO_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_WRITABLE		= 1 << 1,
-	E_MEMO_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOVABLE	= 1 << 2,
-	E_MEMO_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_CREATABLE	= 1 << 3,
-	E_MEMO_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_DELETABLE	= 1 << 4,
-	E_MEMO_SHELL_SIDEBAR_PRIMARY_SOURCE_IN_COLLECTION	= 1 << 5,
-	E_MEMO_SHELL_SIDEBAR_SOURCE_SUPPORTS_REFRESH		= 1 << 6
+	E_MEMO_SHELL_SIDEBAR_HAS_PRIMARY_SOURCE = 1 << 0,
+	E_MEMO_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_WRITABLE = 1 << 1,
+	E_MEMO_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOVABLE = 1 << 2,
+	E_MEMO_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_CREATABLE = 1 << 3,
+	E_MEMO_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_DELETABLE = 1 << 4,
+	E_MEMO_SHELL_SIDEBAR_PRIMARY_SOURCE_IN_COLLECTION = 1 << 5,
+	E_MEMO_SHELL_SIDEBAR_SOURCE_SUPPORTS_REFRESH = 1 << 6
 };
 
 struct _EMemoShellSidebar {
diff --git a/modules/calendar/e-memo-shell-view-private.h b/modules/calendar/e-memo-shell-view-private.h
index be02336dc5..c1f5463382 100644
--- a/modules/calendar/e-memo-shell-view-private.h
+++ b/modules/calendar/e-memo-shell-view-private.h
@@ -58,8 +58,8 @@ G_BEGIN_DECLS
 /* Filter items are displayed in ascending order.
  * Non-negative values are reserved for categories. */
 enum {
-	MEMO_FILTER_ANY_CATEGORY	= -2,
-	MEMO_FILTER_UNMATCHED		= -1
+	MEMO_FILTER_ANY_CATEGORY = -2,
+	MEMO_FILTER_UNMATCHED = -1
 };
 
 /* Search items are displayed in ascending order. */
diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c
index 66f5ec248a..a7c2981849 100644
--- a/modules/calendar/e-task-shell-content.c
+++ b/modules/calendar/e-task-shell-content.c
@@ -46,7 +46,7 @@ struct _ETaskShellContentPrivate {
 
 	gchar *current_uid;
 
-	guint preview_visible	: 1;
+	guint preview_visible : 1;
 };
 
 enum {
diff --git a/modules/calendar/e-task-shell-content.h b/modules/calendar/e-task-shell-content.h
index 9b3ab6cb86..bc02302ce6 100644
--- a/modules/calendar/e-task-shell-content.h
+++ b/modules/calendar/e-task-shell-content.h
@@ -54,13 +54,13 @@ typedef struct _ETaskShellContentClass ETaskShellContentClass;
 typedef struct _ETaskShellContentPrivate ETaskShellContentPrivate;
 
 enum {
-	E_TASK_SHELL_CONTENT_SELECTION_SINGLE		= 1 << 0,
-	E_TASK_SHELL_CONTENT_SELECTION_MULTIPLE		= 1 << 1,
-	E_TASK_SHELL_CONTENT_SELECTION_CAN_ASSIGN	= 1 << 2,
-	E_TASK_SHELL_CONTENT_SELECTION_CAN_EDIT		= 1 << 3,
-	E_TASK_SHELL_CONTENT_SELECTION_HAS_COMPLETE	= 1 << 4,
-	E_TASK_SHELL_CONTENT_SELECTION_HAS_INCOMPLETE	= 1 << 5,
-	E_TASK_SHELL_CONTENT_SELECTION_HAS_URL		= 1 << 6
+	E_TASK_SHELL_CONTENT_SELECTION_SINGLE = 1 << 0,
+	E_TASK_SHELL_CONTENT_SELECTION_MULTIPLE = 1 << 1,
+	E_TASK_SHELL_CONTENT_SELECTION_CAN_ASSIGN = 1 << 2,
+	E_TASK_SHELL_CONTENT_SELECTION_CAN_EDIT = 1 << 3,
+	E_TASK_SHELL_CONTENT_SELECTION_HAS_COMPLETE = 1 << 4,
+	E_TASK_SHELL_CONTENT_SELECTION_HAS_INCOMPLETE = 1 << 5,
+	E_TASK_SHELL_CONTENT_SELECTION_HAS_URL = 1 << 6
 };
 
 struct _ETaskShellContent {
diff --git a/modules/calendar/e-task-shell-sidebar.h b/modules/calendar/e-task-shell-sidebar.h
index 0196d1f2ea..ccb4c9d6cd 100644
--- a/modules/calendar/e-task-shell-sidebar.h
+++ b/modules/calendar/e-task-shell-sidebar.h
@@ -52,13 +52,13 @@ typedef struct _ETaskShellSidebarClass ETaskShellSidebarClass;
 typedef struct _ETaskShellSidebarPrivate ETaskShellSidebarPrivate;
 
 enum {
-	E_TASK_SHELL_SIDEBAR_HAS_PRIMARY_SOURCE			= 1 << 0,
-	E_TASK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_WRITABLE		= 1 << 1,
-	E_TASK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOVABLE	= 1 << 2,
-	E_TASK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_CREATABLE	= 1 << 3,
+	E_TASK_SHELL_SIDEBAR_HAS_PRIMARY_SOURCE = 1 << 0,
+	E_TASK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_WRITABLE = 1 << 1,
+	E_TASK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOVABLE = 1 << 2,
+	E_TASK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_CREATABLE = 1 << 3,
 	E_TASK_SHELL_SIDEBAR_PRIMARY_SOURCE_IS_REMOTE_DELETABLE = 1 << 4,
-	E_TASK_SHELL_SIDEBAR_PRIMARY_SOURCE_IN_COLLECTION	= 1 << 5,
-	E_TASK_SHELL_SIDEBAR_SOURCE_SUPPORTS_REFRESH		= 1 << 6
+	E_TASK_SHELL_SIDEBAR_PRIMARY_SOURCE_IN_COLLECTION = 1 << 5,
+	E_TASK_SHELL_SIDEBAR_SOURCE_SUPPORTS_REFRESH = 1 << 6
 };
 
 struct _ETaskShellSidebar {
diff --git a/modules/calendar/e-task-shell-view-private.h b/modules/calendar/e-task-shell-view-private.h
index 5e39dda8c7..b2a1511c9a 100644
--- a/modules/calendar/e-task-shell-view-private.h
+++ b/modules/calendar/e-task-shell-view-private.h
@@ -61,13 +61,13 @@ G_BEGIN_DECLS
 /* Filter items are displayed in ascending order.
  * Non-negative values are reserved for categories. */
 enum {
-	TASK_FILTER_ANY_CATEGORY		= -7,
-	TASK_FILTER_UNMATCHED			= -6,
-	TASK_FILTER_NEXT_7_DAYS_TASKS		= -5,
-	TASK_FILTER_ACTIVE_TASKS		= -4,
-	TASK_FILTER_OVERDUE_TASKS		= -3,
-	TASK_FILTER_COMPLETED_TASKS		= -2,
-	TASK_FILTER_TASKS_WITH_ATTACHMENTS	= -1
+	TASK_FILTER_ANY_CATEGORY = -7,
+	TASK_FILTER_UNMATCHED = -6,
+	TASK_FILTER_NEXT_7_DAYS_TASKS = -5,
+	TASK_FILTER_ACTIVE_TASKS = -4,
+	TASK_FILTER_OVERDUE_TASKS = -3,
+	TASK_FILTER_COMPLETED_TASKS = -2,
+	TASK_FILTER_TASKS_WITH_ATTACHMENTS = -1
 };
 
 /* Search items are displayed in ascending order. */
diff --git a/modules/itip-formatter/itip-view.c b/modules/itip-formatter/itip-view.c
index 8ef8f81c17..f19c418923 100644
--- a/modules/itip-formatter/itip-view.c
+++ b/modules/itip-formatter/itip-view.c
@@ -3799,7 +3799,7 @@ find_cal_update_ui (FormatItipFindData *fd,
 		 * Replies only make sense for events with an organizer.
 		 */
 		if ((!pitip->current_client || !e_cal_client_check_save_schedules (pitip->current_client)) &&
-		    (pitip->method == ICAL_METHOD_PUBLISH || pitip->method ==  ICAL_METHOD_REQUEST) &&
+		    (pitip->method == ICAL_METHOD_PUBLISH || pitip->method == ICAL_METHOD_REQUEST) &&
 		    pitip->has_organizer) {
 			rsvp_enabled = TRUE;
 		}
@@ -3859,7 +3859,7 @@ decrease_find_data (FormatItipFindData *fd)
 		 * Replies only make sense for events with an organizer.
 		 */
 		if ((!pitip->current_client || !e_cal_client_check_save_schedules (pitip->current_client)) &&
-		    (pitip->method == ICAL_METHOD_PUBLISH || pitip->method ==  ICAL_METHOD_REQUEST) &&
+		    (pitip->method == ICAL_METHOD_PUBLISH || pitip->method == ICAL_METHOD_REQUEST) &&
 		    pitip->has_organizer) {
 			rsvp_enabled = TRUE;
 		}
@@ -3868,7 +3868,7 @@ decrease_find_data (FormatItipFindData *fd)
 		/* default is chosen in extract_itip_data() based on content of the VEVENT */
 		itip_view_set_rsvp (view, !pitip->no_reply_wanted);
 
-		if ((pitip->method == ICAL_METHOD_PUBLISH || pitip->method ==  ICAL_METHOD_REQUEST)
+		if ((pitip->method == ICAL_METHOD_PUBLISH || pitip->method == ICAL_METHOD_REQUEST)
 		    && !pitip->current_client) {
 			/* Reuse already declared one or rename? */
 			ESource *source = NULL;
@@ -3970,7 +3970,7 @@ get_object_without_rid_ready_cb (GObject *source_object,
 		ECalComponent *comp;
 
 		fd->puri->current_client = cal_client;
-		fd->keep_alarm_check = (fd->puri->method == ICAL_METHOD_PUBLISH || fd->puri->method ==  ICAL_METHOD_REQUEST) &&
+		fd->keep_alarm_check = (fd->puri->method == ICAL_METHOD_PUBLISH || fd->puri->method == ICAL_METHOD_REQUEST) &&
 			(icalcomponent_get_first_component (icalcomp, ICAL_VALARM_COMPONENT) ||
 			icalcomponent_get_first_component (icalcomp, ICAL_XAUDIOALARM_COMPONENT) ||
 			icalcomponent_get_first_component (icalcomp, ICAL_XDISPLAYALARM_COMPONENT) ||
@@ -4019,7 +4019,7 @@ get_object_with_rid_ready_cb (GObject *source_object,
 		ECalComponent *comp;
 
 		fd->puri->current_client = cal_client;
-		fd->keep_alarm_check = (fd->puri->method == ICAL_METHOD_PUBLISH || fd->puri->method ==  ICAL_METHOD_REQUEST) &&
+		fd->keep_alarm_check = (fd->puri->method == ICAL_METHOD_PUBLISH || fd->puri->method == ICAL_METHOD_REQUEST) &&
 			(icalcomponent_get_first_component (icalcomp, ICAL_VALARM_COMPONENT) ||
 			icalcomponent_get_first_component (icalcomp, ICAL_XAUDIOALARM_COMPONENT) ||
 			icalcomponent_get_first_component (icalcomp, ICAL_XDISPLAYALARM_COMPONENT) ||
@@ -5753,7 +5753,7 @@ view_response_cb (ItipView *view,
 		return;
 	}
 
-	if (pitip->method == ICAL_METHOD_PUBLISH || pitip->method ==  ICAL_METHOD_REQUEST) {
+	if (pitip->method == ICAL_METHOD_PUBLISH || pitip->method == ICAL_METHOD_REQUEST) {
 		if (itip_view_get_free_time_check_state (view))
 			e_cal_component_set_transparency (pitip->comp, E_CAL_COMPONENT_TRANSP_TRANSPARENT);
 		else
@@ -5893,7 +5893,7 @@ in_proper_folder (CamelFolder *folder)
 
 	if (have_flags) {
 		/* it should be neither trash nor junk folder, */
-		res = ((flags & CAMEL_FOLDER_TYPE_MASK) !=  CAMEL_FOLDER_TYPE_TRASH &&
+		res = ((flags & CAMEL_FOLDER_TYPE_MASK) != CAMEL_FOLDER_TYPE_TRASH &&
 		       (flags & CAMEL_FOLDER_TYPE_MASK) != CAMEL_FOLDER_TYPE_JUNK &&
 			  /* it can be Inbox */
 			((flags & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_INBOX ||
@@ -5957,7 +5957,7 @@ itip_view_init_view (ItipView *view)
 	} else {
 		itip_view_set_show_inherit_alarm_check (
 			view,
-			have_alarms && (info->method == ICAL_METHOD_PUBLISH || info->method ==  ICAL_METHOD_REQUEST));
+			have_alarms && (info->method == ICAL_METHOD_PUBLISH || info->method == ICAL_METHOD_REQUEST));
 
 		switch (info->method) {
 			case ICAL_METHOD_PUBLISH:
@@ -6264,7 +6264,7 @@ itip_view_init_view (ItipView *view)
 		G_CALLBACK (view_response_cb), info);
 
 	if (response_enabled) {
-		itip_view_set_show_free_time_check (view, info->type == E_CAL_CLIENT_SOURCE_TYPE_EVENTS && (info->method == ICAL_METHOD_PUBLISH || info->method ==  ICAL_METHOD_REQUEST));
+		itip_view_set_show_free_time_check (view, info->type == E_CAL_CLIENT_SOURCE_TYPE_EVENTS && (info->method == ICAL_METHOD_PUBLISH || info->method == ICAL_METHOD_REQUEST));
 
 		if (info->calendar_uid) {
 			start_calendar_server_by_uid (info, view, info->calendar_uid, info->type);
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index 7b0460d2cb..1c1035d69e 100644
--- a/modules/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
@@ -515,7 +515,7 @@ mail_shell_view_prepare_for_quit_cb (EMailShellView *mail_shell_view,
 	message_list_save_state (MESSAGE_LIST (message_list));
 
 	/* Do not sync folder content here, it's duty of EMailBackend,
-	   which does it for all accounts */
+	 * which does it for all accounts */
 }
 
 static void
diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h
index c2c6614084..377ebd8025 100644
--- a/modules/mail/e-mail-shell-view-private.h
+++ b/modules/mail/e-mail-shell-view-private.h
@@ -76,15 +76,15 @@ G_BEGIN_DECLS
  * sufficiently large values.  Unfortunately this introduces an
  * arbitrary upper bound on labels. */
 enum {
-	MAIL_FILTER_ALL_MESSAGES		= -3,
-	MAIL_FILTER_UNREAD_MESSAGES		= -2,
-	MAIL_FILTER_NO_LABEL			= -1,
+	MAIL_FILTER_ALL_MESSAGES = -3,
+	MAIL_FILTER_UNREAD_MESSAGES = -2,
+	MAIL_FILTER_NO_LABEL = -1,
 	/* Labels go here */
-	MAIL_FILTER_READ_MESSAGES		= 5000,
-	MAIL_FILTER_LAST_5_DAYS_MESSAGES	= 5001,
-	MAIL_FILTER_MESSAGES_WITH_ATTACHMENTS	= 5002,
-	MAIL_FILTER_IMPORTANT_MESSAGES		= 5003,
-	MAIL_FILTER_MESSAGES_NOT_JUNK		= 5004
+	MAIL_FILTER_READ_MESSAGES = 5000,
+	MAIL_FILTER_LAST_5_DAYS_MESSAGES = 5001,
+	MAIL_FILTER_MESSAGES_WITH_ATTACHMENTS = 5002,
+	MAIL_FILTER_IMPORTANT_MESSAGES = 5003,
+	MAIL_FILTER_MESSAGES_NOT_JUNK = 5004
 };
 
 /* Search items are displayed in ascending order. */
diff --git a/modules/settings/e-settings-deprecated.c b/modules/settings/e-settings-deprecated.c
index faba3dbee3..b34e791b0d 100644
--- a/modules/settings/e-settings-deprecated.c
+++ b/modules/settings/e-settings-deprecated.c
@@ -51,13 +51,13 @@ struct _ESettingsDeprecatedPrivate {
 
 /* Flag values used in the "working-days" key. */
 enum {
-	DEPRECATED_WORKING_DAYS_SUNDAY    = 1 << 0,
-	DEPRECATED_WORKING_DAYS_MONDAY    = 1 << 1,
-	DEPRECATED_WORKING_DAYS_TUESDAY   = 1 << 2,
+	DEPRECATED_WORKING_DAYS_SUNDAY = 1 << 0,
+	DEPRECATED_WORKING_DAYS_MONDAY = 1 << 1,
+	DEPRECATED_WORKING_DAYS_TUESDAY = 1 << 2,
 	DEPRECATED_WORKING_DAYS_WEDNESDAY = 1 << 3,
-	DEPRECATED_WORKING_DAYS_THURSDAY  = 1 << 4,
-	DEPRECATED_WORKING_DAYS_FRIDAY    = 1 << 5,
-	DEPRECATED_WORKING_DAYS_SATURDAY  = 1 << 6
+	DEPRECATED_WORKING_DAYS_THURSDAY = 1 << 4,
+	DEPRECATED_WORKING_DAYS_FRIDAY = 1 << 5,
+	DEPRECATED_WORKING_DAYS_SATURDAY = 1 << 6
 };
 
 G_DEFINE_DYNAMIC_TYPE (