Coding style and whitespace cleanup.

6 files changed, 98 insertions, 49 deletions

diff --git a/filter/e-filter-color.c b/filter/e-filter-color.c
index 3b39cabbbf..e267489b09 100644
--- a/filter/e-filter-color.c
+++ b/filter/e-filter-color.c
@@ -60,7 +60,8 @@ filter_color_xml_encode (EFilterElement *element)
 	xmlNodePtr value;
 	gchar spec[16];
 
-	g_snprintf (spec, sizeof (spec), "#%04x%04x%04x",
+	g_snprintf (
+		spec, sizeof (spec), "#%04x%04x%04x",
 		fc->color.red, fc->color.green, fc->color.blue);
 
 	value = xmlNewNode (NULL, (xmlChar *)"value");
@@ -124,7 +125,8 @@ filter_color_format_sexp (EFilterElement *element,
 	EFilterColor *fc = E_FILTER_COLOR (element);
 	gchar spec[16];
 
-	g_snprintf (spec, sizeof (spec), "#%04x%04x%04x",
+	g_snprintf (
+		spec, sizeof (spec), "#%04x%04x%04x",
 		fc->color.red, fc->color.green, fc->color.blue);
 	camel_sexp_encode_string (out, spec);
 }
diff --git a/filter/e-filter-datespec.c b/filter/e-filter-datespec.c
index 2464dd2bbf..8cf01d664f 100644
--- a/filter/e-filter-datespec.c
+++ b/filter/e-filter-datespec.c
@@ -286,11 +286,14 @@ button_clicked (GtkButton *button,
 	toplevel = e_builder_get_widget (builder, "filter_datespec");
 
 	dialog = (GtkDialog *) gtk_dialog_new ();
-	gtk_window_set_title ((GtkWindow *) dialog, _("Select a time to compare against"));
-	gtk_dialog_add_buttons (dialog,
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				GTK_STOCK_OK, GTK_RESPONSE_OK,
-				NULL);
+	gtk_window_set_title (
+		GTK_WINDOW (dialog),
+		_("Select a time to compare against"));
+	gtk_dialog_add_buttons (
+		dialog,
+		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+		GTK_STOCK_OK, GTK_RESPONSE_OK,
+		NULL);
 
 	p->notebook_type = e_builder_get_widget (builder, "notebook_type");
 	p->combobox_type = e_builder_get_widget (builder, "combobox_type");
diff --git a/filter/e-filter-option.c b/filter/e-filter-option.c
index e11d384927..630ab31916 100644
--- a/filter/e-filter-option.c
+++ b/filter/e-filter-option.c
@@ -117,8 +117,9 @@ filter_option_generate_code (EFilterOption *option,
 	if (g_module_symbol (module, option->current->code_gen_func, (gpointer) &code_gen_func)) {
 		code_gen_func (E_FILTER_ELEMENT (option), out, part);
 	} else {
-		g_warning ("optionlist dynamic code function '%s' not found",
-			   option->current->code_gen_func);
+		g_warning (
+			"optionlist dynamic code function '%s' not found",
+			option->current->code_gen_func);
 	}
 
 	g_module_close (module);
@@ -189,7 +190,8 @@ filter_option_xml_create (EFilterElement *element,
 					}
 				} else if (!strcmp ((gchar *) work->name, "code")) {
 					if (code || code_gen_func) {
-						g_warning ("Element 'code' defined twice in '%s'",
+						g_warning (
+							"Element 'code' defined twice in '%s'",
 							element->name);
 					} else {
 						xmlChar *fn;
diff --git a/filter/e-filter-rule.c b/filter/e-filter-rule.c
index 4d27ab1ae0..548fe4cc87 100644
--- a/filter/e-filter-rule.c
+++ b/filter/e-filter-rule.c
@@ -214,16 +214,18 @@ attach_rule (GtkWidget *rule,
 {
 	GtkWidget *remove;
 
-	gtk_table_attach (GTK_TABLE (data->parts), rule, 0, 1, row, row + 1,
-			  GTK_EXPAND | GTK_FILL, 0, 0, 0);
+	gtk_table_attach (
+		GTK_TABLE (data->parts), rule, 0, 1, row, row + 1,
+		GTK_EXPAND | GTK_FILL, 0, 0, 0);
 
 	remove = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
 	g_object_set_data ((GObject *) remove, "rule", rule);
 	g_signal_connect (
 		remove, "clicked",
 		G_CALLBACK (less_parts), data);
-	gtk_table_attach (GTK_TABLE (data->parts), remove, 1, 2, row, row + 1,
-			  0, 0, 0, 0);
+	gtk_table_attach (
+		GTK_TABLE (data->parts), remove, 1, 2, row, row + 1,
+		0, 0, 0, 0);
 
 	gtk_widget_show (remove);
 }
@@ -660,7 +662,8 @@ ensure_scrolled_width_cb (GtkAdjustment *adj,
                           GParamSpec *param_spec,
                           GtkScrolledWindow *scrolled_window)
 {
-	gtk_scrolled_window_set_min_content_width (scrolled_window,
+	gtk_scrolled_window_set_min_content_width (
+		scrolled_window,
 		gtk_adjustment_get_upper (adj));
 }
 
@@ -816,7 +819,8 @@ filter_rule_get_widget (EFilterRule *rule,
 
 		gtk_container_add (GTK_CONTAINER (vgrid), GTK_WIDGET (hgrid));
 	} else {
-		text = g_strdup_printf ("<b>%s</b>",
+		text = g_strdup_printf (
+			"<b>%s</b>",
 			_("Find items that meet the following conditions"));
 		label = gtk_label_new (text);
 		gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
diff --git a/filter/e-rule-context.c b/filter/e-rule-context.c
index 0f41b52c04..714c37f1c9 100644
--- a/filter/e-rule-context.c
+++ b/filter/e-rule-context.c
@@ -812,10 +812,11 @@ e_rule_context_add_rule_gui (ERuleContext *context,
 	gtk_widget_show (widget);
 
 	dialog =(GtkDialog *) gtk_dialog_new ();
-	gtk_dialog_add_buttons (dialog,
-			       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-			       GTK_STOCK_OK, GTK_RESPONSE_OK,
-			       NULL);
+	gtk_dialog_add_buttons (
+		dialog,
+		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+		GTK_STOCK_OK, GTK_RESPONSE_OK,
+		NULL);
 
 	gtk_window_set_title ((GtkWindow *) dialog, title);
 	gtk_window_set_default_size ((GtkWindow *) dialog, 600, 400);
diff --git a/filter/e-rule-editor.c b/filter/e-rule-editor.c
index 58ffdc14cd..d3a92b3693 100644
--- a/filter/e-rule-editor.c
+++ b/filter/e-rule-editor.c
@@ -156,30 +156,44 @@ add_editor_response (GtkWidget *dialog,
 		}
 
 		if (e_rule_context_find_rule (editor->context, editor->edit->name, editor->edit->source)) {
-			e_alert_run_dialog_for_args ((GtkWindow *) dialog,
-						     "filter:bad-name-notunique",
-						     editor->edit->name, NULL);
+			e_alert_run_dialog_for_args (
+				GTK_WINDOW (dialog),
+				"filter:bad-name-notunique",
+				editor->edit->name, NULL);
 			return;
 		}
 
 		g_object_ref (editor->edit);
 
 		gtk_list_store_append (editor->model, &iter);
-		gtk_list_store_set (editor->model, &iter, 0, editor->edit->name, 1, editor->edit, 2, editor->edit->enabled, -1);
+		gtk_list_store_set (
+			editor->model, &iter,
+			0, editor->edit->name,
+			1, editor->edit,
+			2, editor->edit->enabled, -1);
 		selection = gtk_tree_view_get_selection (editor->list);
 		gtk_tree_selection_select_iter (selection, &iter);
 
 		/* scroll to the newly added row */
-		path = gtk_tree_model_get_path ((GtkTreeModel *) editor->model, &iter);
-		gtk_tree_view_scroll_to_cell (editor->list, path, NULL, TRUE, 1.0, 0.0);
+		path = gtk_tree_model_get_path (
+			GTK_TREE_MODEL (editor->model), &iter);
+		gtk_tree_view_scroll_to_cell (
+			editor->list, path, NULL, TRUE, 1.0, 0.0);
 		gtk_tree_path_free (path);
 
 		editor->current = editor->edit;
 		e_rule_context_add_rule (editor->context, editor->current);
 
 		g_object_ref (editor->current);
-		rule_editor_add_undo (editor, E_RULE_EDITOR_LOG_ADD, editor->current,
-				      e_rule_context_get_rank_rule (editor->context, editor->current, editor->current->source), 0);
+		rule_editor_add_undo (
+			editor,
+			E_RULE_EDITOR_LOG_ADD,
+			editor->current,
+			e_rule_context_get_rank_rule (
+				editor->context,
+				editor->current,
+				editor->current->source),
+			0);
 	}
 
 	gtk_widget_destroy (dialog);
@@ -265,10 +279,11 @@ rule_add (GtkWidget *widget,
 	rules = e_filter_rule_get_widget (editor->edit, editor->context);
 
 	editor->dialog = gtk_dialog_new ();
-	gtk_dialog_add_buttons ((GtkDialog *) editor->dialog,
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				GTK_STOCK_OK, GTK_RESPONSE_OK,
-				NULL);
+	gtk_dialog_add_buttons (
+		GTK_DIALOG (editor->dialog),
+		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+		GTK_STOCK_OK, GTK_RESPONSE_OK,
+		NULL);
 
 	gtk_window_set_title ((GtkWindow *) editor->dialog, _("Add Rule"));
 	gtk_window_set_default_size (GTK_WINDOW (editor->dialog), 650, 400);
@@ -312,26 +327,39 @@ edit_editor_response (GtkWidget *dialog,
 			return;
 		}
 
-		rule = e_rule_context_find_rule (editor->context, editor->edit->name, editor->edit->source);
-		if (rule != NULL && rule != editor->current) {
-			e_alert_run_dialog_for_args ((GtkWindow *) dialog,
-						     "filter:bad-name-notunique",
-						     rule->name, NULL);
+		rule = e_rule_context_find_rule (
+			editor->context,
+			editor->edit->name,
+			editor->edit->source);
 
+		if (rule != NULL && rule != editor->current) {
+			e_alert_run_dialog_for_args (
+				GTK_WINDOW (dialog),
+				"filter:bad-name-notunique",
+				rule->name, NULL);
 			return;
 		}
 
-		pos = e_rule_context_get_rank_rule (editor->context, editor->current, editor->source);
+		pos = e_rule_context_get_rank_rule (
+			editor->context,
+			editor->current,
+			editor->source);
+
 		if (pos != -1) {
 			path = gtk_tree_path_new ();
 			gtk_tree_path_append_index (path, pos);
-			gtk_tree_model_get_iter (GTK_TREE_MODEL (editor->model), &iter, path);
+			gtk_tree_model_get_iter (
+				GTK_TREE_MODEL (editor->model), &iter, path);
 			gtk_tree_path_free (path);
 
-			gtk_list_store_set (editor->model, &iter, 0, editor->edit->name, -1);
+			gtk_list_store_set (
+				editor->model, &iter,
+				0, editor->edit->name, -1);
 
-			rule_editor_add_undo (editor, E_RULE_EDITOR_LOG_EDIT, e_filter_rule_clone (editor->current),
-					      pos, 0);
+			rule_editor_add_undo (
+				editor, E_RULE_EDITOR_LOG_EDIT,
+				e_filter_rule_clone (editor->current),
+				pos, 0);
 
 			/* replace the old rule with the new rule */
 			e_filter_rule_copy (editor->current, editor->edit);
@@ -358,7 +386,8 @@ rule_edit (GtkWidget *widget,
 	rules = e_filter_rule_get_widget (editor->edit, editor->context);
 
 	editor->dialog = gtk_dialog_new ();
-	gtk_dialog_add_buttons ((GtkDialog *) editor->dialog,
+	gtk_dialog_add_buttons (
+		(GtkDialog *) editor->dialog,
 				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 				GTK_STOCK_OK, GTK_RESPONSE_OK,
 				NULL);
@@ -412,8 +441,15 @@ rule_delete (GtkWidget *widget,
 		gtk_list_store_remove (editor->model, &iter);
 		gtk_tree_path_free (path);
 
-		rule_editor_add_undo (editor, E_RULE_EDITOR_LOG_REMOVE, delete_rule,
-				      e_rule_context_get_rank_rule (editor->context, delete_rule, delete_rule->source), 0);
+		rule_editor_add_undo (
+			editor,
+			E_RULE_EDITOR_LOG_REMOVE,
+			delete_rule,
+			e_rule_context_get_rank_rule (
+				editor->context,
+				delete_rule,
+				delete_rule->source),
+			0);
 #if 0
 		g_object_unref (delete_rule);
 #endif
@@ -876,8 +912,9 @@ e_rule_editor_construct (ERuleEditor *editor,
 		G_CALLBACK (editor_response), editor);
 	rule_editor_set_source (editor, source);
 
-	gtk_dialog_add_buttons ((GtkDialog *) editor,
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				GTK_STOCK_OK, GTK_RESPONSE_OK,
-				NULL);
+	gtk_dialog_add_buttons (
+		GTK_DIALOG (editor),
+		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+		GTK_STOCK_OK, GTK_RESPONSE_OK,
+		NULL);
 }