Coding style and whitespace cleanup.

15 files changed, 19 insertions, 19 deletions

diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index 939df9bbe0..9b44510e55 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -2810,7 +2810,7 @@ migrate_folders(CamelStore *store, gboolean is_local, CamelFolderInfo *fi, const
 	CamelFolder *folder;
 
 	while (fi) {
-		double progress;
+		gdouble progress;
 		gchar *tmp;
 
 		*nth_folder = *nth_folder + 1;
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 944f496572..fed6ec9ca8 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -2344,7 +2344,7 @@ static GtkWidget *
 emae_option_checkspin (EMAccountEditorService *service, CamelURL *url, const gchar *name, const gchar *fmt, const gchar *info)
 {
 	GtkWidget *hbox, *check, *spin, *label = NULL;
-	double min, def, max;
+	gdouble min, def, max;
 	gchar *pre, *post;
 	const gchar *val;
 	gchar on;
@@ -3031,7 +3031,7 @@ static ServerData *
 emae_check_servers (const gchar *email)
 {
 	gint len = G_N_ELEMENTS(mail_servers), i;
-	char *server = strchr (email, '@');
+	gchar *server = strchr (email, '@');
 
 	server++;
 
diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h
index d4d47a6410..7728275e8f 100644
--- a/mail/em-account-editor.h
+++ b/mail/em-account-editor.h
@@ -84,7 +84,7 @@ struct _EMAccountEditor {
 	GtkWidget **pages; /* Pages for Anjal's page type editor */
 
 	guint do_signature:1;	/* allow editing signature */
-	ServerData * (*emae_check_servers) (const char *email);
+	ServerData * (*emae_check_servers) (const gchar *email);
 };
 
 struct _EMAccountEditorClass {
diff --git a/mail/em-filter-context.h b/mail/em-filter-context.h
index d5eda2ab21..201f8ffde7 100644
--- a/mail/em-filter-context.h
+++ b/mail/em-filter-context.h
@@ -56,4 +56,4 @@ EFilterPart *em_filter_context_find_action (EMFilterContext *fc, const gchar *na
 EFilterPart *em_filter_context_create_action (EMFilterContext *fc, const gchar *name);
 EFilterPart *em_filter_context_next_action (EMFilterContext *fc, EFilterPart *last);
 
-#endif /* ! _EM_FILTER_CONTEXT_H */
+#endif /* _EM_FILTER_CONTEXT_H */
diff --git a/mail/em-filter-folder-element.h b/mail/em-filter-folder-element.h
index 02fb34b09f..2aae15edb1 100644
--- a/mail/em-filter-folder-element.h
+++ b/mail/em-filter-folder-element.h
@@ -53,4 +53,4 @@ EMFilterFolderElement *em_filter_folder_element_new (void);
 /* methods */
 void em_filter_folder_element_set_value (EMFilterFolderElement *ff, const gchar *uri);
 
-#endif /* ! _EM_FILTER_FOLDER_ELEMENT_H */
+#endif /* _EM_FILTER_FOLDER_ELEMENT_H */
diff --git a/mail/em-filter-rule.h b/mail/em-filter-rule.h
index 4ea49780b9..6e75dc785d 100644
--- a/mail/em-filter-rule.h
+++ b/mail/em-filter-rule.h
@@ -56,4 +56,4 @@ void            em_filter_rule_replace_action (EMFilterRule *fr, EFilterPart *fp
 
 void            em_filter_rule_build_action   (EMFilterRule *fr, GString *out);
 
-#endif /* ! _EM_FILTER_RULE_H */
+#endif /* _EM_FILTER_RULE_H */
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 356a544fb7..84ac0fc061 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -2175,7 +2175,7 @@ em_folder_tree_set_selected_list (EMFolderTree *folder_tree, GList *list, gboole
 
 			/* This makes sure all our parents up to the root are expanded */
 			/* FIXME: Why does the expanded state store this made up path rather than the euri? */
-			if ( (account = mail_config_get_account_by_source_url(u->uri)) )
+			if ((account = mail_config_get_account_by_source_url(u->uri)))
 				expand_key = g_strdup_printf ("%s/%s", account->uid, path);
 			else if (CAMEL_IS_VEE_STORE (u->store))
 				expand_key = g_strdup_printf ("vfolder/%s", path);
diff --git a/mail/em-subscribe-editor.h b/mail/em-subscribe-editor.h
index d10d68bbb8..07b6796d8b 100644
--- a/mail/em-subscribe-editor.h
+++ b/mail/em-subscribe-editor.h
@@ -25,4 +25,4 @@
 
 GtkWidget *em_subscribe_editor_new(void);
 
-#endif /* ! _EM_SUBSCRIBE_EDITOR_H */
+#endif /* _EM_SUBSCRIBE_EDITOR_H */
diff --git a/mail/em-vfolder-context.h b/mail/em-vfolder-context.h
index baf3f5ff32..59ff08b361 100644
--- a/mail/em-vfolder-context.h
+++ b/mail/em-vfolder-context.h
@@ -49,4 +49,4 @@ GType em_vfolder_context_get_type (void);
 
 EMVFolderContext *em_vfolder_context_new (void);
 
-#endif /* ! _EM_VFOLDER_CONTEXT_H */
+#endif /* _EM_VFOLDER_CONTEXT_H */
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index 6d7d978c06..d151c47f53 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -422,13 +422,13 @@ select_source_with_changed(GtkWidget *widget, struct _source_data *data)
 	GSList *group = NULL;
 	gint i = 0;
 
-	if ( !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)) )
+	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
 		return;
 
 	group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (widget));
 
 	for (i=0; i< g_slist_length(group); i++) {
-		if ( g_slist_nth_data (group, with = i) == widget )
+		if (g_slist_nth_data (group, with = i) == widget)
 			break;
 	}
 
diff --git a/mail/em-vfolder-rule.h b/mail/em-vfolder-rule.h
index a5c80356e7..8e77986e2c 100644
--- a/mail/em-vfolder-rule.h
+++ b/mail/em-vfolder-rule.h
@@ -65,4 +65,4 @@ void         em_vfolder_rule_remove_source (EMVFolderRule *vr, const gchar *uri)
 const gchar  *em_vfolder_rule_find_source   (EMVFolderRule *vr, const gchar *uri);
 const gchar  *em_vfolder_rule_next_source   (EMVFolderRule *vr, const gchar *last);
 
-#endif /* ! _EM_VFOLDER_RULE_H */
+#endif /* _EM_VFOLDER_RULE_H */
diff --git a/mail/mail-mt.h b/mail/mail-mt.h
index e9d552a41c..2e8828c5b2 100644
--- a/mail/mail-mt.h
+++ b/mail/mail-mt.h
@@ -126,4 +126,4 @@ gpointer mail_call_main(mail_call_t type, MailMainFunc func, ...);
 /* Note that almost all objects care about the lifecycle of their events, so this cannot be used */
 extern MailAsyncEvent *mail_async_event;
 
-#endif /* ! _MAIL_MT */
+#endif /* _MAIL_MT */
diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h
index 2ba1f01aeb..2155a96191 100644
--- a/mail/mail-send-recv.h
+++ b/mail/mail-send-recv.h
@@ -44,4 +44,4 @@ void		mail_autoreceive_init		(EShellBackend *shell_backend,
 
 G_END_DECLS
 
-#endif /* ! MAIL_SEND_RECV_H */
+#endif /* MAIL_SEND_RECV_H */
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 6301e5ff5e..d418ec7d99 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -701,9 +701,9 @@ mail_vfolder_rename_uri(CamelStore *store, const gchar *cfrom, const gchar *cto)
 
 	/* see if any rules directly reference this removed uri */
 	rule = NULL;
-	while ( (rule = e_rule_context_next_rule((ERuleContext *)context, rule, NULL)) ) {
+	while ((rule = e_rule_context_next_rule((ERuleContext *)context, rule, NULL))) {
 		source = NULL;
-		while ( (source = em_vfolder_rule_next_source((EMVFolderRule *)rule, source)) ) {
+		while ((source = em_vfolder_rule_next_source((EMVFolderRule *)rule, source))) {
 			gchar *csource = em_uri_to_camel(source);
 
 			/* Remove all sources that match, ignore changed events though
@@ -1057,7 +1057,7 @@ vfolder_load_storage(void)
 
 	/* and setup the rules we have */
 	rule = NULL;
-	while ( (rule = e_rule_context_next_rule((ERuleContext *)context, rule, NULL)) ) {
+	while ((rule = e_rule_context_next_rule((ERuleContext *)context, rule, NULL))) {
 		if (rule->name) {
 			d(printf("rule added: %s\n", rule->name));
 			context_rule_added((ERuleContext *)context, rule);
diff --git a/mail/message-list.c b/mail/message-list.c
index bb75cf1370..78709e1449 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -3437,7 +3437,7 @@ build_flat_diff(MessageList *ml, CamelFolderChangeInfo *changes)
 #endif
 
 }
-#endif /* ! BROKEN_ETREE */
+#endif /* BROKEN_ETREE */
 
 static void
 mail_folder_hide_by_flag (CamelFolder *folder, MessageList *ml, CamelFolderChangeInfo **changes, gint flag)