Coding style and whitespace cleanup.

11 files changed, 63 insertions, 37 deletions

diff --git a/e-util/e-attachment.c b/e-util/e-attachment.c
index 3357775111..22ad0be653 100644
--- a/e-util/e-attachment.c
+++ b/e-util/e-attachment.c
@@ -2020,7 +2020,7 @@ e_attachment_load_handle_error (EAttachment *attachment,
 
 gboolean
 e_attachment_load (EAttachment *attachment,
-		   GError **error)
+                   GError **error)
 {
 	EAsyncClosure *closure;
 	GAsyncResult *result;
@@ -2321,8 +2321,8 @@ e_attachment_open_handle_error (EAttachment *attachment,
 
 gboolean
 e_attachment_open (EAttachment *attachment,
-		   GAppInfo *app_info,
-		   GError **error)
+                   GAppInfo *app_info,
+                   GError **error)
 {
 	EAsyncClosure *closure;
 	GAsyncResult *result;
@@ -2858,9 +2858,9 @@ e_attachment_save_handle_error (EAttachment *attachment,
 
 gboolean
 e_attachment_save (EAttachment *attachment,
-		   GFile *in_destination,
-		   GFile **out_destination,
-		   GError **error)
+                   GFile *in_destination,
+                   GFile **out_destination,
+                   GError **error)
 {
 	EAsyncClosure *closure;
 	GAsyncResult *result;
diff --git a/e-util/e-categories-editor.c b/e-util/e-categories-editor.c
index ecbebf6083..8d22383f5a 100644
--- a/e-util/e-categories-editor.c
+++ b/e-util/e-categories-editor.c
@@ -239,7 +239,8 @@ e_categories_editor_init (ECategoriesEditor *editor)
 	gtk_misc_set_alignment (GTK_MISC (label2), 0, 0.5);
 
 	scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
-	g_object_set (G_OBJECT (scrolledwindow1),
+	g_object_set (
+		G_OBJECT (scrolledwindow1),
 		"hexpand", TRUE,
 		"halign", GTK_ALIGN_FILL,
 		"vexpand", TRUE,
@@ -263,7 +264,8 @@ e_categories_editor_init (ECategoriesEditor *editor)
 		G_CALLBACK (category_checked_cb), editor);
 
 	hbuttonbox1 = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
-	g_object_set (G_OBJECT (hbuttonbox1),
+	g_object_set (
+		G_OBJECT (hbuttonbox1),
 		"hexpand", TRUE,
 		"halign", GTK_ALIGN_FILL,
 		NULL);
diff --git a/e-util/e-name-selector-dialog.c b/e-util/e-name-selector-dialog.c
index ece556b0a9..0a647637a8 100644
--- a/e-util/e-name-selector-dialog.c
+++ b/e-util/e-name-selector-dialog.c
@@ -268,7 +268,8 @@ name_selector_dialog_constructed (GObject *object)
 	/* Chain up to parent's constructed() method. */
 	G_OBJECT_CLASS (e_name_selector_dialog_parent_class)->constructed (object);
 
-	name_selector_grid = g_object_new (GTK_TYPE_GRID,
+	name_selector_grid = g_object_new (
+		GTK_TYPE_GRID,
 		"orientation", GTK_ORIENTATION_VERTICAL,
 		"column-homogeneous", FALSE,
 		"row-spacing", 6,
@@ -284,7 +285,8 @@ name_selector_dialog_constructed (GObject *object)
 	gtk_misc_set_alignment (GTK_MISC (show_contacts_label), 0, 0.5);
 	g_free (tmp_str);
 
-	hgrid = g_object_new (GTK_TYPE_GRID,
+	hgrid = g_object_new (
+		GTK_TYPE_GRID,
 		"orientation", GTK_ORIENTATION_HORIZONTAL,
 		"row-homogeneous", FALSE,
 		"column-spacing", 12,
@@ -299,7 +301,8 @@ name_selector_dialog_constructed (GObject *object)
 	show_contacts_grid = gtk_grid_new ();
 	gtk_widget_show (show_contacts_grid);
 	gtk_container_add (GTK_CONTAINER (hgrid), show_contacts_grid);
-	g_object_set (G_OBJECT (show_contacts_grid),
+	g_object_set (
+		G_OBJECT (show_contacts_grid),
 		"column-spacing", 12,
 		"row-spacing", 6,
 		"hexpand", TRUE,
@@ -320,7 +323,8 @@ name_selector_dialog_constructed (GObject *object)
 	gtk_label_set_justify (GTK_LABEL (label_category), GTK_JUSTIFY_CENTER);
 	gtk_misc_set_alignment (GTK_MISC (label_category), 0, 0.5);
 
-	hgrid = g_object_new (GTK_TYPE_GRID,
+	hgrid = g_object_new (
+		GTK_TYPE_GRID,
 		"orientation", GTK_ORIENTATION_HORIZONTAL,
 		"row-homogeneous", FALSE,
 		"column-spacing", 12,
@@ -342,7 +346,8 @@ name_selector_dialog_constructed (GObject *object)
 	gtk_widget_set_halign (label_search, GTK_ALIGN_FILL);
 	gtk_misc_set_alignment (GTK_MISC (label_search), 0, 0.5);
 
-	source_menu_hgrid = g_object_new (GTK_TYPE_GRID,
+	source_menu_hgrid = g_object_new (
+		GTK_TYPE_GRID,
 		"orientation", GTK_ORIENTATION_HORIZONTAL,
 		"row-homogeneous", FALSE,
 		"column-spacing", 0,
@@ -354,7 +359,8 @@ name_selector_dialog_constructed (GObject *object)
 
 	combobox_category = gtk_combo_box_text_new ();
 	gtk_widget_show (combobox_category);
-	g_object_set (G_OBJECT (combobox_category),
+	g_object_set (
+		G_OBJECT (combobox_category),
 		"halign", GTK_ALIGN_FILL,
 		"valign", GTK_ALIGN_FILL,
 		NULL);
@@ -380,7 +386,8 @@ name_selector_dialog_constructed (GObject *object)
 		GTK_SCROLLED_WINDOW (scrolledwindow0),
 		GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
-	hgrid = g_object_new (GTK_TYPE_GRID,
+	hgrid = g_object_new (
+		GTK_TYPE_GRID,
 		"orientation", GTK_ORIENTATION_HORIZONTAL,
 		"row-homogeneous", FALSE,
 		"column-spacing", 12,
@@ -412,7 +419,8 @@ name_selector_dialog_constructed (GObject *object)
 	gtk_tree_view_set_enable_search (
 		GTK_TREE_VIEW (source_tree_view), FALSE);
 
-	destination_vgrid = g_object_new (GTK_TYPE_GRID,
+	destination_vgrid = g_object_new (
+		GTK_TYPE_GRID,
 		"orientation", GTK_ORIENTATION_VERTICAL,
 		"column-homogeneous", TRUE,
 		"row-spacing", 6,
@@ -851,7 +859,8 @@ setup_section_button (ENameSelectorDialog *name_selector_dialog,
 	alignment = gtk_alignment_new (halign, 0.5, 0.0, 0.0);
 	gtk_container_add (GTK_CONTAINER (button), GTK_WIDGET (alignment));
 
-	hgrid = g_object_new (GTK_TYPE_GRID,
+	hgrid = g_object_new (
+		GTK_TYPE_GRID,
 		"orientation", GTK_ORIENTATION_HORIZONTAL,
 		"row-homogeneous", FALSE,
 		"column-spacing", 2,
@@ -899,7 +908,8 @@ add_section (ENameSelectorDialog *name_selector_dialog,
 	memset (&section, 0, sizeof (Section));
 
 	section.name = g_strdup (name);
-	section.section_grid = g_object_new (GTK_TYPE_GRID,
+	section.section_grid = g_object_new (
+		GTK_TYPE_GRID,
 		"orientation", GTK_ORIENTATION_HORIZONTAL,
 		"row-homogeneous", FALSE,
 		"column-spacing", 12,
@@ -942,7 +952,8 @@ add_section (ENameSelectorDialog *name_selector_dialog,
 	alignment = gtk_alignment_new (0.5, 0.0, 0.0, 0.0);
 	gtk_container_add (GTK_CONTAINER (section.section_grid), alignment);
 
-	vgrid = g_object_new (GTK_TYPE_GRID,
+	vgrid = g_object_new (
+		GTK_TYPE_GRID,
 		"orientation", GTK_ORIENTATION_VERTICAL,
 		"column-homogeneous", TRUE,
 		"row-spacing", 6,
@@ -964,7 +975,8 @@ add_section (ENameSelectorDialog *name_selector_dialog,
 	 * spacing.
 	 */
 
-	hgrid = g_object_new (GTK_TYPE_GRID,
+	hgrid = g_object_new (
+		GTK_TYPE_GRID,
 		"orientation", GTK_ORIENTATION_HORIZONTAL,
 		"row-homogeneous", FALSE,
 		"column-spacing", 6,
@@ -1016,7 +1028,8 @@ add_section (ENameSelectorDialog *name_selector_dialog,
 
 	/* Pack this section's box into the dialog */
 	gtk_container_add (GTK_CONTAINER (name_selector_dialog->priv->destination_vgrid), GTK_WIDGET (section.section_grid));
-	g_object_set (G_OBJECT (section.section_grid),
+	g_object_set (
+		G_OBJECT (section.section_grid),
 		"vexpand", TRUE,
 		"valign", GTK_ALIGN_FILL,
 		NULL);
diff --git a/e-util/e-name-selector-list.c b/e-util/e-name-selector-list.c
index 67afb504b3..180dfbf986 100644
--- a/e-util/e-name-selector-list.c
+++ b/e-util/e-name-selector-list.c
@@ -93,7 +93,7 @@ static gboolean
 popup_grab_on_window (GdkWindow *window,
                       GdkDevice *keyboard,
                       GdkDevice *pointer,
-                      guint32    activate_time)
+                      guint32 activate_time)
 {
 	if (keyboard && gdk_device_grab (keyboard, window,
 			GDK_OWNERSHIP_WINDOW, TRUE,
@@ -117,7 +117,7 @@ popup_grab_on_window (GdkWindow *window,
 
 static void
 enl_popup_grab (ENameSelectorList *list,
-		const GdkEvent *event)
+                const GdkEvent *event)
 {
 	EDestinationStore *store;
 	ENameSelectorEntry *entry;
@@ -740,7 +740,8 @@ e_name_selector_list_init (ENameSelectorList *list)
 
 	gtk_container_add (GTK_CONTAINER (list->priv->popup), popup_frame);
 
-	vgrid = g_object_new (GTK_TYPE_GRID,
+	vgrid = g_object_new (
+		GTK_TYPE_GRID,
 		"orientation", GTK_ORIENTATION_VERTICAL,
 		"column-homogeneous", FALSE,
 		"row-spacing", 0,
diff --git a/e-util/e-passwords.c b/e-util/e-passwords.c
index 89dc39ef5b..4a54942dba 100644
--- a/e-util/e-passwords.c
+++ b/e-util/e-passwords.c
@@ -500,7 +500,8 @@ ep_ask_password (EPassMsg *msg)
 	widget = gtk_image_new_from_icon_name (
 		"dialog-password", GTK_ICON_SIZE_DIALOG);
 	gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.0);
-	g_object_set (G_OBJECT (widget),
+	g_object_set (
+		G_OBJECT (widget),
 		"halign", GTK_ALIGN_FILL,
 		"vexpand", TRUE,
 		"valign", GTK_ALIGN_FILL,
@@ -514,7 +515,8 @@ ep_ask_password (EPassMsg *msg)
 	gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
 	gtk_label_set_markup (GTK_LABEL (widget), msg->prompt);
 	gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
-	g_object_set (G_OBJECT (widget),
+	g_object_set (
+		G_OBJECT (widget),
 		"hexpand", TRUE,
 		"halign", GTK_ALIGN_FILL,
 		NULL);
@@ -530,7 +532,8 @@ ep_ask_password (EPassMsg *msg)
 	gtk_entry_set_visibility (GTK_ENTRY (widget), visible);
 	gtk_entry_set_activates_default (GTK_ENTRY (widget), TRUE);
 	gtk_widget_grab_focus (widget);
-	g_object_set (G_OBJECT (widget),
+	g_object_set (
+		G_OBJECT (widget),
 		"hexpand", TRUE,
 		"halign", GTK_ALIGN_FILL,
 		NULL);
@@ -550,7 +553,8 @@ ep_ask_password (EPassMsg *msg)
 
 	/* Caps Lock Label */
 	widget = gtk_label_new (NULL);
-	g_object_set (G_OBJECT (widget),
+	g_object_set (
+		G_OBJECT (widget),
 		"hexpand", TRUE,
 		"halign", GTK_ALIGN_FILL,
 		NULL);
@@ -586,7 +590,8 @@ ep_ask_password (EPassMsg *msg)
 			GTK_TOGGLE_BUTTON (widget), *msg->remember);
 		if (msg->flags & E_PASSWORDS_DISABLE_REMEMBER)
 			gtk_widget_set_sensitive (widget, FALSE);
-		g_object_set (G_OBJECT (widget),
+		g_object_set (
+			G_OBJECT (widget),
 			"hexpand", TRUE,
 			"halign", GTK_ALIGN_FILL,
 			"valign", GTK_ALIGN_FILL,
diff --git a/e-util/e-source-selector-dialog.c b/e-util/e-source-selector-dialog.c
index 68e29fd13c..29ceaebbf7 100644
--- a/e-util/e-source-selector-dialog.c
+++ b/e-util/e-source-selector-dialog.c
@@ -214,7 +214,8 @@ source_selector_dialog_constructed (GObject *object)
 
 	container = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
-	widget = g_object_new (GTK_TYPE_GRID,
+	widget = g_object_new (
+		GTK_TYPE_GRID,
 		"orientation", GTK_ORIENTATION_VERTICAL,
 		"column-homogeneous", FALSE,
 		"row-spacing", 12,
@@ -233,7 +234,8 @@ source_selector_dialog_constructed (GObject *object)
 	gtk_widget_show (label);
 	g_free (label_text);
 
-	hgrid = g_object_new (GTK_TYPE_GRID,
+	hgrid = g_object_new (
+		GTK_TYPE_GRID,
 		"orientation", GTK_ORIENTATION_HORIZONTAL,
 		"row-homogeneous", FALSE,
 		"column-spacing", 12,
diff --git a/e-util/e-spell-entry.h b/e-util/e-spell-entry.h
index 5da4696168..5b1ca11779 100644
--- a/e-util/e-spell-entry.h
+++ b/e-util/e-spell-entry.h
@@ -27,7 +27,7 @@
 
 /* Standard GObject macros */
 #define E_TYPE_SPELL_ENTRY \
-	(e_spell_entry_get_type())
+	(e_spell_entry_get_type ())
 #define E_SPELL_ENTRY(obj) \
 	(G_TYPE_CHECK_INSTANCE_CAST \
 	((obj), E_TYPE_SPELL_ENTRY, ESpellEntry))
diff --git a/e-util/e-table-item.h b/e-util/e-table-item.h
index 04629b4af1..656c46b0a7 100644
--- a/e-util/e-table-item.h
+++ b/e-util/e-table-item.h
@@ -165,10 +165,10 @@ struct _ETableItem {
 	 * During editing
 	 */
 	gint editing_col, editing_row;
-	void *edit_ctx;
+	gpointer edit_ctx;
 
 	gint save_col, save_row;
-	void *save_state;
+	gpointer save_state;
 
 	gint grabbed_col, grabbed_row;
 	gint grabbed_count;
diff --git a/e-util/test-category-completion.c b/e-util/test-category-completion.c
index d9e14731e1..b25b364d84 100644
--- a/e-util/test-category-completion.c
+++ b/e-util/test-category-completion.c
@@ -33,7 +33,8 @@ on_idle_create_widget (void)
 		window, "delete-event",
 		G_CALLBACK (gtk_main_quit), NULL);
 
-	vgrid = g_object_new (GTK_TYPE_GRID,
+	vgrid = g_object_new (
+		GTK_TYPE_GRID,
 		"orientation", GTK_ORIENTATION_VERTICAL,
 		"column-homogeneous", FALSE,
 		"row-spacing", 3,
diff --git a/e-util/test-contact-store.c b/e-util/test-contact-store.c
index 59ba42502b..4ec84567ee 100644
--- a/e-util/test-contact-store.c
+++ b/e-util/test-contact-store.c
@@ -72,7 +72,8 @@ start_test (const gchar *param)
 
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
-	vgrid = g_object_new (GTK_TYPE_GRID,
+	vgrid = g_object_new (
+		GTK_TYPE_GRID,
 		"orientation", GTK_ORIENTATION_VERTICAL,
 		"column-homogeneous", FALSE,
 		"row-spacing", 2,
diff --git a/e-util/test-source-selector.c b/e-util/test-source-selector.c
index 0c1a77289e..8f44af3bb1 100644
--- a/e-util/test-source-selector.c
+++ b/e-util/test-source-selector.c
@@ -76,7 +76,8 @@ on_idle_create_widget (ESourceRegistry *registry)
 		window, "delete-event",
 		G_CALLBACK (gtk_main_quit), NULL);
 
-	vgrid = g_object_new (GTK_TYPE_GRID,
+	vgrid = g_object_new (
+		GTK_TYPE_GRID,
 		"orientation", GTK_ORIENTATION_VERTICAL,
 		"column-homogeneous", FALSE,
 		"row-spacing", 6,