Whitespace and coding style cleanups.

3 files changed, 32 insertions, 14 deletions

diff --git a/filter/e-filter-option.c b/filter/e-filter-option.c
index bc61e96c24..7eaa4324d5 100644
--- a/filter/e-filter-option.c
+++ b/filter/e-filter-option.c
@@ -92,7 +92,9 @@ filter_option_get_dynamic_options (EFilterOption *option)
 	if (g_module_symbol (module, option->dynamic_func, (gpointer) &get_func)) {
 		res = get_func ();
 	} else {
-		g_warning ("optionlist dynamic fill function '%s' not found", option->dynamic_func);
+		g_warning (
+			"optionlist dynamic fill function '%s' not found",
+			option->dynamic_func);
 	}
 
 	g_module_close (module);
@@ -186,12 +188,15 @@ filter_option_xml_create (EFilterElement *element,
 					"acceptable in the optionlist '%s'",
 					element->name);
 			} else {
-				/* Expecting only one <dynamic func="cb" /> in the option list,
-				   The 'cb' should be of this prototype:
-				   GSList *cb (void);
-				   returning GSList of struct _filter_option, all newly allocated, because it'll
-				   be freed with g_free and g_slist_free. 'is_dynamic' member is ignored here.
-				*/
+				/* Expecting only one <dynamic func="cb" />
+				 * in the option list,
+				 * The 'cb' should be of this prototype:
+				 * GSList *cb (void);
+				 * returning GSList of struct _filter_option,
+				 * all newly allocated, because it'll be
+				 * freed with g_free and g_slist_free.
+				 * 'is_dynamic' member is ignored here.
+				 */
 				xmlChar *fn;
 
 				fn = xmlGetProp (n, (xmlChar *)"func");
@@ -305,7 +310,8 @@ filter_option_get_widget (EFilterElement *element)
 	gint index = 0, current = 0;
 
 	if (option->dynamic_func) {
-		/* it is dynamically filled, thus remove all dynamics and put there the fresh ones */
+		/* it is dynamically filled, thus remove all dynamics
+		 * and put there the fresh ones */
 		GSList *items, *i;
 		GList *old_ops;
 		struct _filter_option *old_cur;
diff --git a/filter/e-filter-rule.c b/filter/e-filter-rule.c
index d10ae85dda..18fd63b850 100644
--- a/filter/e-filter-rule.c
+++ b/filter/e-filter-rule.c
@@ -1117,7 +1117,8 @@ e_filter_rule_find_list (GList * list,
 		EFilterRule *rule = link->data;
 
 		if (strcmp (rule->name, name) == 0)
-			if (source == NULL || (rule->source != NULL && strcmp (rule->source, source) == 0))
+			if (source == NULL || (rule->source != NULL &&
+				strcmp (rule->source, source) == 0))
 				return rule;
 	}
 
diff --git a/filter/e-rule-context.c b/filter/e-rule-context.c
index edfa9e41ea..fac44fa8b9 100644
--- a/filter/e-rule-context.c
+++ b/filter/e-rule-context.c
@@ -240,7 +240,9 @@ rule_context_load (ERuleContext *context,
 			rule = set->children;
 			while (rule) {
 				if (!strcmp ((gchar *)rule->name, "part")) {
-					EFilterPart *part = E_FILTER_PART (g_object_new (part_map->type, NULL, NULL));
+					EFilterPart *part =
+						E_FILTER_PART (g_object_new (
+						part_map->type, NULL, NULL));
 
 					if (e_filter_part_xml_create (part, rule, context) == 0) {
 						part_map->append (context, part);
@@ -255,7 +257,9 @@ rule_context_load (ERuleContext *context,
 			rule = set->children;
 			while (rule) {
 				if (!strcmp ((gchar *)rule->name, "rule")) {
-					EFilterRule *part = E_FILTER_RULE (g_object_new (rule_map->type, NULL, NULL));
+					EFilterRule *part =
+						E_FILTER_RULE (g_object_new (
+						rule_map->type, NULL, NULL));
 
 					if (e_filter_rule_xml_decode (part, rule, context) == 0) {
 						part->system = TRUE;
@@ -281,7 +285,9 @@ rule_context_load (ERuleContext *context,
 				rule = set->children;
 				while (rule) {
 					if (!strcmp ((gchar *)rule->name, "rule")) {
-						EFilterRule *part = E_FILTER_RULE (g_object_new (rule_map->type, NULL, NULL));
+						EFilterRule *part =
+							E_FILTER_RULE (g_object_new (
+							rule_map->type, NULL, NULL));
 
 						if (e_filter_rule_xml_decode (part, rule, context) == 0) {
 							rule_map->append (context, part);
@@ -384,7 +390,9 @@ rule_context_revert (ERuleContext *context,
 			rule = set->children;
 			while (rule) {
 				if (!strcmp ((gchar *)rule->name, "rule")) {
-					EFilterRule *part = E_FILTER_RULE (g_object_new (rule_map->type, NULL, NULL));
+					EFilterRule *part =
+						E_FILTER_RULE (g_object_new (
+						rule_map->type, NULL, NULL));
 
 					if (e_filter_rule_xml_decode (part, rule, context) == 0) {
 						/* use the revert data to keep track of the right rank of this rule part */
@@ -400,7 +408,10 @@ rule_context_revert (ERuleContext *context,
 								e_filter_rule_copy (frule, part);
 
 							g_object_unref (part);
-							e_rule_context_rank_rule (context, frule, frule->source, rest_data->rank);
+							e_rule_context_rank_rule (
+								context, frule,
+								frule->source,
+								rest_data->rank);
 							g_hash_table_remove (rest_data->rules, frule->name);
 						} else {
 							e_rule_context_add_rule (context, part);