Coding style and whitespace cleanup.

12 files changed, 96 insertions, 96 deletions

diff --git a/filter/e-filter-code.c b/filter/e-filter-code.c
index 0476f0678c..394f682b60 100644
--- a/filter/e-filter-code.c
+++ b/filter/e-filter-code.c
@@ -44,7 +44,7 @@ filter_code_build_code (EFilterElement *element,
 	gboolean is_rawcode = fi && fi->type && g_str_equal (fi->type, "rawcode");
 
 	if (!is_rawcode)
-		g_string_append(out, "(match-all ");
+		g_string_append (out, "(match-all ");
 
 	l = fi->values;
 	while (l) {
@@ -95,7 +95,7 @@ e_filter_code_new (gboolean raw_code)
 
 	if (fc && raw_code) {
 		xmlFree (((EFilterInput *) fc)->type);
-		((EFilterInput *) fc)->type = (gchar *)xmlStrdup ((xmlChar *)"rawcode");
+		((EFilterInput *) fc)->type = (gchar *) xmlStrdup ((xmlChar *)"rawcode");
 	}
 
 	return fc;
diff --git a/filter/e-filter-color.c b/filter/e-filter-color.c
index 1540841968..3b39cabbbf 100644
--- a/filter/e-filter-color.c
+++ b/filter/e-filter-color.c
@@ -63,10 +63,10 @@ filter_color_xml_encode (EFilterElement *element)
 	g_snprintf (spec, sizeof (spec), "#%04x%04x%04x",
 		fc->color.red, fc->color.green, fc->color.blue);
 
-	value = xmlNewNode(NULL, (xmlChar *)"value");
-	xmlSetProp(value, (xmlChar *)"type", (xmlChar *)"colour");
-	xmlSetProp(value, (xmlChar *)"name", (xmlChar *)element->name);
-	xmlSetProp(value, (xmlChar *)"spec", (xmlChar *)spec);
+	value = xmlNewNode (NULL, (xmlChar *)"value");
+	xmlSetProp (value, (xmlChar *)"type", (xmlChar *)"colour");
+	xmlSetProp (value, (xmlChar *)"name", (xmlChar *) element->name);
+	xmlSetProp (value, (xmlChar *)"spec", (xmlChar *) spec);
 
 	return value;
 }
@@ -79,22 +79,22 @@ filter_color_xml_decode (EFilterElement *element,
 	xmlChar *prop;
 
 	xmlFree (element->name);
-	element->name = (gchar *)xmlGetProp(node, (xmlChar *)"name");
+	element->name = (gchar *) xmlGetProp (node, (xmlChar *)"name");
 
-	prop = xmlGetProp(node, (xmlChar *)"spec");
+	prop = xmlGetProp (node, (xmlChar *)"spec");
 	if (prop != NULL) {
 		gdk_color_parse ((gchar *) prop, &fc->color);
 		xmlFree (prop);
 	} else {
 		/* try reading the old RGB properties */
-		prop = xmlGetProp(node, (xmlChar *)"red");
-		sscanf((gchar *)prop, "%" G_GINT16_MODIFIER "x", &fc->color.red);
+		prop = xmlGetProp (node, (xmlChar *)"red");
+		sscanf ((gchar *) prop, "%" G_GINT16_MODIFIER "x", &fc->color.red);
 		xmlFree (prop);
-		prop = xmlGetProp(node, (xmlChar *)"green");
-		sscanf((gchar *)prop, "%" G_GINT16_MODIFIER "x", &fc->color.green);
+		prop = xmlGetProp (node, (xmlChar *)"green");
+		sscanf ((gchar *) prop, "%" G_GINT16_MODIFIER "x", &fc->color.green);
 		xmlFree (prop);
-		prop = xmlGetProp(node, (xmlChar *)"blue");
-		sscanf((gchar *)prop, "%" G_GINT16_MODIFIER "x", &fc->color.blue);
+		prop = xmlGetProp (node, (xmlChar *)"blue");
+		sscanf ((gchar *) prop, "%" G_GINT16_MODIFIER "x", &fc->color.blue);
 		xmlFree (prop);
 	}
 
diff --git a/filter/e-filter-datespec.c b/filter/e-filter-datespec.c
index 58685e0fed..2464dd2bbf 100644
--- a/filter/e-filter-datespec.c
+++ b/filter/e-filter-datespec.c
@@ -66,20 +66,20 @@ typedef struct {
 /* Don't delete this code, since it is needed so that xgettext can extract the translations.
  * Please, keep these strings in sync with the strings in the timespans array */
 
-	ngettext("1 second ago", "%d seconds ago", 1);
-	ngettext("1 second in the future", "%d seconds in the future", 1);
-	ngettext("1 minute ago", "%d minutes ago", 1);
-	ngettext("1 minute in the future", "%d minutes in the future", 1);
-	ngettext("1 hour ago", "%d hours ago", 1);
-	ngettext("1 hour in the future", "%d hours in the future", 1);
-	ngettext("1 day ago", "%d days ago", 1);
-	ngettext("1 day in the future", "%d days in the future", 1);
-	ngettext("1 week ago", "%d weeks ago", 1);
-	ngettext("1 week in the future", "%d weeks in the future", 1)
-	ngettext("1 month ago", "%d months ago", 1);
-	ngettext("1 month in the future", "%d months in the future", 1);
-	ngettext("1 year ago", "%d years ago", 1);
-	ngettext("1 year in the future", "%d years in the future", 1);
+	ngettext ("1 second ago", "%d seconds ago", 1);
+	ngettext ("1 second in the future", "%d seconds in the future", 1);
+	ngettext ("1 minute ago", "%d minutes ago", 1);
+	ngettext ("1 minute in the future", "%d minutes in the future", 1);
+	ngettext ("1 hour ago", "%d hours ago", 1);
+	ngettext ("1 hour in the future", "%d hours in the future", 1);
+	ngettext ("1 day ago", "%d days ago", 1);
+	ngettext ("1 day in the future", "%d days in the future", 1);
+	ngettext ("1 week ago", "%d weeks ago", 1);
+	ngettext ("1 week in the future", "%d weeks in the future", 1)
+	ngettext ("1 month ago", "%d months ago", 1);
+	ngettext ("1 month in the future", "%d months in the future", 1);
+	ngettext ("1 year ago", "%d years ago", 1);
+	ngettext ("1 year in the future", "%d years in the future", 1);
 
 #endif
 
@@ -139,7 +139,7 @@ set_button (EFilterDatespec *fds)
 
 		localtime_r (&fds->value, &tm);
 		/* strftime for date filter display, only needs to show a day date (i.e. no time) */
-		strftime(buf, sizeof(buf), _("%d-%b-%Y"), &tm);
+		strftime (buf, sizeof (buf), _("%d-%b-%Y"), &tm);
 		break; }
 	case FDST_X_AGO:
 		if (fds->value == 0)
@@ -363,17 +363,17 @@ filter_datespec_xml_encode (EFilterElement *element)
 	EFilterDatespec *fds = E_FILTER_DATESPEC (element);
 	gchar str[32];
 
-	d(printf ("Encoding datespec as xml\n"));
+	d (printf ("Encoding datespec as xml\n"));
 
 	value = xmlNewNode (NULL, (xmlChar *)"value");
-	xmlSetProp (value, (xmlChar *)"name", (xmlChar *)element->name);
+	xmlSetProp (value, (xmlChar *)"name", (xmlChar *) element->name);
 	xmlSetProp (value, (xmlChar *)"type", (xmlChar *)"datespec");
 
 	work = xmlNewChild (value, NULL, (xmlChar *)"datespec", NULL);
 	sprintf (str, "%d", fds->type);
-	xmlSetProp (work, (xmlChar *)"type", (xmlChar *)str);
-	sprintf (str, "%d", (gint)fds->value);
-	xmlSetProp (work, (xmlChar *)"value", (xmlChar *)str);
+	xmlSetProp (work, (xmlChar *)"type", (xmlChar *) str);
+	sprintf (str, "%d", (gint) fds->value);
+	xmlSetProp (work, (xmlChar *)"value", (xmlChar *) str);
 
 	return value;
 }
@@ -386,14 +386,14 @@ filter_datespec_xml_decode (EFilterElement *element,
 	xmlNodePtr n;
 	xmlChar *val;
 
-	d(printf ("Decoding datespec from xml %p\n", element));
+	d (printf ("Decoding datespec from xml %p\n", element));
 
 	xmlFree (element->name);
-	element->name = (gchar *)xmlGetProp (node, (xmlChar *)"name");
+	element->name = (gchar *) xmlGetProp (node, (xmlChar *)"name");
 
 	n = node->children;
 	while (n) {
-		if (!strcmp ((gchar *)n->name, "datespec")) {
+		if (!strcmp ((gchar *) n->name, "datespec")) {
 			val = xmlGetProp (n, (xmlChar *)"type");
 			fds->type = atoi ((gchar *) val);
 			xmlFree (val);
diff --git a/filter/e-filter-element.c b/filter/e-filter-element.c
index 8062500aad..e00651ec03 100644
--- a/filter/e-filter-element.c
+++ b/filter/e-filter-element.c
@@ -61,7 +61,7 @@ static void
 filter_element_xml_create (EFilterElement *element,
                            xmlNodePtr node)
 {
-	element->name = (gchar *)xmlGetProp (node, (xmlChar *) "name");
+	element->name = (gchar *) xmlGetProp (node, (xmlChar *) "name");
 }
 
 static EFilterElement *
diff --git a/filter/e-filter-file.c b/filter/e-filter-file.c
index cb84e98352..e0c6c72552 100644
--- a/filter/e-filter-file.c
+++ b/filter/e-filter-file.c
@@ -146,8 +146,8 @@ filter_file_xml_decode (EFilterElement *element,
 	gchar *name, *str, *type;
 	xmlNodePtr child;
 
-	name = (gchar *)xmlGetProp (node, (xmlChar *) "name");
-	type = (gchar *)xmlGetProp (node, (xmlChar *) "type");
+	name = (gchar *) xmlGetProp (node, (xmlChar *) "name");
+	type = (gchar *) xmlGetProp (node, (xmlChar *) "type");
 
 	xmlFree (element->name);
 	element->name = name;
diff --git a/filter/e-filter-input.c b/filter/e-filter-input.c
index e81ae4c5fa..b13f910048 100644
--- a/filter/e-filter-input.c
+++ b/filter/e-filter-input.c
@@ -200,7 +200,7 @@ filter_input_xml_decode (EFilterElement *element,
 	while (child != NULL) {
 		if (!strcmp ((gchar *) child->name, type)) {
 			if (!(str = (gchar *) xmlNodeGetContent (child)))
-				str = (gchar *)xmlStrdup ((xmlChar *)"");
+				str = (gchar *) xmlStrdup ((xmlChar *)"");
 
 			input->values = g_list_append (input->values, g_strdup (str));
 			xmlFree (str);
diff --git a/filter/e-filter-int.c b/filter/e-filter-int.c
index be0a5f1ee5..ba4eacde2e 100644
--- a/filter/e-filter-int.c
+++ b/filter/e-filter-int.c
@@ -112,11 +112,11 @@ filter_int_xml_decode (EFilterElement *element,
 	gchar *name, *type;
 	gchar *intval;
 
-	name = (gchar *)xmlGetProp (node, (xmlChar *)"name");
+	name = (gchar *) xmlGetProp (node, (xmlChar *)"name");
 	xmlFree (element->name);
 	element->name = name;
 
-	type = (gchar *)xmlGetProp (node, (xmlChar *)"type");
+	type = (gchar *) xmlGetProp (node, (xmlChar *)"type");
 	g_free (filter_int->type);
 	filter_int->type = g_strdup (type);
 	xmlFree (type);
diff --git a/filter/e-filter-option.c b/filter/e-filter-option.c
index dd6d9b8874..e11d384927 100644
--- a/filter/e-filter-option.c
+++ b/filter/e-filter-option.c
@@ -103,8 +103,8 @@ filter_option_get_dynamic_options (EFilterOption *option)
 
 static void
 filter_option_generate_code (EFilterOption *option,
-			     GString *out,
-			     EFilterPart *part)
+                             GString *out,
+                             EFilterPart *part)
 {
 	GModule *module;
 	void (*code_gen_func) (EFilterElement *element, GString *out, EFilterPart *part);
@@ -172,22 +172,22 @@ filter_option_xml_create (EFilterElement *element,
 
 	n = node->children;
 	while (n) {
-		if (!strcmp ((gchar *)n->name, "option")) {
+		if (!strcmp ((gchar *) n->name, "option")) {
 			gchar *tmp, *value, *title = NULL, *code = NULL, *code_gen_func = NULL;
 
-			value = (gchar *)xmlGetProp (n, (xmlChar *)"value");
+			value = (gchar *) xmlGetProp (n, (xmlChar *)"value");
 			work = n->children;
 			while (work) {
-				if (!strcmp ((gchar *)work->name, "title") ||
-					!strcmp ((gchar *)work->name, "_title")) {
+				if (!strcmp ((gchar *) work->name, "title") ||
+					!strcmp ((gchar *) work->name, "_title")) {
 					if (!title) {
 						if (!(tmp = (gchar *) xmlNodeGetContent (work)))
-							tmp = (gchar *)xmlStrdup ((xmlChar *)"");
+							tmp = (gchar *) xmlStrdup ((xmlChar *)"");
 
 						title = g_strdup (tmp);
 						xmlFree (tmp);
 					}
-				} else if (!strcmp ((gchar *)work->name, "code")) {
+				} else if (!strcmp ((gchar *) work->name, "code")) {
 					if (code || code_gen_func) {
 						g_warning ("Element 'code' defined twice in '%s'",
 							element->name);
@@ -195,20 +195,20 @@ filter_option_xml_create (EFilterElement *element,
 						xmlChar *fn;
 
 						/* if element 'code' has attribute 'func', then
-						   the content of the element is ignored and only
-						   the 'func' is used to generate actual rule code;
-						   The function prototype is:
-						   void code_gen_func (EFilterElement *element, GString *out, EFilterPart *part);
-						   where @element is the one on which was called,
-						   @out is GString where to add the code, and
-						   @part is part which contains @element and other options of it.
+						 * the content of the element is ignored and only
+						 * the 'func' is used to generate actual rule code;
+						 * The function prototype is:
+						 * void code_gen_func (EFilterElement *element, GString *out, EFilterPart *part);
+						 * where @element is the one on which was called,
+						 * @out is GString where to add the code, and
+						 * @part is part which contains @element and other options of it.
 						*/
 						fn = xmlGetProp (work, (xmlChar *)"func");
 						if (fn && *fn) {
 							code_gen_func = g_strdup ((const gchar *) fn);
 						} else {
 							if (!(tmp = (gchar *) xmlNodeGetContent (work)))
-								tmp = (gchar *)xmlStrdup ((xmlChar *)"");
+								tmp = (gchar *) xmlStrdup ((xmlChar *)"");
 
 							code = g_strdup (tmp);
 							xmlFree (tmp);
@@ -225,7 +225,7 @@ filter_option_xml_create (EFilterElement *element,
 			g_free (title);
 			g_free (code);
 			g_free (code_gen_func);
-		} else if (g_str_equal ((gchar *)n->name, "dynamic")) {
+		} else if (g_str_equal ((gchar *) n->name, "dynamic")) {
 			if (option->dynamic_func) {
 				g_warning (
 					"Only one 'dynamic' node is "
@@ -296,7 +296,7 @@ filter_option_xml_encode (EFilterElement *element)
 	xmlSetProp (value, (xmlChar *) "name", (xmlChar *) element->name);
 	xmlSetProp (value, (xmlChar *) "type", (xmlChar *) option->type);
 	if (option->current)
-		xmlSetProp (value, (xmlChar *) "value", (xmlChar *)option->current->value);
+		xmlSetProp (value, (xmlChar *) "value", (xmlChar *) option->current->value);
 
 	return value;
 }
@@ -309,9 +309,9 @@ filter_option_xml_decode (EFilterElement *element,
 	gchar *value;
 
 	xmlFree (element->name);
-	element->name = (gchar *)xmlGetProp (node, (xmlChar *)"name");
+	element->name = (gchar *) xmlGetProp (node, (xmlChar *)"name");
 
-	value = (gchar *)xmlGetProp (node, (xmlChar *)"value");
+	value = (gchar *) xmlGetProp (node, (xmlChar *)"value");
 	if (value) {
 		option->current = find_option (option, value);
 		xmlFree (value);
@@ -514,7 +514,7 @@ e_filter_option_add (EFilterOption *option,
                      const gchar *value,
                      const gchar *title,
                      const gchar *code,
-		     const gchar *code_gen_func,
+                     const gchar *code_gen_func,
                      gboolean is_dynamic)
 {
 	struct _filter_option *op;
diff --git a/filter/e-filter-option.h b/filter/e-filter-option.h
index 84b98bd104..f241f09250 100644
--- a/filter/e-filter-option.h
+++ b/filter/e-filter-option.h
@@ -56,11 +56,11 @@ struct _filter_option {
 	gchar *value;		/* value, if it has one */
 	gchar *code;		/* used to string code segments together */
 	gchar *code_gen_func;	/* function to generate the code;
-				   either @code or @code_gen_func is non-NULL,
-				   never both */
+				 * either @code or @code_gen_func is non-NULL,
+				 * never both */
 
 	gboolean is_dynamic;	/* whether is the option dynamic, FALSE if static;
-				   dynamic means "generated by EFilterOption::dynamic_func" */
+				 * dynamic means "generated by EFilterOption::dynamic_func" */
 };
 
 struct _EFilterOption {
diff --git a/filter/e-filter-part.c b/filter/e-filter-part.c
index 2154699178..ea18f5959c 100644
--- a/filter/e-filter-part.c
+++ b/filter/e-filter-part.c
@@ -153,15 +153,15 @@ e_filter_part_xml_create (EFilterPart *part,
 	g_return_val_if_fail (node != NULL, FALSE);
 	g_return_val_if_fail (E_IS_RULE_CONTEXT (context), FALSE);
 
-	str = (gchar *)xmlGetProp (node, (xmlChar *)"name");
+	str = (gchar *) xmlGetProp (node, (xmlChar *)"name");
 	part->name = g_strdup (str);
 	if (str)
 		xmlFree (str);
 
 	n = node->children;
 	while (n) {
-		if (!strcmp ((gchar *)n->name, "input")) {
-			type = (gchar *)xmlGetProp (n, (xmlChar *)"type");
+		if (!strcmp ((gchar *) n->name, "input")) {
+			type = (gchar *) xmlGetProp (n, (xmlChar *)"type");
 			if (type != NULL
 			    && (el = e_rule_context_new_element (context, type)) != NULL) {
 				e_filter_element_xml_create (el, n);
@@ -170,15 +170,15 @@ e_filter_part_xml_create (EFilterPart *part,
 			} else {
 				g_warning ("Invalid xml format, missing/unknown input type");
 			}
-		} else if (!strcmp ((gchar *)n->name, "title") ||
-			   !strcmp ((gchar *)n->name, "_title")) {
+		} else if (!strcmp ((gchar *) n->name, "title") ||
+			   !strcmp ((gchar *) n->name, "_title")) {
 			if (!part->title) {
 				str = (gchar *) xmlNodeGetContent (n);
 				part->title = g_strdup (str);
 				if (str)
 					xmlFree (str);
 			}
-		} else if (!strcmp ((gchar *)n->name, "code")) {
+		} else if (!strcmp ((gchar *) n->name, "code")) {
 			if (!part->code) {
 				str = (gchar *) xmlNodeGetContent (n);
 				part->code = g_strdup (str);
@@ -203,7 +203,7 @@ e_filter_part_xml_encode (EFilterPart *part)
 	g_return_val_if_fail (E_IS_FILTER_PART (part), NULL);
 
 	node = xmlNewNode (NULL, (xmlChar *)"part");
-	xmlSetProp (node, (xmlChar *)"name", (xmlChar *)part->name);
+	xmlSetProp (node, (xmlChar *)"name", (xmlChar *) part->name);
 
 	for (link = part->elements; link != NULL; link = g_list_next (link)) {
 		EFilterElement *element = link->data;
@@ -483,7 +483,7 @@ e_filter_part_expand_code (EFilterPart *part,
 	start = source;
 
 	while (start && (newstart = strstr (start, "${"))
-		&& (end = strstr (newstart+2, "}")) ) {
+		&& (end = strstr (newstart + 2, "}")) ) {
 		EFilterElement *element;
 
 		len = end - newstart - 2;
@@ -496,15 +496,15 @@ e_filter_part_expand_code (EFilterPart *part,
 
 		element = e_filter_part_find_element (part, name);
 		if (element != NULL) {
-			g_string_append_printf (out, "%.*s", (gint)(newstart-start), start);
+			g_string_append_printf (out, "%.*s", (gint)(newstart - start), start);
 			e_filter_element_format_sexp (element, out);
 #if 0
 		} else if ((val = g_hash_table_lookup (part->globals, name))) {
-			g_string_append_printf (out, "%.*s", newstart-start, start);
+			g_string_append_printf (out, "%.*s", newstart - start, start);
 			camel_sexp_encode_string (out, val);
 #endif
 		} else {
-			g_string_append_printf (out, "%.*s", (gint)(end-start+1), start);
+			g_string_append_printf (out, "%.*s", (gint)(end - start + 1), start);
 		}
 		start = end + 1;
 	}
diff --git a/filter/e-filter-rule.c b/filter/e-filter-rule.c
index cff0b8bbe8..4d27ab1ae0 100644
--- a/filter/e-filter-rule.c
+++ b/filter/e-filter-rule.c
@@ -289,7 +289,7 @@ more_parts (GtkWidget *button,
 			gtk_widget_grab_focus (w);
 
 		/* also scroll down to see new part */
-		w = (GtkWidget*) g_object_get_data (G_OBJECT (button), "scrolled-window");
+		w = (GtkWidget *) g_object_get_data (G_OBJECT (button), "scrolled-window");
 		if (w) {
 			GtkAdjustment *adjustment;
 
@@ -340,8 +340,8 @@ filter_rule_load_set (xmlNodePtr node,
 
 	work = node->children;
 	while (work) {
-		if (!strcmp ((gchar *)work->name, "part")) {
-			rulename = (gchar *)xmlGetProp (work, (xmlChar *)"name");
+		if (!strcmp ((gchar *) work->name, "part")) {
+			rulename = (gchar *) xmlGetProp (work, (xmlChar *)"name");
 			part = e_rule_context_find_part (context, rulename);
 			if (part) {
 				part = e_filter_part_clone (part);
@@ -480,7 +480,7 @@ filter_rule_xml_encode (EFilterRule *rule)
 	}
 
 	if (rule->source) {
-		xmlSetProp (node, (xmlChar *)"source", (xmlChar *)rule->source);
+		xmlSetProp (node, (xmlChar *)"source", (xmlChar *) rule->source);
 	} else {
 		/* set to the default filter type */
 		xmlSetProp (node, (xmlChar *)"source", (xmlChar *)"incoming");
@@ -520,7 +520,7 @@ filter_rule_xml_decode (EFilterRule *rule,
 	g_free (rule->name);
 	rule->name = NULL;
 
-	grouping = (gchar *)xmlGetProp (node, (xmlChar *)"enabled");
+	grouping = (gchar *) xmlGetProp (node, (xmlChar *)"enabled");
 	if (!grouping)
 		rule->enabled = TRUE;
 	else {
@@ -528,7 +528,7 @@ filter_rule_xml_decode (EFilterRule *rule,
 		xmlFree (grouping);
 	}
 
-	grouping = (gchar *)xmlGetProp (node, (xmlChar *)"grouping");
+	grouping = (gchar *) xmlGetProp (node, (xmlChar *)"grouping");
 	if (!strcmp (grouping, "any"))
 		rule->grouping = E_FILTER_GROUP_ANY;
 	else
@@ -537,7 +537,7 @@ filter_rule_xml_decode (EFilterRule *rule,
 
 	rule->threading = E_FILTER_THREAD_NONE;
 	if (context->flags & E_RULE_CONTEXT_THREADING
-	    && (grouping = (gchar *)xmlGetProp (node, (xmlChar *)"threading"))) {
+	    && (grouping = (gchar *) xmlGetProp (node, (xmlChar *)"threading"))) {
 		if (!strcmp (grouping, "all"))
 			rule->threading = E_FILTER_THREAD_ALL;
 		else if (!strcmp (grouping, "replies"))
@@ -550,7 +550,7 @@ filter_rule_xml_decode (EFilterRule *rule,
 	}
 
 	g_free (rule->source);
-	source = (gchar *)xmlGetProp (node, (xmlChar *)"source");
+	source = (gchar *) xmlGetProp (node, (xmlChar *)"source");
 	if (source) {
 		rule->source = g_strdup (source);
 		xmlFree (source);
@@ -561,10 +561,10 @@ filter_rule_xml_decode (EFilterRule *rule,
 
 	work = node->children;
 	while (work) {
-		if (!strcmp ((gchar *)work->name, "partset")) {
+		if (!strcmp ((gchar *) work->name, "partset")) {
 			filter_rule_load_set (work, rule, context);
-		} else if (!strcmp ((gchar *)work->name, "title") ||
-			!strcmp ((gchar *)work->name, "_title")) {
+		} else if (!strcmp ((gchar *) work->name, "title") ||
+			!strcmp ((gchar *) work->name, "_title")) {
 
 			if (!rule->name) {
 				gchar *str, *decstr = NULL;
@@ -666,8 +666,8 @@ ensure_scrolled_width_cb (GtkAdjustment *adj,
 
 static void
 ensure_scrolled_height_cb (GtkAdjustment *adj,
-			   GParamSpec *param_spec,
-			   GtkScrolledWindow *scrolled_window)
+                           GParamSpec *param_spec,
+                           GtkScrolledWindow *scrolled_window)
 {
 	GtkWidget *toplevel;
 	GdkScreen *screen;
diff --git a/filter/e-rule-context.c b/filter/e-rule-context.c
index c9079bc556..0f41b52c04 100644
--- a/filter/e-rule-context.c
+++ b/filter/e-rule-context.c
@@ -219,7 +219,7 @@ rule_context_load (ERuleContext *context,
 	}
 
 	root = xmlDocGetRootElement (systemdoc);
-	if (root == NULL || strcmp ((gchar *)root->name, "filterdescription")) {
+	if (root == NULL || strcmp ((gchar *) root->name, "filterdescription")) {
 		gchar * err_msg;
 
 		err_msg = g_strdup_printf (
@@ -244,7 +244,7 @@ rule_context_load (ERuleContext *context,
 		if (part_map) {
 			rule = set->children;
 			while (rule) {
-				if (!strcmp ((gchar *)rule->name, "part")) {
+				if (!strcmp ((gchar *) rule->name, "part")) {
 					EFilterPart *part =
 						E_FILTER_PART (g_object_new (
 						part_map->type, NULL, NULL));
@@ -262,7 +262,7 @@ rule_context_load (ERuleContext *context,
 				context->rule_set_map, set->name))) {
 			rule = set->children;
 			while (rule) {
-				if (!strcmp ((gchar *)rule->name, "rule")) {
+				if (!strcmp ((gchar *) rule->name, "rule")) {
 					EFilterRule *part =
 						E_FILTER_RULE (g_object_new (
 						rule_map->type, NULL, NULL));
@@ -290,7 +290,7 @@ rule_context_load (ERuleContext *context,
 			if (rule_map) {
 				rule = set->children;
 				while (rule) {
-					if (!strcmp ((gchar *)rule->name, "rule")) {
+					if (!strcmp ((gchar *) rule->name, "rule")) {
 						EFilterRule *part =
 							E_FILTER_RULE (g_object_new (
 							rule_map->type, NULL, NULL));
@@ -397,7 +397,7 @@ rule_context_revert (ERuleContext *context,
 		if (rule_map) {
 			rule = set->children;
 			while (rule) {
-				if (!strcmp ((gchar *)rule->name, "rule")) {
+				if (!strcmp ((gchar *) rule->name, "rule")) {
 					EFilterRule *part =
 						E_FILTER_RULE (g_object_new (
 						rule_map->type, NULL, NULL));