Coding style and whitespace cleanup.

33 files changed, 229 insertions, 178 deletions

diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index af15470938..88e4be47e1 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -1342,9 +1342,9 @@ static void
 process_free_busy_comp_get_xfb (icalproperty *ip,
                                 gchar **summary,
                                 gchar **location)
-{	
+{
 	const gchar *tmp = NULL;
-	
+
 	g_return_if_fail (ip != NULL);
 	g_return_if_fail (summary != NULL && *summary == NULL);
 	g_return_if_fail (location != NULL && *location == NULL);
@@ -1354,13 +1354,15 @@ process_free_busy_comp_get_xfb (icalproperty *ip,
 	 * it will be displayed as a tooltip for the busy period. Otherwise,
 	 * nothing will happen (*summary and/or *location will be NULL)
 	 */
-	
-	tmp = icalproperty_get_parameter_as_string (ip, E_MEETING_FREE_BUSY_XPROP_SUMMARY);
-	*summary = e_meeting_xfb_utf8_string_new_from_ical (tmp,
-	                                                    E_MEETING_FREE_BUSY_XPROP_MAXLEN);
-	tmp = icalproperty_get_parameter_as_string (ip, E_MEETING_FREE_BUSY_XPROP_LOCATION);
-	*location = e_meeting_xfb_utf8_string_new_from_ical (tmp,
-	                                                     E_MEETING_FREE_BUSY_XPROP_MAXLEN);
+
+	tmp = icalproperty_get_parameter_as_string (
+		ip, E_MEETING_FREE_BUSY_XPROP_SUMMARY);
+	*summary = e_meeting_xfb_utf8_string_new_from_ical (
+		tmp, E_MEETING_FREE_BUSY_XPROP_MAXLEN);
+	tmp = icalproperty_get_parameter_as_string (
+		ip, E_MEETING_FREE_BUSY_XPROP_LOCATION);
+	*location = e_meeting_xfb_utf8_string_new_from_ical (
+		tmp, E_MEETING_FREE_BUSY_XPROP_MAXLEN);
 }
 
 static void
@@ -1458,22 +1460,23 @@ process_free_busy_comp (EMeetingAttendee *attendee,
 			 * for a reference.
 			 */
 			process_free_busy_comp_get_xfb (ip, &summary, &location);
-			
-			e_meeting_attendee_add_busy_period (attendee,
-							    fb.start.year,
-							    fb.start.month,
-							    fb.start.day,
-							    fb.start.hour,
-							    fb.start.minute,
-							    fb.end.year,
-							    fb.end.month,
-							    fb.end.day,
-							    fb.end.hour,
-							    fb.end.minute,
-			                                    busy_type,
-			                                    summary,
-			                                    location);
-			
+
+			e_meeting_attendee_add_busy_period (
+				attendee,
+				fb.start.year,
+				fb.start.month,
+				fb.start.day,
+				fb.start.hour,
+				fb.start.minute,
+				fb.end.year,
+				fb.end.month,
+				fb.end.day,
+				fb.end.hour,
+				fb.end.minute,
+				busy_type,
+				summary,
+				location);
+
 			if (summary != NULL)
 				g_free (summary);
 			if (location != NULL)
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 18944065e2..1e84747979 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -523,13 +523,12 @@ e_meeting_time_selector_construct (EMeetingTimeSelector *mts,
 		G_CALLBACK (e_meeting_time_selector_on_canvas_scroll_event), mts);
 	/* used for displaying extended free/busy (XFB) display when hovering
 	 * over a busy period which carries XFB information */
-	g_signal_connect (mts->display_main,
-	                  "query-tooltip",
-	                  G_CALLBACK (e_meeting_time_selector_on_canvas_query_tooltip),
-	                  mts);
-	g_object_set (G_OBJECT (mts->display_main),
-	              "has-tooltip", TRUE,
-	              NULL);
+	g_signal_connect (
+		mts->display_main, "query-tooltip",
+		G_CALLBACK (e_meeting_time_selector_on_canvas_query_tooltip),
+		mts);
+	g_object_set (
+		G_OBJECT (mts->display_main), "has-tooltip", TRUE, NULL);
 
 	scrollable = GTK_SCROLLABLE (mts->display_main);
 
@@ -2698,19 +2697,19 @@ e_meeting_time_selector_on_canvas_query_tooltip (GtkWidget *widget,
 	gint first_idx = 0;
 	gint ii = 0;
 	gchar *tt_text = NULL;
-	
+
 	g_return_val_if_fail (GNOME_IS_CANVAS (widget), FALSE);
 	g_return_val_if_fail (GTK_IS_TOOLTIP (tooltip), FALSE);
 	g_return_val_if_fail (E_IS_MEETING_TIME_SELECTOR (user_data), FALSE);
 
 	mts = E_MEETING_TIME_SELECTOR (user_data);
-	
+
 	scrollable = GTK_SCROLLABLE (widget);
 	adjustment = gtk_scrollable_get_hadjustment (scrollable);
 	scroll_x = (gint) gtk_adjustment_get_value (adjustment);
 	adjustment = gtk_scrollable_get_vadjustment (scrollable);
 	scroll_y = (gint) gtk_adjustment_get_value (adjustment);
-	
+
 	/* calculate the attendee index (row) we're at */
 	row = (scroll_y + y) / mts->row_height;
 
@@ -2730,8 +2729,8 @@ e_meeting_time_selector_on_canvas_query_tooltip (GtkWidget *widget,
 	g_return_val_if_fail (periods->len > 0, FALSE);
 
 	/* no tooltip if no busy period reaches into the current canvas area */
-	first_idx = e_meeting_attendee_find_first_busy_period (attendee,
-	                                                       &(mts->first_date_shown));
+	first_idx = e_meeting_attendee_find_first_busy_period (
+		attendee, &(mts->first_date_shown));
 	if (first_idx < 0)
 		return FALSE;
 
@@ -2746,16 +2745,15 @@ e_meeting_time_selector_on_canvas_query_tooltip (GtkWidget *widget,
 		EMeetingFreeBusyPeriod *p = NULL;
 		gint sx = 0;
 		gint ex = 0;
-		
-		p = &(g_array_index (periods,
-		                     EMeetingFreeBusyPeriod,
-		                     ii));
+
+		p = &(g_array_index (
+			periods, EMeetingFreeBusyPeriod, ii));
 		/* meeting start time x position */
-		sx = e_meeting_time_selector_calculate_time_position (mts,
-		                                                      &(p->start));
+		sx = e_meeting_time_selector_calculate_time_position (
+			mts, &(p->start));
 		/* meeting end time x position */
-		ex = e_meeting_time_selector_calculate_time_position (mts,
-		                                                      &(p->end));
+		ex = e_meeting_time_selector_calculate_time_position (
+			mts, &(p->end));
 		if ((mouse_x >= sx) && (mouse_x <= ex)) {
 			/* found busy period the mouse tip is over */
 			period = p;
@@ -2794,7 +2792,7 @@ e_meeting_time_selector_on_canvas_query_tooltip (GtkWidget *widget,
 	/* set XFB information as tooltip text */
 	gtk_tooltip_set_text (tooltip, tt_text);
 	g_free (tt_text);
-	
+
 	return TRUE;
 }
 
diff --git a/calendar/gui/e-meeting-utils.c b/calendar/gui/e-meeting-utils.c
index 2bab129b1f..733052674c 100644
--- a/calendar/gui/e-meeting-utils.c
+++ b/calendar/gui/e-meeting-utils.c
@@ -105,7 +105,7 @@ e_meeting_xfb_data_clear (EMeetingXfbData *xfb)
  * length of the resulting string, since it gets displayed as a
  * tooltip text in the meeting time selector.
  */
-gchar*
+gchar *
 e_meeting_xfb_utf8_string_new_from_ical (const gchar *icalstring,
                                          gsize max_len)
 {
@@ -132,11 +132,8 @@ e_meeting_xfb_utf8_string_new_from_ical (const gchar *icalstring,
 	/* no valid UTF-8, trying to convert to it
 	 * according to system locale
 	 */
-	tmp = g_locale_to_utf8 (icalstring,
-	                        -1,
-	                        &in_len,
-	                        &out_len,
-	                        &tmp_err);
+	tmp = g_locale_to_utf8 (
+		icalstring, -1, &in_len, &out_len, &tmp_err);
 
 	if (tmp_err == NULL)
 		goto valid;
@@ -148,8 +145,8 @@ e_meeting_xfb_utf8_string_new_from_ical (const gchar *icalstring,
 	/* still no success, forcing it into UTF-8, using
 	 * replacement chars to replace invalid ones
 	 */
-	tmp = e_util_utf8_data_make_valid (icalstring,
-	                                   strlen (icalstring));
+	tmp = e_util_utf8_data_make_valid (
+		icalstring, strlen (icalstring));
  valid:
 	if (tmp == NULL)
 		tmp = g_strdup (icalstring);
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,
diff --git a/em-format/e-mail-formatter-print.c b/em-format/e-mail-formatter-print.c
index 89f06085a8..7e15b93e0f 100644
--- a/em-format/e-mail-formatter-print.c
+++ b/em-format/e-mail-formatter-print.c
@@ -124,7 +124,7 @@ mail_formatter_print_run (EMailFormatter *formatter,
 
 	head = g_queue_peek_head_link (&queue);
 
-	for (link = head; link != NULL ; link = g_list_next (link)) {
+	for (link = head; link != NULL; link = g_list_next (link)) {
 		EMailPart *part = link->data;
 		gboolean ok;
 
diff --git a/em-format/e-mail-formatter-secure-button.c b/em-format/e-mail-formatter-secure-button.c
index c07e042533..8f66b2ee42 100644
--- a/em-format/e-mail-formatter-secure-button.c
+++ b/em-format/e-mail-formatter-secure-button.c
@@ -432,7 +432,8 @@ emfe_secure_button_get_widget (EMailFormatterExtension *extension,
 
 	g_return_val_if_fail (part != NULL, NULL);
 
-	grid = g_object_new (GTK_TYPE_GRID,
+	grid = g_object_new (
+		GTK_TYPE_GRID,
 		"orientation", GTK_ORIENTATION_VERTICAL,
 		"row-spacing", 2,
 		"halign", GTK_ALIGN_FILL,
diff --git a/em-format/e-mail-parser-inlinepgp-encrypted.c b/em-format/e-mail-parser-inlinepgp-encrypted.c
index b7d5738275..885f9151e6 100644
--- a/em-format/e-mail-parser-inlinepgp-encrypted.c
+++ b/em-format/e-mail-parser-inlinepgp-encrypted.c
@@ -76,7 +76,8 @@ empe_inlinepgp_encrypted_parse (EMailParserExtension *extension,
 			local_error->message);
 		g_error_free (local_error);
 
-		e_mail_parser_parse_part_as (parser,
+		e_mail_parser_parse_part_as (
+			parser,
 			part, part_id,
 			"application/vnd.evolution.source",
 			cancellable, out_mail_parts);
diff --git a/em-format/e-mail-part.c b/em-format/e-mail-part.c
index c0a57271b4..657b677cb9 100644
--- a/em-format/e-mail-part.c
+++ b/em-format/e-mail-part.c
@@ -178,7 +178,7 @@ e_mail_part_get_instance_size (EMailPart *part)
 
 static EMailPartValidityPair *
 mail_part_find_validity_pair (EMailPart *part,
-			      guint32 validity_type)
+                              guint32 validity_type)
 {
 	GSList *lst;
 
@@ -239,7 +239,7 @@ e_mail_part_update_validity (EMailPart *part,
  */
 CamelCipherValidity *
 e_mail_part_get_validity (EMailPart *part,
-			  guint32 validity_type)
+                          guint32 validity_type)
 {
 	EMailPartValidityPair *pair;
 
diff --git a/libemail-engine/e-mail-session-utils.c b/libemail-engine/e-mail-session-utils.c
index 94304cb6a9..60e5ebaa2f 100644
--- a/libemail-engine/e-mail-session-utils.c
+++ b/libemail-engine/e-mail-session-utils.c
@@ -578,7 +578,7 @@ mail_session_send_to_thread (GSimpleAsyncResult *simple,
 
 		if (did_connect) {
 			/* if the cancellable is cancelled, then the disconnect will not run,
-			   thus reset it to ensure the service will be properly disconnected */
+			 * thus reset it to ensure the service will be properly disconnected */
 			if (cancellable)
 				g_cancellable_reset (cancellable);
 
diff --git a/libemail-engine/e-mail-session.c b/libemail-engine/e-mail-session.c
index b195238145..0c94962a7e 100644
--- a/libemail-engine/e-mail-session.c
+++ b/libemail-engine/e-mail-session.c
@@ -169,8 +169,8 @@ user_message_exec (struct _user_message_msg *m,
 
 static void
 user_message_response_cb (GObject *source,
-			  GAsyncResult *result,
-			  gpointer user_data)
+                          GAsyncResult *result,
+                          gpointer user_data)
 {
 	struct _user_message_msg *m = user_data;
 	GError *local_error = NULL;
@@ -220,7 +220,8 @@ user_message_exec (struct _user_message_msg *m,
 		if (!m->prompter)
 			m->prompter = e_user_prompter_new ();
 
-		e_user_prompter_prompt (m->prompter, type, "",
+		e_user_prompter_prompt (
+			m->prompter, type, "",
 			m->prompt, NULL, FALSE, m->button_captions, cancellable,
 			user_message_response_cb, m);
 	} else
@@ -1374,7 +1375,7 @@ mail_session_alert_user (CamelSession *session,
                          CamelSessionAlertType type,
                          const gchar *prompt,
                          GSList *button_captions,
-			 GCancellable *cancellable)
+                         GCancellable *cancellable)
 {
 	struct _user_message_msg *m;
 	gint result = -1;
@@ -1410,11 +1411,11 @@ mail_session_alert_user (CamelSession *session,
 
 static CamelCertTrust
 mail_session_trust_prompt (CamelSession *session,
-			   const gchar *host,
-			   const gchar *certificate,
-			   guint32 certificate_errors,
-			   const GSList *issuers,
-			   GCancellable *cancellable)
+                           const gchar *host,
+                           const gchar *certificate,
+                           guint32 certificate_errors,
+                           const GSList *issuers,
+                           GCancellable *cancellable)
 {
 	EUserPrompter *prompter;
 	ENamedParameters *parameters;
diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c
index 24fc77253f..a01dc50301 100644
--- a/libemail-engine/mail-ops.c
+++ b/libemail-engine/mail-ops.c
@@ -147,11 +147,12 @@ em_filter_folder_element_exec (struct _filter_mail_msg *m,
 
 	if (g_error_matches (local_error, CAMEL_SERVICE_ERROR, CAMEL_SERVICE_ERROR_URL_INVALID) ||
 	    g_error_matches (local_error, CAMEL_FOLDER_ERROR, CAMEL_FOLDER_ERROR_INVALID)) {
-		g_set_error (error, local_error->domain, local_error->code,
+		g_set_error (
+			error, local_error->domain, local_error->code,
 			_("Failed to filter selected messages. One reason can be that folder "
-			  "location set in one or more filters is invalid. Please check your "
-			  "filters in Edit->Message Filters.\n"
-			  "Original error was: %s"), local_error->message);
+			"location set in one or more filters is invalid. Please check your "
+			"filters in Edit->Message Filters.\n"
+			"Original error was: %s"), local_error->message);
 		g_clear_error (&local_error);
 	} else if (local_error)
 		g_propagate_error (error, local_error);
@@ -749,7 +750,8 @@ mail_send_message (struct _send_queue_msg *m,
 			/* sending mail, filtering failed */
 			if (g_error_matches (local_error, CAMEL_SERVICE_ERROR, CAMEL_SERVICE_ERROR_URL_INVALID) ||
 			    g_error_matches (local_error, CAMEL_FOLDER_ERROR, CAMEL_FOLDER_ERROR_INVALID)) {
-				g_string_append_printf (err,
+				g_string_append_printf (
+					err,
 					_("Failed to apply outgoing filters. One reason can be that folder "
 					"location set in one or more filters is invalid. Please check your "
 					"filters in Edit->Message Filters.\n"
@@ -1354,7 +1356,7 @@ static MailMsgInfo sync_folder_info = {
 
 void
 mail_sync_folder (CamelFolder *folder,
-		  gboolean test_for_expunge,
+                  gboolean test_for_expunge,
                   void (*done) (CamelFolder *folder,
                                 gpointer data),
                   gpointer data)
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index 0940a78f01..342f10b70a 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -277,7 +277,7 @@ mail_backend_ready_to_quit (EActivity *activity)
 
 static gboolean
 mail_backend_service_is_enabled (ESourceRegistry *registry,
-				 CamelService *service)
+                                 CamelService *service)
 {
 	const gchar *uid;
 	ESource *source;
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index c2500a5d59..de9b3d62f8 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -1489,7 +1489,7 @@ action_mail_reply_sender_check (CamelFolder *folder,
 
 	if (message_is_list_administrative (message)) {
 		/* Do not ask for messages which are list administrative, like
-		   list confirmation messages */
+		 * list confirmation messages */
 	} else if (ask_ignore_list_reply_to || !munged_list_message) {
 		/* Don't do the "Are you sure you want to reply in private?" pop-up
 		 * if it's a Reply-To: munged list message... unless we're ignoring
diff --git a/mail/e-mail-ui-session.c b/mail/e-mail-ui-session.c
index ce15cc6587..c3dcfeba2b 100644
--- a/mail/e-mail-ui-session.c
+++ b/mail/e-mail-ui-session.c
@@ -623,7 +623,7 @@ e_mail_ui_session_alert_user (CamelSession *session,
                               CamelSessionAlertType type,
                               const gchar *prompt,
                               GSList *button_captions,
-			      GCancellable *cancellable)
+                              GCancellable *cancellable)
 {
 	struct _user_message_msg *m;
 	gint result = -1;
@@ -662,11 +662,11 @@ e_mail_ui_session_alert_user (CamelSession *session,
 
 CamelCertTrust
 e_mail_ui_session_trust_prompt (CamelSession *session,
-				const gchar *host,
-				const gchar *certificate,
-				guint32 certificate_errors,
-				const GSList *issuers,
-				GCancellable *cancellable)
+                                const gchar *host,
+                                const gchar *certificate,
+                                guint32 certificate_errors,
+                                const GSList *issuers,
+                                GCancellable *cancellable)
 {
 	g_type_ensure (E_TYPE_MAIL_UI_SESSION);
 
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 8f0da6141a..f75b83826a 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -1560,9 +1560,9 @@ emu_update_composers_security (EMsgComposer *composer,
 
 void
 em_utils_get_real_folder_uri_and_message_uid (CamelFolder *folder,
-					      const gchar *uid,
-					      gchar **folder_uri,
-					      gchar **message_uid)
+                                              const gchar *uid,
+                                              gchar **folder_uri,
+                                              gchar **message_uid)
 {
 	g_return_if_fail (folder != NULL);
 	g_return_if_fail (uid != NULL);
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 7d7f0f94f6..da0a1486b4 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -1060,7 +1060,8 @@ refresh_folders_exec (struct _refresh_folders_msg *m,
 				} else
 					full_name = (const gchar *) m->folders->pdata[i];
 
-				g_warning ("Failed to refresh folder '%s%s%s': %s",
+				g_warning (
+					"Failed to refresh folder '%s%s%s': %s",
 					account_name ? account_name : "",
 					account_name ? ": " : "",
 					full_name, local_error->message);
diff --git a/modules/backup-restore/evolution-backup-tool.c b/modules/backup-restore/evolution-backup-tool.c
index d38492a1b1..7c8fc72273 100644
--- a/modules/backup-restore/evolution-backup-tool.c
+++ b/modules/backup-restore/evolution-backup-tool.c
@@ -698,7 +698,7 @@ end:
 		txt = _("Restarting Evolution");
 
 		/* wait 5 seconds before restarting evolution, thus any
-		   changes being done are updated in source registry too */
+		 * changes being done are updated in source registry too */
 		g_usleep (G_USEC_PER_SEC * 5);
 
 		run_evolution_no_wait ();
@@ -975,7 +975,8 @@ main (gint argc,
 		gtk_widget_show (widget);
 
 		gtk_grid_attach (GTK_GRID (container), widget, 0, 0, 1, 3);
-		g_object_set (G_OBJECT (widget),
+		g_object_set (
+			G_OBJECT (widget),
 			"halign", GTK_ALIGN_FILL,
 			"valign", GTK_ALIGN_FILL,
 			"vexpand", TRUE,
@@ -1000,7 +1001,8 @@ main (gint argc,
 		g_free (markup);
 
 		gtk_grid_attach (GTK_GRID (container), widget, 1, 0, 1, 1);
-		g_object_set (G_OBJECT (widget),
+		g_object_set (
+			G_OBJECT (widget),
 			"halign", GTK_ALIGN_FILL,
 			"hexpand", TRUE,
 			"valign", GTK_ALIGN_FILL,
@@ -1016,7 +1018,8 @@ main (gint argc,
 		g_free (markup);
 
 		gtk_grid_attach (GTK_GRID (container), widget, 1, 1, 1, 1);
-		g_object_set (G_OBJECT (widget),
+		g_object_set (
+			G_OBJECT (widget),
 			"halign", GTK_ALIGN_FILL,
 			"hexpand", TRUE,
 			"valign", GTK_ALIGN_FILL,
@@ -1033,7 +1036,8 @@ main (gint argc,
 			g_free (str);
 
 			gtk_grid_attach (GTK_GRID (container), widget, 1, 2, 1, 1);
-			g_object_set (G_OBJECT (widget),
+			g_object_set (
+				G_OBJECT (widget),
 				"halign", GTK_ALIGN_FILL,
 				"hexpand", TRUE,
 				"valign", GTK_ALIGN_FILL,
@@ -1043,7 +1047,8 @@ main (gint argc,
 		} else
 			gtk_grid_attach (GTK_GRID (container), pbar, 1, 2, 1, 1);
 
-		g_object_set (G_OBJECT (pbar),
+		g_object_set (
+			G_OBJECT (pbar),
 			"halign", GTK_ALIGN_FILL,
 			"hexpand", TRUE,
 			"valign", GTK_ALIGN_FILL,
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index 1d39ad7cd2..92cb0d5814 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -126,8 +126,8 @@ action_mail_account_properties_cb (GtkAction *action,
 
 static void
 account_refresh_folder_info_received_cb (GObject *source,
-					 GAsyncResult *result,
-					 gpointer user_data)
+                                         GAsyncResult *result,
+                                         gpointer user_data)
 {
 	CamelStore *store;
 	CamelFolderInfo *info;
@@ -139,7 +139,7 @@ account_refresh_folder_info_received_cb (GObject *source,
 	info = camel_store_get_folder_info_finish (store, result, &error);
 	if (info) {
 		/* provider takes care of notifications of new/removed folders,
-		   thus it's enough to free the returned list */
+		 * thus it's enough to free the returned list */
 		camel_store_free_folder_info (store, info);
 	}
 
@@ -172,7 +172,8 @@ action_mail_account_refresh_cb (GtkAction *action,
 	activity = e_mail_reader_new_activity (reader);
 	cancellable = e_activity_get_cancellable (activity);
 
-	camel_store_get_folder_info (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE,
+	camel_store_get_folder_info (
+		store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE,
 		G_PRIORITY_DEFAULT, cancellable, account_refresh_folder_info_received_cb, activity);
 }
 
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index e5c05259a6..111014badc 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -923,7 +923,8 @@ create_new_message (CamelFolder *folder,
 	/* Create the composer */
 	composer = E_MSG_COMPOSER (em_utils_edit_message (shell, folder, new, message_uid));
 	if (composer && context->source_folder_uri && context->message_uid)
-		e_msg_composer_set_source_headers (composer, context->source_folder_uri,
+		e_msg_composer_set_source_headers (
+			composer, context->source_folder_uri,
 			context->message_uid, CAMEL_MESSAGE_ANSWERED | CAMEL_MESSAGE_SEEN);
 
 	g_object_unref (template);
@@ -1016,7 +1017,8 @@ action_reply_with_template_cb (GtkAction *action,
 	context->template_folder = g_object_ref (template_folder);
 	context->template_message_uid = g_strdup (template_message_uid);
 
-	em_utils_get_real_folder_uri_and_message_uid (folder, message_uid,
+	em_utils_get_real_folder_uri_and_message_uid (
+		folder, message_uid,
 		&context->source_folder_uri, &context->message_uid);
 
 	if (!context->message_uid)
diff --git a/shell/e-shell-searchbar.c b/shell/e-shell-searchbar.c
index b5d490df25..b62d255ec3 100644
--- a/shell/e-shell-searchbar.c
+++ b/shell/e-shell-searchbar.c
@@ -578,8 +578,8 @@ shell_searchbar_resize_idle_cb (gpointer user_data)
 
 static gboolean
 shell_searchbar_entry_focus_in_cb (GtkWidget *entry,
-				   GdkEvent *event,
-				   EShellSearchbar *searchbar)
+                                   GdkEvent *event,
+                                   EShellSearchbar *searchbar)
 {
 	/* to not change background when user changes search entry content */
 	gtk_widget_set_name (entry, "searchbar_searchentry");
@@ -589,8 +589,8 @@ shell_searchbar_entry_focus_in_cb (GtkWidget *entry,
 
 static gboolean
 shell_searchbar_entry_focus_out_cb (GtkWidget *entry,
-				    GdkEvent *event,
-				    EShellSearchbar *searchbar)
+                                    GdkEvent *event,
+                                    EShellSearchbar *searchbar)
 {
 	shell_searchbar_update_search_widgets (searchbar);
 
@@ -851,8 +851,10 @@ shell_searchbar_constructed (GObject *object)
 
 	searchbar->priv->css_provider = gtk_css_provider_new ();
 	widget = searchbar->priv->search_entry;
-	gtk_style_context_add_provider (gtk_widget_get_style_context (widget),
-		GTK_STYLE_PROVIDER (searchbar->priv->css_provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+	gtk_style_context_add_provider (
+		gtk_widget_get_style_context (widget),
+		GTK_STYLE_PROVIDER (searchbar->priv->css_provider),
+		GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 
 	action = E_SHELL_WINDOW_ACTION_SEARCH_CLEAR (shell_window);
 
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index 55f951e4f9..30bfb62291 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -1112,7 +1112,7 @@ e_cert_manager_config_new (EPreferencesWindow *window)
 
 GtkWidget *
 e_cert_manager_new_certificate_viewer (GtkWindow *parent,
-				       ECert *cert)
+                                       ECert *cert)
 {
 	GtkWidget *dialog;
 	GList *chain, *citer;
@@ -1125,7 +1125,8 @@ e_cert_manager_new_certificate_viewer (GtkWindow *parent,
 		issuers = g_slist_append (issuers, e_cert_get_internal_cert (citer->data));
 	}
 
-	dialog = certificate_viewer_new ((GtkWindow *) parent,
+	dialog = certificate_viewer_new (
+		(GtkWindow *) parent,
 		e_cert_get_internal_cert (cert),
 		issuers);
 
diff --git a/smime/gui/certificate-viewer.c b/smime/gui/certificate-viewer.c
index ce96e50d35..4fdd15e473 100644
--- a/smime/gui/certificate-viewer.c
+++ b/smime/gui/certificate-viewer.c
@@ -83,9 +83,9 @@ free_priv_struct (gpointer ptr)
 
 static void
 begin_section (GtkGrid *add_to,
-	       const gchar *caption,
-	       gint *from_row,
-	       gint for_rows)
+               const gchar *caption,
+               gint *from_row,
+               gint for_rows)
 {
 	GtkWidget *widget;
 	PangoAttribute *attr;
@@ -100,7 +100,8 @@ begin_section (GtkGrid *add_to,
 	pango_attr_list_insert (bold, attr);
 
 	widget = gtk_label_new (caption);
-	g_object_set (G_OBJECT (widget),
+	g_object_set (
+		G_OBJECT (widget),
 		"hexpand", TRUE,
 		"halign", GTK_ALIGN_START,
 		"justify", GTK_JUSTIFY_LEFT,
@@ -121,8 +122,8 @@ begin_section (GtkGrid *add_to,
 
 static GtkWidget *
 add_info_label (GtkGrid *add_to,
-		const gchar *caption,
-		gint *at_row)
+                const gchar *caption,
+                gint *at_row)
 {
 	GtkWidget *widget;
 
@@ -131,7 +132,8 @@ add_info_label (GtkGrid *add_to,
 
 	if (caption) {
 		widget = gtk_label_new (caption);
-		g_object_set (G_OBJECT (widget),
+		g_object_set (
+			G_OBJECT (widget),
 			"hexpand", FALSE,
 			"halign", GTK_ALIGN_START,
 			"justify", GTK_JUSTIFY_LEFT,
@@ -142,7 +144,8 @@ add_info_label (GtkGrid *add_to,
 	}
 
 	widget = gtk_label_new ("");
-	g_object_set (G_OBJECT (widget),
+	g_object_set (
+		G_OBJECT (widget),
 		"hexpand", TRUE,
 		"halign", GTK_ALIGN_START,
 		"justify", GTK_JUSTIFY_LEFT,
@@ -159,9 +162,9 @@ add_info_label (GtkGrid *add_to,
 
 static GtkWidget *
 add_scrolled_window (GtkGrid *add_to,
-		     const gchar *caption,
-		     gint *at_row,
-		     GtkWidget *add_widget)
+                     const gchar *caption,
+                     gint *at_row,
+                     GtkWidget *add_widget)
 {
 	GtkWidget *widget;
 	PangoAttribute *attr;
@@ -176,7 +179,8 @@ add_scrolled_window (GtkGrid *add_to,
 	pango_attr_list_insert (bold, attr);
 
 	widget = gtk_label_new (caption);
-	g_object_set (G_OBJECT (widget),
+	g_object_set (
+		G_OBJECT (widget),
 		"hexpand", TRUE,
 		"halign", GTK_ALIGN_START,
 		"justify", GTK_JUSTIFY_LEFT,
@@ -190,7 +194,8 @@ add_scrolled_window (GtkGrid *add_to,
 	(*at_row)++;
 
 	widget = gtk_scrolled_window_new (NULL, NULL);
-	g_object_set (G_OBJECT (widget),
+	g_object_set (
+		G_OBJECT (widget),
 		"hexpand", TRUE,
 		"halign", GTK_ALIGN_FILL,
 		"vexpand", TRUE,
@@ -214,9 +219,9 @@ add_scrolled_window (GtkGrid *add_to,
 
 static void
 set_label_text (GtkWidget *label,
-		const gchar *not_part_markup,
-		gchar *text,
-		guint32 flags)
+                const gchar *not_part_markup,
+                gchar *text,
+                guint32 flags)
 {
 	if (text) {
 		if ((flags & FLAG_MARKUP) != 0)
@@ -235,8 +240,8 @@ set_label_text (GtkWidget *label,
 
 static void
 get_cert_times (CERTCertificate *cert,
-		gchar **issued_on,
-		gchar **expires_on)
+                gchar **issued_on,
+                gchar **expires_on)
 {
 	PRTime time_issued_on;
 	PRTime time_expires_on;
@@ -363,7 +368,7 @@ populate_fields_tree (CertificateViewerPriv *priv,
 
 static void
 hierarchy_selection_changed_cb (GtkTreeSelection *selection,
-				CertificateViewerPriv *priv)
+                                CertificateViewerPriv *priv)
 {
 	GtkTreeIter iter;
 	GtkTreeModel *model;
@@ -402,7 +407,7 @@ hierarchy_selection_changed_cb (GtkTreeSelection *selection,
 
 static void
 fields_selection_changed_cb (GtkTreeSelection *selection,
-			     CertificateViewerPriv *priv)
+                             CertificateViewerPriv *priv)
 {
 	GtkTreeIter iter;
 	GtkTreeModel *model;
@@ -428,7 +433,8 @@ fields_selection_changed_cb (GtkTreeSelection *selection,
 
 			gtk_text_buffer_get_start_iter (textbuffer, &text_iter);
 
-			gtk_text_buffer_insert_with_tags (textbuffer, &text_iter,
+			gtk_text_buffer_insert_with_tags (
+				textbuffer, &text_iter,
 				value, strlen (value),
 				priv->monospace_tag, NULL);
 		}
@@ -537,8 +543,8 @@ get_window_title (CERTCertificate *cert)
 
 GtkWidget *
 certificate_viewer_new (GtkWindow *parent,
-			const CERTCertificate *cert,
-			const GSList *issuers_chain_certs)
+                        const CERTCertificate *cert,
+                        const GSList *issuers_chain_certs)
 {
 	CertificateViewerPriv *priv;
 	GtkWidget *dialog, *notebook, *widget;
@@ -563,7 +569,8 @@ certificate_viewer_new (GtkWindow *parent,
 
 	title = get_window_title (priv->cert);
 
-	dialog = gtk_dialog_new_with_buttons (title, parent,
+	dialog = gtk_dialog_new_with_buttons (
+		title, parent,
 		GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
 		GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
 		NULL);
@@ -579,7 +586,8 @@ certificate_viewer_new (GtkWindow *parent,
 	/* General page */
 	row = 0;
 	grid = GTK_GRID (gtk_grid_new ());
-	g_object_set (G_OBJECT (grid),
+	g_object_set (
+		G_OBJECT (grid),
 		"hexpand", TRUE,
 		"halign", GTK_ALIGN_FILL,
 		"vexpand", FALSE,
@@ -612,7 +620,8 @@ certificate_viewer_new (GtkWindow *parent,
 	}
 
 	widget = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-	g_object_set (G_OBJECT (widget),
+	g_object_set (
+		G_OBJECT (widget),
 		"hexpand", TRUE,
 		"halign", GTK_ALIGN_FILL,
 		"vexpand", FALSE,
@@ -647,7 +656,8 @@ certificate_viewer_new (GtkWindow *parent,
 	/* Details page */
 	row = 0;
 	grid = GTK_GRID (gtk_grid_new ());
-	g_object_set (G_OBJECT (grid),
+	g_object_set (
+		G_OBJECT (grid),
 		"hexpand", TRUE,
 		"halign", GTK_ALIGN_FILL,
 		"vexpand", TRUE,
@@ -657,14 +667,14 @@ certificate_viewer_new (GtkWindow *parent,
 		"column-spacing", 6,
 		NULL);
 
-	priv->cert_hierarchy_treeview = add_scrolled_window (grid,
-		_("Certificate Hierarchy"), &row, gtk_tree_view_new ());
+	priv->cert_hierarchy_treeview = add_scrolled_window (
+		grid, _("Certificate Hierarchy"), &row, gtk_tree_view_new ());
 
-	priv->cert_fields_treeview = add_scrolled_window (grid,
-		_("Certificate Fields"), &row, gtk_tree_view_new ());
+	priv->cert_fields_treeview = add_scrolled_window (
+		grid, _("Certificate Fields"), &row, gtk_tree_view_new ());
 
-	priv->cert_field_value_textview = add_scrolled_window (grid,
-		_("Field Value"), &row, gtk_text_view_new ());
+	priv->cert_field_value_textview = add_scrolled_window (
+		grid, _("Field Value"), &row, gtk_text_view_new ());
 
 	widget = gtk_label_new (_("Details"));
 	gtk_notebook_append_page (GTK_NOTEBOOK (notebook), GTK_WIDGET (grid), widget);
diff --git a/smime/lib/e-asn1-object.c b/smime/lib/e-asn1-object.c
index 7e5f27ca0c..90411d0395 100644
--- a/smime/lib/e-asn1-object.c
+++ b/smime/lib/e-asn1-object.c
@@ -770,7 +770,7 @@ create_tbs_certificate_asn1_struct (CERTCertificate *cert,
 
 static gboolean
 fill_asn1_from_cert (EASN1Object *asn1,
-		     CERTCertificate *cert)
+                     CERTCertificate *cert)
 {
 	EASN1Object *sequence;
 	SECItem temp;