Coding style and whitespace cleanup.

41 files changed, 1261 insertions, 997 deletions

diff --git a/widgets/misc/e-action-combo-box.c b/widgets/misc/e-action-combo-box.c
index d34409b5fd..cd99c346fb 100644
--- a/widgets/misc/e-action-combo-box.c
+++ b/widgets/misc/e-action-combo-box.c
@@ -253,7 +253,7 @@ action_combo_box_update_model (EActionComboBox *combo_box)
 		g_free (stock_id);
 
 		gtk_list_store_append (list_store, &iter);
-		g_object_get (G_OBJECT (action), "value", &value, NULL);
+		g_object_get (action, "value", &value, NULL);
 		gtk_list_store_set (
 			list_store, &iter, COLUMN_ACTION,
 			list->data, COLUMN_SORT, (gfloat) value, -1);
@@ -395,7 +395,7 @@ action_combo_box_changed (GtkComboBox *combo_box)
 
 	model = gtk_combo_box_get_model (combo_box);
 	gtk_tree_model_get (model, &iter, COLUMN_ACTION, &action, -1);
-	g_object_get (G_OBJECT (action), "value", &value, NULL);
+	g_object_get (action, "value", &value, NULL);
 	gtk_radio_action_set_current_value (action, value);
 }
 
diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c
index 5073d582fc..ccd135e5a0 100644
--- a/widgets/misc/e-attachment.c
+++ b/widgets/misc/e-attachment.c
@@ -101,7 +101,8 @@ G_DEFINE_TYPE (
 	G_TYPE_OBJECT)
 
 static gboolean
-create_system_thumbnail (EAttachment *attachment, GIcon **icon)
+create_system_thumbnail (EAttachment *attachment,
+                         GIcon **icon)
 {
 	GFile *file;
 	GFile *icon_file;
diff --git a/widgets/misc/e-buffer-tagger.c b/widgets/misc/e-buffer-tagger.c
index cf2944fde8..bc05525737 100644
--- a/widgets/misc/e-buffer-tagger.c
+++ b/widgets/misc/e-buffer-tagger.c
@@ -134,13 +134,16 @@ get_state (GtkTextBuffer *buffer)
 }
 
 static void
-set_state (GtkTextBuffer *buffer, guint32 state)
+set_state (GtkTextBuffer *buffer,
+           guint32 state)
 {
 	g_object_set_data (G_OBJECT (buffer), E_BUFFER_TAGGER_DATA_STATE, GINT_TO_POINTER (state));
 }
 
 static void
-update_state (GtkTextBuffer *buffer, guint32 value, gboolean do_set)
+update_state (GtkTextBuffer *buffer,
+              guint32 value,
+              gboolean do_set)
 {
 	guint32 state;
 
@@ -158,7 +161,10 @@ update_state (GtkTextBuffer *buffer, guint32 value, gboolean do_set)
 }
 
 static gboolean
-get_tag_bounds (GtkTextIter *iter, GtkTextTag *tag, GtkTextIter *start, GtkTextIter *end)
+get_tag_bounds (GtkTextIter *iter,
+                GtkTextTag *tag,
+                GtkTextIter *start,
+                GtkTextIter *end)
 {
 	gboolean res = FALSE;
 
@@ -184,7 +190,8 @@ get_tag_bounds (GtkTextIter *iter, GtkTextTag *tag, GtkTextIter *start, GtkTextI
 }
 
 static gchar *
-get_url_at_iter (GtkTextBuffer *buffer, GtkTextIter *iter)
+get_url_at_iter (GtkTextBuffer *buffer,
+                 GtkTextIter *iter)
 {
 	GtkTextTagTable *tag_table;
 	GtkTextTag *tag;
@@ -204,7 +211,8 @@ get_url_at_iter (GtkTextBuffer *buffer, GtkTextIter *iter)
 }
 
 static gboolean
-invoke_link_if_present (GtkTextBuffer *buffer, GtkTextIter *iter)
+invoke_link_if_present (GtkTextBuffer *buffer,
+                        GtkTextIter *iter)
 {
 	gboolean res;
 	gchar *url;
@@ -223,7 +231,8 @@ invoke_link_if_present (GtkTextBuffer *buffer, GtkTextIter *iter)
 }
 
 static void
-remove_tag_if_present (GtkTextBuffer *buffer, GtkTextIter *where)
+remove_tag_if_present (GtkTextBuffer *buffer,
+                       GtkTextIter *where)
 {
 	GtkTextTagTable *tag_table;
 	GtkTextTag *tag;
@@ -241,14 +250,21 @@ remove_tag_if_present (GtkTextBuffer *buffer, GtkTextIter *where)
 }
 
 static void
-buffer_insert_text (GtkTextBuffer *buffer, GtkTextIter *location, gchar *text, gint len, gpointer user_data)
+buffer_insert_text (GtkTextBuffer *buffer,
+                    GtkTextIter *location,
+                    gchar *text,
+                    gint len,
+                    gpointer user_data)
 {
 	update_state (buffer, E_BUFFER_TAGGER_STATE_INSDEL, TRUE);
 	remove_tag_if_present (buffer, location);
 }
 
 static void
-buffer_delete_range (GtkTextBuffer *buffer, GtkTextIter *start, GtkTextIter *end, gpointer user_data)
+buffer_delete_range (GtkTextBuffer *buffer,
+                     GtkTextIter *start,
+                     GtkTextIter *end,
+                     gpointer user_data)
 {
 	update_state (buffer, E_BUFFER_TAGGER_STATE_INSDEL, TRUE);
 	remove_tag_if_present (buffer, start);
@@ -256,7 +272,8 @@ buffer_delete_range (GtkTextBuffer *buffer, GtkTextIter *start, GtkTextIter *end
 }
 
 static void
-buffer_cursor_position (GtkTextBuffer *buffer, gpointer user_data)
+buffer_cursor_position (GtkTextBuffer *buffer,
+                        gpointer user_data)
 {
 	guint32 state;
 
@@ -275,7 +292,9 @@ buffer_cursor_position (GtkTextBuffer *buffer, gpointer user_data)
 }
 
 static void
-update_mouse_cursor (GtkTextView *text_view, gint x, gint y)
+update_mouse_cursor (GtkTextView *text_view,
+                     gint x,
+                     gint y)
 {
 	static GdkCursor *hand_cursor = NULL;
 	static GdkCursor *regular_cursor = NULL;
@@ -330,7 +349,12 @@ update_mouse_cursor (GtkTextView *text_view, gint x, gint y)
 }
 
 static gboolean
-textview_query_tooltip (GtkTextView *text_view, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip, gpointer user_data)
+textview_query_tooltip (GtkTextView *text_view,
+                        gint x,
+                        gint y,
+                        gboolean keyboard_mode,
+                        GtkTooltip *tooltip,
+                        gpointer user_data)
 {
 	GtkTextBuffer *buffer;
 	guint32 state;
@@ -373,7 +397,8 @@ textview_query_tooltip (GtkTextView *text_view, gint x, gint y, gboolean keyboar
 
 /* Links can be activated by pressing Enter. */
 static gboolean
-textview_key_press_event (GtkWidget *text_view, GdkEventKey *event)
+textview_key_press_event (GtkWidget *text_view,
+                          GdkEventKey *event)
 {
 	GtkTextIter iter;
 	GtkTextBuffer *buffer;
@@ -398,7 +423,8 @@ textview_key_press_event (GtkWidget *text_view, GdkEventKey *event)
 }
 
 static void
-update_ctrl_state (GtkTextView *textview, gboolean ctrl_is_down)
+update_ctrl_state (GtkTextView *textview,
+                   gboolean ctrl_is_down)
 {
 	GtkTextBuffer *buffer;
 	gint x, y;
@@ -417,7 +443,8 @@ update_ctrl_state (GtkTextView *textview, gboolean ctrl_is_down)
 
 /* Links can also be activated by clicking. */
 static gboolean
-textview_event_after (GtkTextView *textview, GdkEvent  *ev)
+textview_event_after (GtkTextView *textview,
+                      GdkEvent *ev)
 {
 	GtkTextIter start, end, iter;
 	GtkTextBuffer *buffer;
@@ -477,7 +504,8 @@ textview_event_after (GtkTextView *textview, GdkEvent  *ev)
 }
 
 static gboolean
-textview_motion_notify_event (GtkTextView *textview, GdkEventMotion *event)
+textview_motion_notify_event (GtkTextView *textview,
+                              GdkEventMotion *event)
 {
 	gint x, y;
 
@@ -493,7 +521,8 @@ textview_motion_notify_event (GtkTextView *textview, GdkEventMotion *event)
 }
 
 static gboolean
-textview_visibility_notify_event (GtkTextView *textview, GdkEventVisibility *event)
+textview_visibility_notify_event (GtkTextView *textview,
+                                  GdkEventVisibility *event)
 {
 	gint wx, wy, bx, by;
 
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index 400fbe2c64..d3f42fd359 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -594,7 +594,7 @@ e_calendar_item_init (ECalendarItem *calitem)
 }
 
 static void
-e_calendar_item_dispose		(GObject *object)
+e_calendar_item_dispose (GObject *object)
 {
 	ECalendarItem *calitem;
 
@@ -855,7 +855,7 @@ e_calendar_item_set_property (GObject *object,
 }
 
 static void
-e_calendar_item_realize		(GnomeCanvasItem *item)
+e_calendar_item_realize (GnomeCanvasItem *item)
 {
 	ECalendarItem *calitem;
 
@@ -870,7 +870,7 @@ e_calendar_item_realize		(GnomeCanvasItem *item)
 }
 
 static void
-e_calendar_item_unmap		(GnomeCanvasItem *item)
+e_calendar_item_unmap (GnomeCanvasItem *item)
 {
 	ECalendarItem *calitem;
 
@@ -886,9 +886,9 @@ e_calendar_item_unmap		(GnomeCanvasItem *item)
 }
 
 static void
-e_calendar_item_update		(GnomeCanvasItem *item,
-				 const cairo_matrix_t *i2c,
-				 gint		  flags)
+e_calendar_item_update (GnomeCanvasItem *item,
+                        const cairo_matrix_t *i2c,
+                        gint flags)
 {
 	GnomeCanvasItemClass *item_class;
 	ECalendarItem *calitem;
@@ -924,7 +924,7 @@ e_calendar_item_update		(GnomeCanvasItem *item,
 	 */
 
 	/* Make sure the minimum row width & cell height and the widths of
-	   all the digits and characters are up to date. */
+	 * all the digits and characters are up to date. */
 	e_calendar_item_recalc_sizes (calitem);
 
 	/* Calculate how many rows & cols we can fit in. */
@@ -957,9 +957,9 @@ e_calendar_item_update		(GnomeCanvasItem *item,
 	calitem->cols = cols;
 
 	/* Split up the empty space according to the configuration.
-	   If the calendar is set to expand, we divide the space between the
-	   cells and the spaces around the calendar, otherwise we place the
-	   calendars in the center of the available area. */
+	 * If the calendar is set to expand, we divide the space between the
+	 * cells and the spaces around the calendar, otherwise we place the
+	 * calendars in the center of the available area. */
 
 	char_height =
 		PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics)) +
@@ -1020,12 +1020,12 @@ e_calendar_item_update		(GnomeCanvasItem *item,
  * DRAWING ROUTINES - functions to paint the canvas item.
  */
 static void
-e_calendar_item_draw		(GnomeCanvasItem *canvas_item,
-				 cairo_t	 *cr,
-				 gint		  x,
-				 gint		  y,
-				 gint		  width,
-				 gint		  height)
+e_calendar_item_draw (GnomeCanvasItem *canvas_item,
+                      cairo_t *cr,
+                      gint x,
+                      gint y,
+                      gint width,
+                      gint height)
 {
 	ECalendarItem *calitem;
 	GtkStyle *style;
@@ -1083,7 +1083,7 @@ e_calendar_item_draw		(GnomeCanvasItem *canvas_item,
 
 	for (row = 0; row < calitem->rows; row++) {
 		/* Draw the background for the title bars and the shadow around
-		   it, and the vertical lines between columns. */
+		 * it, and the vertical lines between columns. */
 
 		cairo_save (cr);
 		gdk_cairo_set_source_color (cr, &bg);
@@ -1126,7 +1126,9 @@ e_calendar_item_draw		(GnomeCanvasItem *canvas_item,
 }
 
 static void
-layout_set_day_text (ECalendarItem *calitem, PangoLayout *layout, gint day_index)
+layout_set_day_text (ECalendarItem *calitem,
+                     PangoLayout *layout,
+                     gint day_index)
 {
 	const gchar *abbr_name;
 
@@ -1136,14 +1138,14 @@ layout_set_day_text (ECalendarItem *calitem, PangoLayout *layout, gint day_index
 }
 
 static void
-e_calendar_item_draw_month	(ECalendarItem   *calitem,
-				 cairo_t	 *cr,
-				 gint		  x,
-				 gint		  y,
-				 gint		  width,
-				 gint		  height,
-				 gint		  row,
-				 gint		  col)
+e_calendar_item_draw_month (ECalendarItem *calitem,
+                            cairo_t *cr,
+                            gint x,
+                            gint y,
+                            gint width,
+                            gint height,
+                            gint row,
+                            gint col)
 {
 	GnomeCanvasItem *item;
 	GtkWidget *widget;
@@ -1189,7 +1191,7 @@ e_calendar_item_draw_month	(ECalendarItem   *calitem,
 	/* Calculate the top-left position of the entire month display. */
 	month_x = item->x1 + xthickness + calitem->x_offset
 		+ ( (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
-		? (calitem->cols-1 - col) : col ) * calitem->month_width - x;
+		? (calitem->cols - 1 - col) : col ) * calitem->month_width - x;
 	month_w = item->x2 - item->x1 - xthickness * 2;
 	month_w = MIN (month_w, calitem->month_width);
 	month_y = item->y1 + ythickness + row * calitem->month_height - y;
@@ -1206,7 +1208,7 @@ e_calendar_item_draw_month	(ECalendarItem   *calitem,
 	month %= 12;
 
 	/* Draw the month name & year, with clipping. Note that the top row
-	   needs extra space around it for the buttons. */
+	 * needs extra space around it for the buttons. */
 
 	layout = gtk_widget_create_pango_layout (widget, NULL);
 
@@ -1250,7 +1252,7 @@ e_calendar_item_draw_month	(ECalendarItem   *calitem,
 		pango_layout_set_text (layout, buffer, -1);
 
 		/* Ideally we place the text centered in the month, but we
-		   won't go to the left of the minimum x position. */
+		 * won't go to the left of the minimum x position. */
 		pango_layout_get_pixel_size (layout, &text_width, NULL);
 		text_x = (calitem->month_width - text_width) / 2;
 		text_x = MAX (min_x, text_x);
@@ -1315,7 +1317,7 @@ e_calendar_item_draw_month	(ECalendarItem   *calitem,
 	day_index = calitem->week_start_day;
 	pango_layout_set_font_description (layout, font_desc);
 	if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
-		text_x += (7-1) * calitem->cell_width;
+		text_x += (7 - 1) * calitem->cell_width;
 	gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_ACTIVE]);
 	for (day = 0; day < 7; day++) {
 		cairo_save (cr);
@@ -1351,7 +1353,7 @@ e_calendar_item_draw_month	(ECalendarItem   *calitem,
 }
 
 static const gchar *
-get_digit_fomat ()
+get_digit_fomat (void)
 {
 
 #ifdef HAVE_GNU_GET_LIBC_VERSION
@@ -1379,17 +1381,17 @@ get_digit_fomat ()
 }
 
 static void
-e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
-				  cairo_t	*cr,
-				  gint		 width,
-				  gint		 height,
-				  gint		 row,
-				  gint		 col,
-				  gint		 year,
-				  gint		 month,
-				  gint		 start_weekday,
-				  gint		 cells_x,
-				  gint		 cells_y)
+e_calendar_item_draw_day_numbers (ECalendarItem *calitem,
+                                  cairo_t *cr,
+                                  gint width,
+                                  gint height,
+                                  gint row,
+                                  gint col,
+                                  gint year,
+                                  gint month,
+                                  gint start_weekday,
+                                  gint cells_x,
+                                  gint cells_y)
 {
 	GnomeCanvasItem *item;
 	GtkWidget *widget;
@@ -1437,7 +1439,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
 	layout = pango_cairo_create_layout (cr);
 
 	/* Calculate the number of days in the previous, current, and next
-	   months. */
+	 * months. */
 	years[0] = years[1] = years[2] = year;
 	months[0] = month - 1;
 	months[1] = month;
@@ -1456,7 +1458,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
 	days_in_month[2] = DAYS_IN_MONTH (years[2], months[2]);
 
 	/* Mon 0 is the previous month, which we may show the end of. Mon 1 is
-	   the current month, and mon 2 is the next month. */
+	 * the current month, and mon 2 is the next month. */
 	mon = 0;
 
 	month_offset = row * calitem->cols + col - 1;
@@ -1464,8 +1466,8 @@ e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
 	days_from_week_start = (start_weekday + 7 - calitem->week_start_day)
 		% 7;
 	/* For the top-left month we show the end of the previous month, and
-	   if the new month starts on the first day of the week we show a
-	   complete week from the previous month. */
+	 * if the new month starts on the first day of the week we show a
+	 * complete week from the previous month. */
 	if (days_from_week_start == 0) {
 		if (row == 0 && col == 0) {
 			day_num -= 6;
@@ -1490,7 +1492,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
 	today_mday = today_tm.tm_mday;
 
 	/* We usually skip the last days of the previous month (mon = 0),
-	   except for the top-left month displayed. */
+	 * except for the top-left month displayed. */
 	draw_day = (mon == 1 || (row == 0 && col == 0));
 
 	for (drow = 0; drow < 6; drow++) {
@@ -1531,7 +1533,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
 			if (draw_day) {
 				day_x = cells_x +
 					( (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
-					? 7-1 - dcol : dcol ) * calitem->cell_width;
+					? 7 - 1 - dcol : dcol ) * calitem->cell_width;
 
 				day_y = cells_y + drow * calitem->cell_height;
 
@@ -1671,7 +1673,7 @@ e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
 				month_offset++;
 				mon++;
 				/* We only draw the start of the next month
-				   for the bottom-right month displayed. */
+				 * for the bottom-right month displayed. */
 				if (mon == 2 && (row != calitem->rows - 1
 						 || col != calitem->cols - 1)) {
 					/* Set a flag so we exit the loop. */
@@ -1700,10 +1702,10 @@ e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
 }
 
 gint
-e_calendar_item_get_week_number	(ECalendarItem *calitem,
-				 gint		day,
-				 gint		month,
-				 gint		year)
+e_calendar_item_get_week_number (ECalendarItem *calitem,
+                                 gint day,
+                                 gint month,
+                                 gint year)
 {
 	GDate date;
 	guint weekday, yearday;
@@ -1717,7 +1719,7 @@ e_calendar_item_get_week_number	(ECalendarItem *calitem,
 
 	if (weekday > 0) {
 		/* we want always point to nearest Monday, as the first day of the week,
-		   regardless of the calendar's week_start_day */
+		 * regardless of the calendar's week_start_day */
 		if (weekday >= 3)
 			g_date_add_days (&date, 7 - weekday);
 		else
@@ -1728,7 +1730,7 @@ e_calendar_item_get_week_number	(ECalendarItem *calitem,
 	yearday = g_date_get_day_of_year (&date) - 1;
 
 	/* If the week starts on or after 29th December, it is week 1 of the
-	   next year, since there are 4 days in the next year. */
+	 * next year, since there are 4 days in the next year. */
 	if (g_date_get_month (&date) == 12 && g_date_get_day (&date) >= 29)
 		return 1;
 
@@ -1736,7 +1738,7 @@ e_calendar_item_get_week_number	(ECalendarItem *calitem,
 	week_num = yearday / 7;
 
 	/* If the first week starts on or after Jan 5th, then we need to add
-	   1 since the previous week will really be the first week. */
+	 * 1 since the previous week will really be the first week. */
 	if (yearday % 7 >= 4)
 		week_num++;
 
@@ -1745,17 +1747,21 @@ e_calendar_item_get_week_number	(ECalendarItem *calitem,
 }
 
 /* This is supposed to return the nearest item the the point and the distance.
-   Since we are the only item we just return ourself and 0 for the distance.
-   This is needed so that we get button/motion events. */
+ * Since we are the only item we just return ourself and 0 for the distance.
+ * This is needed so that we get button/motion events. */
 static GnomeCanvasItem *
-e_calendar_item_point (GnomeCanvasItem *item, gdouble x, gdouble y,
-		       gint cx, gint cy)
+e_calendar_item_point (GnomeCanvasItem *item,
+                       gdouble x,
+                       gdouble y,
+                       gint cx,
+                       gint cy)
 {
 	return item;
 }
 
 static void
-e_calendar_item_stop_selecting (ECalendarItem *calitem, guint32 time)
+e_calendar_item_stop_selecting (ECalendarItem *calitem,
+                                guint32 time)
 {
 	if (!calitem->selecting)
 		return;
@@ -1765,8 +1771,8 @@ e_calendar_item_stop_selecting (ECalendarItem *calitem, guint32 time)
 	calitem->selecting = FALSE;
 
 	/* If the user selects the grayed dates before the first month or
-	   after the last month, we move backwards or forwards one month.
-	   The set_month () call should take care of updating the selection. */
+	 * after the last month, we move backwards or forwards one month.
+	 * The set_month () call should take care of updating the selection. */
 	if (calitem->selection_end_month_offset == -1)
 		e_calendar_item_set_first_month (calitem, calitem->year,
 						 calitem->month - 1);
@@ -1785,8 +1791,9 @@ e_calendar_item_stop_selecting (ECalendarItem *calitem, guint32 time)
 }
 
 static void
-e_calendar_item_selection_add_days (ECalendarItem *calitem, gint n_days,
-				    gboolean multi_selection)
+e_calendar_item_selection_add_days (ECalendarItem *calitem,
+                                    gint n_days,
+                                    gboolean multi_selection)
 {
 	GDate gdate_start, gdate_end;
 
@@ -1846,7 +1853,8 @@ e_calendar_item_selection_add_days (ECalendarItem *calitem, gint n_days,
 }
 
 static gint
-e_calendar_item_key_press_event (ECalendarItem *calitem, GdkEvent *event)
+e_calendar_item_key_press_event (ECalendarItem *calitem,
+                                 GdkEvent *event)
 {
 	guint keyval = event->key.keyval;
 	gboolean multi_selection = FALSE;
@@ -1884,7 +1892,8 @@ e_calendar_item_key_press_event (ECalendarItem *calitem, GdkEvent *event)
 }
 
 static gint
-e_calendar_item_event (GnomeCanvasItem *item, GdkEvent *event)
+e_calendar_item_event (GnomeCanvasItem *item,
+                       GdkEvent *event)
 {
 	ECalendarItem *calitem;
 
@@ -1909,8 +1918,11 @@ e_calendar_item_event (GnomeCanvasItem *item, GdkEvent *event)
 }
 
 static void
-e_calendar_item_bounds (GnomeCanvasItem *item, gdouble *x1, gdouble *y1,
-			gdouble *x2, gdouble *y2)
+e_calendar_item_bounds (GnomeCanvasItem *item,
+                        gdouble *x1,
+                        gdouble *y1,
+                        gdouble *x2,
+                        gdouble *y2)
 {
 	ECalendarItem *calitem;
 
@@ -1924,9 +1936,9 @@ e_calendar_item_bounds (GnomeCanvasItem *item, gdouble *x1, gdouble *y1,
 }
 
 /* This checks if any fonts have changed, and if so it recalculates the
-   text sizes and the minimum month size. */
+ * text sizes and the minimum month size. */
 static void
-e_calendar_item_recalc_sizes		(ECalendarItem *calitem)
+e_calendar_item_recalc_sizes (ECalendarItem *calitem)
 {
 	GnomeCanvasItem *canvas_item;
 	GtkStyle *style;
@@ -2028,21 +2040,21 @@ e_calendar_item_recalc_sizes		(ECalendarItem *calitem)
 }
 
 static void
-e_calendar_item_get_day_style		(ECalendarItem	*calitem,
-					 gint		 year,
-					 gint		 month,
-					 gint		 day,
-					 gint		 day_style,
-					 gboolean	 today,
-					 gboolean	 prev_or_next_month,
-					 gboolean	 selected,
-					 gboolean	 has_focus,
-					 gboolean	 drop_target,
-					 GdkColor      **bg_color,
-					 GdkColor      **fg_color,
-					 GdkColor      **box_color,
-					 gboolean	*bold,
-					 gboolean	*italic)
+e_calendar_item_get_day_style (ECalendarItem *calitem,
+                               gint year,
+                               gint month,
+                               gint day,
+                               gint day_style,
+                               gboolean today,
+                               gboolean prev_or_next_month,
+                               gboolean selected,
+                               gboolean has_focus,
+                               gboolean drop_target,
+                               GdkColor **bg_color,
+                               GdkColor **fg_color,
+                               GdkColor **box_color,
+                               gboolean *bold,
+                               gboolean *italic)
 {
 	GtkWidget *widget;
 	GtkStyle *style;
@@ -2075,8 +2087,8 @@ e_calendar_item_get_day_style		(ECalendarItem	*calitem,
 }
 
 static gboolean
-e_calendar_item_button_press	(ECalendarItem	*calitem,
-				 GdkEvent	*event)
+e_calendar_item_button_press (ECalendarItem *calitem,
+                              GdkEvent *event)
 {
 	gint month_offset, day, add_days = 0;
 	gboolean all_week, round_up_end = FALSE, round_down_start = FALSE;
@@ -2099,7 +2111,7 @@ e_calendar_item_button_press	(ECalendarItem	*calitem,
 	if (event->button.button == 3 && day == -1
 	    && e_calendar_item_get_display_popup (calitem)) {
 		e_calendar_item_show_popup_menu (calitem,
-						 (GdkEventButton*) event,
+						 (GdkEventButton *) event,
 						 month_offset);
 		return TRUE;
 	}
@@ -2187,16 +2199,16 @@ e_calendar_item_button_press	(ECalendarItem	*calitem,
 }
 
 static gboolean
-e_calendar_item_button_release	(ECalendarItem	*calitem,
-				 GdkEvent	*event)
+e_calendar_item_button_release (ECalendarItem *calitem,
+                                GdkEvent *event)
 {
 	e_calendar_item_stop_selecting (calitem, event->button.time);
 	return FALSE;
 }
 
 static gboolean
-e_calendar_item_motion		(ECalendarItem	*calitem,
-				 GdkEvent	*event)
+e_calendar_item_motion (ECalendarItem *calitem,
+                        GdkEvent *event)
 {
 	gint start_month, start_day, end_month, end_day, month_offset, day;
 	gint tmp_month, tmp_day, days_in_selection;
@@ -2251,13 +2263,13 @@ e_calendar_item_motion		(ECalendarItem	*calitem,
 	}
 
 	/* If we are over a week number and we are dragging the end of the
-	   selection, we round up to the end of this week. */
+	 * selection, we round up to the end of this week. */
 	if (all_week && calitem->selection_dragging_end)
 		round_up_end = TRUE;
 
 	/* If the selection was started from a week number and we are dragging
-	   the start of the selection, we need to round up the end to include
-	   all of the original week selected. */
+	 * the start of the selection, we need to round up the end to include
+	 * all of the original week selected. */
 	if (calitem->selection_from_full_week
 	    && !calitem->selection_dragging_end)
 			round_up_end = TRUE;
@@ -2307,11 +2319,11 @@ e_calendar_item_motion		(ECalendarItem	*calitem,
 }
 
 static void
-e_calendar_item_check_selection_end	(ECalendarItem	*calitem,
-					 gint		 start_month,
-					 gint		 start_day,
-					 gint		*end_month,
-					 gint		*end_day)
+e_calendar_item_check_selection_end (ECalendarItem *calitem,
+                                     gint start_month,
+                                     gint start_day,
+                                     gint *end_month,
+                                     gint *end_day)
 {
 	gint year, month, max_month, max_day, days_in_month;
 
@@ -2347,11 +2359,11 @@ e_calendar_item_check_selection_end	(ECalendarItem	*calitem,
 }
 
 static void
-e_calendar_item_check_selection_start	(ECalendarItem	*calitem,
-					 gint		*start_month,
-					 gint		*start_day,
-					 gint		 end_month,
-					 gint		 end_day)
+e_calendar_item_check_selection_start (ECalendarItem *calitem,
+                                       gint *start_month,
+                                       gint *start_day,
+                                       gint end_month,
+                                       gint end_day)
 {
 	gint year, month, min_month, min_day, days_in_month;
 
@@ -2385,19 +2397,19 @@ e_calendar_item_check_selection_start	(ECalendarItem	*calitem,
 }
 
 /* Converts a position within the item to a month & day.
-   The month returned is 0 for the top-left month displayed.
-   If the position is over the month heading -1 is returned for the day.
-   If the position is over a week number the first day of the week is returned
-   and entire_week is set to TRUE.
-   It returns FALSE if the position is completely outside all months. */
+ * The month returned is 0 for the top-left month displayed.
+ * If the position is over the month heading -1 is returned for the day.
+ * If the position is over a week number the first day of the week is returned
+ * and entire_week is set to TRUE.
+ * It returns FALSE if the position is completely outside all months. */
 static gboolean
-e_calendar_item_convert_position_to_day	(ECalendarItem	*calitem,
-					 gint		 event_x,
-					 gint		 event_y,
-					 gboolean	 round_empty_positions,
-					 gint		*month_offset,
-					 gint		*day,
-					 gboolean	*entire_week)
+e_calendar_item_convert_position_to_day (ECalendarItem *calitem,
+                                         gint event_x,
+                                         gint event_y,
+                                         gboolean round_empty_positions,
+                                         gint *month_offset,
+                                         gint *day,
+                                         gboolean *entire_week)
 {
 	GnomeCanvasItem *item;
 	GtkWidget *widget;
@@ -2443,7 +2455,7 @@ e_calendar_item_convert_position_to_day	(ECalendarItem	*calitem,
 	if (row >= calitem->rows || col >= calitem->cols)
 		return FALSE;
 	if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
-		col = calitem->cols-1 - col;
+		col = calitem->cols - 1 - col;
 
 	*month_offset = row * calitem->cols + col;
 
@@ -2489,7 +2501,7 @@ e_calendar_item_convert_position_to_day	(ECalendarItem	*calitem,
 			return FALSE;
 		day_col = x / calitem->cell_width;
 		if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
-			day_col = E_CALENDAR_COLS_PER_MONTH-1 - day_col;
+			day_col = E_CALENDAR_COLS_PER_MONTH - 1 - day_col;
 		if (day_col >= E_CALENDAR_COLS_PER_MONTH)
 			return FALSE;
 	}
@@ -2529,12 +2541,12 @@ e_calendar_item_convert_position_to_day	(ECalendarItem	*calitem,
 }
 
 static void
-e_calendar_item_get_month_info	(ECalendarItem	*calitem,
-				 gint		 row,
-				 gint		 col,
-				 gint		*first_day_offset,
-				 gint		*days_in_month,
-				 gint		*days_in_prev_month)
+e_calendar_item_get_month_info (ECalendarItem *calitem,
+                                gint row,
+                                gint col,
+                                gint *first_day_offset,
+                                gint *days_in_month,
+                                gint *days_in_prev_month)
 {
 	gint year, month, start_weekday, first_day_of_month;
 	struct tm tmp_tm = { 0 };
@@ -2567,19 +2579,19 @@ e_calendar_item_get_month_info	(ECalendarItem	*calitem,
 }
 
 void
-e_calendar_item_get_first_month (ECalendarItem	*calitem,
-				gint		*year,
-				gint		*month)
+e_calendar_item_get_first_month (ECalendarItem *calitem,
+                                 gint *year,
+                                 gint *month)
 {
 	*year = calitem->year;
 	*month = calitem->month;
 }
 
 static void
-e_calendar_item_preserve_day_selection	(ECalendarItem	*calitem,
-					 gint            selected_day,
-					 gint		*month_offset,
-					 gint		*day)
+e_calendar_item_preserve_day_selection (ECalendarItem *calitem,
+                                        gint selected_day,
+                                        gint *month_offset,
+                                        gint *day)
 {
 	gint year, month, weekday, days, days_in_month;
 	struct tm tmp_tm = { 0 };
@@ -2615,9 +2627,9 @@ e_calendar_item_preserve_day_selection	(ECalendarItem	*calitem,
 
 /* This also handles values of month < 0 or > 11 by updating the year. */
 void
-e_calendar_item_set_first_month (ECalendarItem	*calitem,
-				gint		 year,
-				gint		 month)
+e_calendar_item_set_first_month (ECalendarItem *calitem,
+                                 gint year,
+                                 gint month)
 {
 	gint new_year, new_month, months_diff, num_months;
 	gint old_days_in_selection, new_days_in_selection;
@@ -2673,7 +2685,7 @@ e_calendar_item_set_first_month (ECalendarItem	*calitem,
 			}
 
 			/* We want to ensure that the same number of days are
-			   selected after we have moved the selection. */
+			 * selected after we have moved the selection. */
 			calitem->year = new_year;
 			calitem->month = new_month;
 
@@ -2704,9 +2716,9 @@ e_calendar_item_set_first_month (ECalendarItem	*calitem,
 					new_days_in_selection);
 
 			/* Flag that we need to emit the "selection_changed"
-			   signal. We don't want to emit it here since setting
-			   the "year" and "month" args would result in 2
-			   signals emitted. */
+			 * signal. We don't want to emit it here since setting
+			 * the "year" and "month" args would result in 2
+			 * signals emitted. */
 			calitem->selection_changed = TRUE;
 		}
 	} else {
@@ -2720,15 +2732,15 @@ e_calendar_item_set_first_month (ECalendarItem	*calitem,
 
 /* Get the maximum number of days selectable */
 gint
-e_calendar_item_get_max_days_sel       (ECalendarItem	*calitem)
+e_calendar_item_get_max_days_sel (ECalendarItem *calitem)
 {
 	return calitem->max_days_selected;
 }
 
 /* Set the maximum number of days selectable */
 void
-e_calendar_item_set_max_days_sel       (ECalendarItem	*calitem,
-					gint             days)
+e_calendar_item_set_max_days_sel (ECalendarItem *calitem,
+                                  gint days)
 {
 	calitem->max_days_selected = MAX (0, days);
 	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem));
@@ -2736,38 +2748,38 @@ e_calendar_item_set_max_days_sel       (ECalendarItem	*calitem,
 
 /* Get the maximum number of days before whole weeks are selected */
 gint
-e_calendar_item_get_days_start_week_sel (ECalendarItem	*calitem)
+e_calendar_item_get_days_start_week_sel (ECalendarItem *calitem)
 {
 	return calitem->days_to_start_week_selection;
 }
 
 /* Set the maximum number of days before whole weeks are selected */
 void
-e_calendar_item_set_days_start_week_sel (ECalendarItem	*calitem,
-					gint            days)
+e_calendar_item_set_days_start_week_sel (ECalendarItem *calitem,
+                                         gint days)
 {
 	calitem->days_to_start_week_selection = days;
 }
 
 gboolean
-e_calendar_item_get_display_popup      (ECalendarItem	*calitem)
+e_calendar_item_get_display_popup (ECalendarItem *calitem)
 {
 	return calitem->display_popup;
 }
 
 void
-e_calendar_item_set_display_popup      (ECalendarItem	*calitem,
-					gboolean        display)
+e_calendar_item_set_display_popup (ECalendarItem *calitem,
+                                   gboolean display)
 {
 	calitem->display_popup = display;
 }
 
 /* This will make sure that the given year & month are valid, i.e. if month
-   is < 0 or > 11 the year and month will be updated accordingly. */
+ * is < 0 or > 11 the year and month will be updated accordingly. */
 void
-e_calendar_item_normalize_date	(ECalendarItem	*calitem,
-				 gint		*year,
-				 gint		*month)
+e_calendar_item_normalize_date (ECalendarItem *calitem,
+                                gint *year,
+                                gint *month)
 {
 	if (*month >= 0) {
 		*year += *month / 12;
@@ -2781,11 +2793,11 @@ e_calendar_item_normalize_date	(ECalendarItem	*calitem,
 }
 
 /* Adds or subtracts days from the selection. It is used when we switch months
-   and the selection extends past the end of a month but we want to keep the
-   number of days selected the same. days should not be more than 30. */
+ * and the selection extends past the end of a month but we want to keep the
+ * number of days selected the same. days should not be more than 30. */
 static void
-e_calendar_item_add_days_to_selection	(ECalendarItem	*calitem,
-					 gint		 days)
+e_calendar_item_add_days_to_selection (ECalendarItem *calitem,
+                                       gint days)
 {
 	gint year, month, days_in_month;
 
@@ -2809,17 +2821,17 @@ e_calendar_item_add_days_to_selection	(ECalendarItem	*calitem,
 }
 
 /* Gets the range of dates actually shown. Months are 0 to 11.
-   This also includes the last days of the previous month and the first days
-   of the following month, which are normally shown in gray.
-   It returns FALSE if no dates are currently shown. */
+ * This also includes the last days of the previous month and the first days
+ * of the following month, which are normally shown in gray.
+ * It returns FALSE if no dates are currently shown. */
 gboolean
-e_calendar_item_get_date_range	(ECalendarItem	*calitem,
-				 gint		*start_year,
-				 gint		*start_month,
-				 gint		*start_day,
-				 gint		*end_year,
-				 gint		*end_month,
-				 gint		*end_day)
+e_calendar_item_get_date_range (ECalendarItem *calitem,
+                                gint *start_year,
+                                gint *start_month,
+                                gint *start_day,
+                                gint *end_year,
+                                gint *end_month,
+                                gint *end_day)
 {
 	gint first_day_offset, days_in_month, days_in_prev_month;
 
@@ -2827,7 +2839,7 @@ e_calendar_item_get_date_range	(ECalendarItem	*calitem,
 		return FALSE;
 
 	/* Calculate the first day shown. This will be one of the greyed-out
-	   days before the first full month begins. */
+	 * days before the first full month begins. */
 	e_calendar_item_get_month_info (calitem, 0, 0, &first_day_offset,
 					&days_in_month, &days_in_prev_month);
 	*start_year = calitem->year;
@@ -2839,7 +2851,7 @@ e_calendar_item_get_date_range	(ECalendarItem	*calitem,
 	*start_day = days_in_prev_month + 1 - first_day_offset;
 
 	/* Calculate the last day shown. This will be one of the greyed-out
-	   days after the last full month ends. */
+	 * days after the last full month ends. */
 	e_calendar_item_get_month_info (calitem, calitem->rows - 1,
 					calitem->cols - 1, &first_day_offset,
 					&days_in_month, &days_in_prev_month);
@@ -2853,9 +2865,9 @@ e_calendar_item_get_date_range	(ECalendarItem	*calitem,
 }
 
 /* Simple way to mark days so they appear bold.
-   A more flexible interface may be added later. */
+ * A more flexible interface may be added later. */
 void
-e_calendar_item_clear_marks	(ECalendarItem	*calitem)
+e_calendar_item_clear_marks (ECalendarItem *calitem)
 {
 	GnomeCanvasItem *item;
 
@@ -2870,12 +2882,12 @@ e_calendar_item_clear_marks	(ECalendarItem	*calitem)
 
 /* add_day_style - whether bit-or with the actual style or change the style fully */
 void
-e_calendar_item_mark_day	(ECalendarItem	*calitem,
-				 gint		 year,
-				 gint		 month,
-				 gint		 day,
-				 guint8		 day_style,
-				 gboolean        add_day_style)
+e_calendar_item_mark_day (ECalendarItem *calitem,
+                          gint year,
+                          gint month,
+                          gint day,
+                          guint8 day_style,
+                          gboolean add_day_style)
 {
 	gint month_offset;
 	gint index;
@@ -2895,15 +2907,15 @@ e_calendar_item_mark_day	(ECalendarItem	*calitem,
 }
 
 void
-e_calendar_item_mark_days	(ECalendarItem	*calitem,
-				 gint		 start_year,
-				 gint		 start_month,
-				 gint		 start_day,
-				 gint		 end_year,
-				 gint		 end_month,
-				 gint		 end_day,
-				 guint8		 day_style,
-				 gboolean        add_day_style)
+e_calendar_item_mark_days (ECalendarItem *calitem,
+                           gint start_year,
+                           gint start_month,
+                           gint start_day,
+                           gint end_year,
+                           gint end_month,
+                           gint end_day,
+                           guint8 day_style,
+                           gboolean add_day_style)
 {
 	gint month_offset, end_month_offset, day;
 
@@ -2964,9 +2976,9 @@ e_calendar_item_mark_days	(ECalendarItem	*calitem,
 
 /* Rounds up the given day to the end of the week. */
 static void
-e_calendar_item_round_up_selection	(ECalendarItem	*calitem,
-					 gint		*month_offset,
-					 gint		*day)
+e_calendar_item_round_up_selection (ECalendarItem *calitem,
+                                    gint *month_offset,
+                                    gint *day)
 {
 	gint year, month, weekday, days, days_in_month;
 	struct tm tmp_tm = { 0 };
@@ -2997,9 +3009,9 @@ e_calendar_item_round_up_selection	(ECalendarItem	*calitem,
 
 /* Rounds down the given day to the start of the week. */
 static void
-e_calendar_item_round_down_selection	(ECalendarItem	*calitem,
-					 gint		*month_offset,
-					 gint		*day)
+e_calendar_item_round_down_selection (ECalendarItem *calitem,
+                                      gint *month_offset,
+                                      gint *day)
 {
 	gint year, month, weekday, days, days_in_month;
 	struct tm tmp_tm = { 0 };
@@ -3034,11 +3046,11 @@ e_calendar_item_round_down_selection	(ECalendarItem	*calitem,
 }
 
 static gint
-e_calendar_item_get_inclusive_days	(ECalendarItem	*calitem,
-					 gint		 start_month_offset,
-					 gint		 start_day,
-					 gint		 end_month_offset,
-					 gint		 end_day)
+e_calendar_item_get_inclusive_days (ECalendarItem *calitem,
+                                    gint start_month_offset,
+                                    gint start_day,
+                                    gint end_month_offset,
+                                    gint end_day)
 {
 	gint start_year, start_month, end_year, end_month, days = 0;
 
@@ -3065,11 +3077,11 @@ e_calendar_item_get_inclusive_days	(ECalendarItem	*calitem,
 }
 
 /* If the day is off the end of the month it is set to the last day of the
-   month. */
+ * month. */
 static void
-e_calendar_item_ensure_valid_day	(ECalendarItem	*calitem,
-					 gint		*month_offset,
-					 gint		*day)
+e_calendar_item_ensure_valid_day (ECalendarItem *calitem,
+                                  gint *month_offset,
+                                  gint *day)
 {
 	gint year, month, days_in_month;
 
@@ -3083,9 +3095,9 @@ e_calendar_item_ensure_valid_day	(ECalendarItem	*calitem,
 }
 
 gboolean
-e_calendar_item_get_selection		(ECalendarItem	*calitem,
-					 GDate		*start_date,
-					 GDate		*end_date)
+e_calendar_item_get_selection (ECalendarItem *calitem,
+                               GDate *start_date,
+                               GDate *end_date)
 {
 	gint start_year, start_month, start_day;
 	gint end_year, end_month, end_day;
@@ -3113,10 +3125,10 @@ e_calendar_item_get_selection		(ECalendarItem	*calitem,
 }
 
 static void
-e_calendar_item_set_selection_if_emission (ECalendarItem	*calitem,
-					   const GDate		*start_date,
-					   const GDate		*end_date,
-					   gboolean emission)
+e_calendar_item_set_selection_if_emission (ECalendarItem *calitem,
+                                           const GDate *start_date,
+                                           const GDate *end_date,
+                                           gboolean emission)
 {
 	gint start_year, start_month, start_day;
 	gint end_year, end_month, end_day;
@@ -3127,7 +3139,7 @@ e_calendar_item_set_selection_if_emission (ECalendarItem	*calitem,
 	g_return_if_fail (E_IS_CALENDAR_ITEM (calitem));
 
 	/* If start_date is NULL, we clear the selection without changing the
-	   month shown. */
+	 * month shown. */
 	if (start_date == NULL) {
 		calitem->selection_set = FALSE;
 		calitem->selection_changed = TRUE;
@@ -3192,7 +3204,8 @@ e_calendar_item_set_selection_if_emission (ECalendarItem	*calitem,
 }
 
 void
-e_calendar_item_style_set (GtkWidget *widget, ECalendarItem *calitem)
+e_calendar_item_style_set (GtkWidget *widget,
+                           ECalendarItem *calitem)
 {
 	GtkStyle *style;
 	GdkColor *color;
@@ -3216,9 +3229,9 @@ e_calendar_item_style_set (GtkWidget *widget, ECalendarItem *calitem)
 }
 
 void
-e_calendar_item_set_selection (ECalendarItem	*calitem,
-			       const GDate	*start_date,
-			       const GDate	*end_date)
+e_calendar_item_set_selection (ECalendarItem *calitem,
+                               const GDate *start_date,
+                               const GDate *end_date)
 {
 	/* If the user is in the middle of a selection, we must abort it. */
 	if (calitem->selecting) {
@@ -3233,18 +3246,18 @@ e_calendar_item_set_selection (ECalendarItem	*calitem,
 }
 
 /* This tries to ensure that the given time range is visible. If the range
-   given is longer than we can show, only the start of it will be visible.
-   Note that this will not update the selection. That should be done somewhere
-   else. It returns TRUE if the visible range has been changed. */
+ * given is longer than we can show, only the start of it will be visible.
+ * Note that this will not update the selection. That should be done somewhere
+ * else. It returns TRUE if the visible range has been changed. */
 static gboolean
-e_calendar_item_ensure_days_visible	(ECalendarItem	*calitem,
-					 gint		 start_year,
-					 gint		 start_month,
-					 gint		 start_day,
-					 gint		 end_year,
-					 gint		 end_month,
-					 gint		 end_day,
-					 gboolean emission)
+e_calendar_item_ensure_days_visible (ECalendarItem *calitem,
+                                     gint start_year,
+                                     gint start_month,
+                                     gint start_day,
+                                     gint end_year,
+                                     gint end_month,
+                                     gint end_day,
+                                     gboolean emission)
 {
 	gint current_end_year, current_end_month;
 	gint months_shown;
@@ -3264,7 +3277,7 @@ e_calendar_item_ensure_days_visible	(ECalendarItem	*calitem,
 		current_end_month == 11 && end_month == 0) ||
 	    (end_year == current_end_year && end_month == current_end_month + 1)) {
 		/* See if the end of the selection will fit in the
-		   leftover days of the month after the last one shown. */
+		 * leftover days of the month after the last one shown. */
 		calitem->month += (months_shown - 1);
 		e_calendar_item_normalize_date (calitem, &calitem->year,
 						&calitem->month);
@@ -3301,14 +3314,14 @@ e_calendar_item_ensure_days_visible	(ECalendarItem	*calitem,
 	}
 
 	/* Now try to ensure that the start month is shown. We do this after
-	   the end month so that the start month will always be shown. */
+	 * the end month so that the start month will always be shown. */
 	if (start_year < calitem->year
 	    || (start_year == calitem->year
 		&& start_month < calitem->month)) {
 		need_update = TRUE;
 
 		/* First we see if the start of the selection will fit in the
-		   leftover days of the month before the first one shown. */
+		 * leftover days of the month before the first one shown. */
 		calitem->year = start_year;
 		calitem->month = start_month + 1;
 		e_calendar_item_normalize_date (calitem, &calitem->year,
@@ -3348,9 +3361,9 @@ deactivate_menu_cb (GtkWidget *menu)
 }
 
 static void
-e_calendar_item_show_popup_menu		(ECalendarItem	*calitem,
-					 GdkEventButton	*event,
-					 gint		 month_offset)
+e_calendar_item_show_popup_menu (ECalendarItem *calitem,
+                                 GdkEventButton *event,
+                                 gint month_offset)
 {
 	GtkWidget *menu, *submenu, *menuitem, *label;
 	gint year, month;
@@ -3388,7 +3401,7 @@ e_calendar_item_show_popup_menu		(ECalendarItem	*calitem,
 			g_object_set_data(G_OBJECT(menuitem), "month",
 					     GINT_TO_POINTER (month));
 
-			g_signal_connect((menuitem), "activate",
+			g_signal_connect ((menuitem), "activate",
 					    G_CALLBACK (e_calendar_item_on_menu_item_activate), calitem);
 		}
 	}
@@ -3400,8 +3413,8 @@ e_calendar_item_show_popup_menu		(ECalendarItem	*calitem,
 }
 
 static void
-e_calendar_item_on_menu_item_activate	(GtkWidget	*menuitem,
-					 ECalendarItem	*calitem)
+e_calendar_item_on_menu_item_activate (GtkWidget *menuitem,
+                                       ECalendarItem *calitem)
 {
 	GtkWidget *parent;
 	gint year, month_offset, month;
@@ -3424,11 +3437,11 @@ e_calendar_item_on_menu_item_activate	(GtkWidget	*menuitem,
 }
 
 static void
-e_calendar_item_position_menu	(GtkMenu            *menu,
-				 gint               *x,
-				 gint               *y,
-				 gboolean           *push_in,
-				 gpointer            user_data)
+e_calendar_item_position_menu (GtkMenu *menu,
+                               gint *x,
+                               gint *y,
+                               gboolean *push_in,
+                               gpointer user_data)
 {
 	GtkRequisition requisition;
 	gint screen_width, screen_height;
@@ -3449,10 +3462,10 @@ e_calendar_item_position_menu	(GtkMenu            *menu,
 
 /* Sets the function to call to get the colors to use for a particular day. */
 void
-e_calendar_item_set_style_callback	(ECalendarItem	*calitem,
-					 ECalendarItemStyleCallback cb,
-					 gpointer	 data,
-					 GDestroyNotify  destroy)
+e_calendar_item_set_style_callback (ECalendarItem *calitem,
+                                    ECalendarItemStyleCallback cb,
+                                    gpointer data,
+                                    GDestroyNotify destroy)
 {
 	g_return_if_fail (E_IS_CALENDAR_ITEM (calitem));
 
@@ -3465,7 +3478,7 @@ e_calendar_item_set_style_callback	(ECalendarItem	*calitem,
 }
 
 static void
-e_calendar_item_date_range_changed	(ECalendarItem	*calitem)
+e_calendar_item_date_range_changed (ECalendarItem *calitem)
 {
 	g_free (calitem->styles);
 	calitem->styles = NULL;
@@ -3474,7 +3487,7 @@ e_calendar_item_date_range_changed	(ECalendarItem	*calitem)
 }
 
 static void
-e_calendar_item_queue_signal_emission	(ECalendarItem	*calitem)
+e_calendar_item_queue_signal_emission (ECalendarItem *calitem)
 {
 	if (calitem->signal_emission_idle_id == 0) {
 		calitem->signal_emission_idle_id = g_idle_add_full (
@@ -3485,7 +3498,7 @@ e_calendar_item_queue_signal_emission	(ECalendarItem	*calitem)
 }
 
 static gboolean
-e_calendar_item_signal_emission_idle_cb	(gpointer data)
+e_calendar_item_signal_emission_idle_cb (gpointer data)
 {
 	ECalendarItem *calitem;
 
@@ -3498,7 +3511,7 @@ e_calendar_item_signal_emission_idle_cb	(gpointer data)
 	calitem->signal_emission_idle_id = 0;
 
 	/* We ref the calitem & check in case it gets destroyed, since we
-	   were getting a free memory write here. */
+	 * were getting a free memory write here. */
 	g_object_ref ((calitem));
 
 	if (calitem->date_range_changed) {
@@ -3518,13 +3531,13 @@ e_calendar_item_signal_emission_idle_cb	(gpointer data)
 }
 
 /* Sets a callback to use to get the current time. This is useful if the
-   application needs to use its own timezone data rather than rely on the
-   Unix timezone. */
+ * application needs to use its own timezone data rather than rely on the
+ * Unix timezone. */
 void
-e_calendar_item_set_get_time_callback	(ECalendarItem	*calitem,
-					 ECalendarItemGetTimeCallback cb,
-					 gpointer	 data,
-					 GDestroyNotify  destroy)
+e_calendar_item_set_get_time_callback (ECalendarItem *calitem,
+                                       ECalendarItemGetTimeCallback cb,
+                                       gpointer data,
+                                       GDestroyNotify destroy)
 {
 	g_return_if_fail (E_IS_CALENDAR_ITEM (calitem));
 
diff --git a/widgets/misc/e-calendar-item.h b/widgets/misc/e-calendar-item.h
index 0b07cc7b25..19f096c5b2 100644
--- a/widgets/misc/e-calendar-item.h
+++ b/widgets/misc/e-calendar-item.h
@@ -86,7 +86,7 @@ typedef struct _ECalendarItem       ECalendarItem;
 typedef struct _ECalendarItemClass  ECalendarItemClass;
 
 /* The type of the callback function optionally used to get the colors to
-   use for each day. */
+ * use for each day. */
 typedef void (*ECalendarItemStyleCallback)   (ECalendarItem	*calitem,
 					      gint		 year,
 					      gint		 month,
@@ -137,10 +137,10 @@ struct _ECalendarItem
 	gint month;	/* 0 to 11 */
 
 	/* Points to an array of styles, one gchar for each day. We use 32
-	   chars for each month, with n + 2 months, where n is the number of
-	   complete months shown (since we show some days before the first
-	   month and after the last month grayes out).
-	   A value of 0 is the default, and 1 is bold. */
+	 * chars for each month, with n + 2 months, where n is the number of
+	 * complete months shown (since we show some days before the first
+	 * month and after the last month grayes out).
+	 * A value of 0 is the default, and 1 is bold. */
 	guint8 *styles;
 
 	/*
@@ -148,8 +148,8 @@ struct _ECalendarItem
 	 */
 
 	/* The minimum & maximum number of rows & columns of months.
-	   If the maximum values are -1 then there is no maximum.
-	   The minimum valies default to 1. The maximum values to -1. */
+	 * If the maximum values are -1 then there is no maximum.
+	 * The minimum valies default to 1. The maximum values to -1. */
 	gint min_rows;
 	gint min_cols;
 	gint max_rows;
@@ -174,16 +174,16 @@ struct _ECalendarItem
 	gint max_days_selected;
 
 	/* The number of days selected before we switch to selecting whole
-	   weeks, or -1 if we never switch. Defaults to -1. */
+	 * weeks, or -1 if we never switch. Defaults to -1. */
 	gint days_to_start_week_selection;
 
 	/* Whether the selection is moved when we move back/forward one month.
-	   Used for things like the EDateEdit which only want the selection to
-	   be changed when the user explicitly selects a day. */
+	 * Used for things like the EDateEdit which only want the selection to
+	 * be changed when the user explicitly selects a day. */
 	gboolean move_selection_when_moving;
 
 	/* Whether the selection day is preserved when we  move back/forward
-	   one month. Used for the work week and week view. */
+	 * one month. Used for the work week and week view. */
 	gboolean preserve_day_when_moving;
 
 	/* Whether to display the pop-up, TRUE by default */
@@ -216,8 +216,8 @@ struct _ECalendarItem
 	gint cell_height;
 
 	/* The current selection. The month offsets are from 0, which is the
-	   top-left calendar month view. Note that -1 is used for the last days
-	   from the previous month. The days are real month days. */
+	 * top-left calendar month view. Note that -1 is used for the last days
+	 * from the previous month. The days are real month days. */
 	gboolean selecting;
 	GDate *selecting_axis;
 	gboolean selection_dragging_end;
@@ -242,7 +242,7 @@ struct _ECalendarItem
 	gint max_week_number_digit_width;
 
 	/* Fonts for drawing text. If font isn't set it uses the font from the
-	   canvas widget. If week_number_font isn't set it uses font. */
+	 * canvas widget. If week_number_font isn't set it uses font. */
 	PangoFontDescription *font_desc;
 	PangoFontDescription *week_number_font_desc;
 
@@ -261,9 +261,9 @@ struct _ECalendarItem
 	gint signal_emission_idle_id;
 
 	/* A flag to indicate that the selection or date range has changed.
-	   When set the idle function will emit the signal and reset it to
-	   FALSE. This is so we don't emit it several times when args are set
-	   etc. */
+	 * When set the idle function will emit the signal and reset it to
+	 * FALSE. This is so we don't emit it several times when args are set
+	 * etc. */
 	gboolean selection_changed;
 	gboolean date_range_changed;
 };
@@ -311,9 +311,9 @@ void	e_calendar_item_set_display_popup	(ECalendarItem *calitem,
 						 gboolean display);
 
 /* Gets the range of dates actually shown. Months are 0 to 11.
-   This also includes the last days of the previous month and the first days
-   of the following month, which are normally shown in gray.
-   It returns FALSE if no dates are currently shown. */
+ * This also includes the last days of the previous month and the first days
+ * of the following month, which are normally shown in gray.
+ * It returns FALSE if no dates are currently shown. */
 gboolean
 	e_calendar_item_get_date_range		(ECalendarItem *calitem,
 						 gint *start_year,
@@ -324,22 +324,22 @@ gboolean
 						 gint *end_day);
 
 /* Returns the selected date range. It returns FALSE if no days are currently
-   selected. */
+ * selected. */
 gboolean
 	e_calendar_item_get_selection		(ECalendarItem *calitem,
 						 GDate *start_date,
 						 GDate *end_date);
 /* Sets the selected date range, and changes the date range shown so at least
-   the start of the selection is shown. If start_date is NULL it clears the
-   selection. */
+ * the start of the selection is shown. If start_date is NULL it clears the
+ * selection. */
 void	e_calendar_item_set_selection		(ECalendarItem *calitem,
 						 const GDate *start_date,
 						 const GDate *end_date);
 
 /* Marks a particular day. Passing E_CALENDAR_ITEM_MARK_BOLD as the day style
-   will result in the day being shown as bold by default. The style callback
-   could support more day_styles, or the style callback could determine the
-   colors itself, without needing to mark days. */
+ * will result in the day being shown as bold by default. The style callback
+ * could support more day_styles, or the style callback could determine the
+ * colors itself, without needing to mark days. */
 void	e_calendar_item_clear_marks		(ECalendarItem *calitem);
 void	e_calendar_item_mark_day		(ECalendarItem *calitem,
 						 gint year,
@@ -349,7 +349,7 @@ void	e_calendar_item_mark_day		(ECalendarItem *calitem,
 						 gboolean add_day_style);
 
 /* Mark a range of days. Any days outside the currently shown range are
-   ignored. */
+ * ignored. */
 void	e_calendar_item_mark_days		(ECalendarItem *calitem,
 						 gint start_year,
 						 gint start_month,
@@ -367,8 +367,8 @@ void	e_calendar_item_set_style_callback	(ECalendarItem *calitem,
 						 GDestroyNotify  destroy);
 
 /* Sets a callback to use to get the current time. This is useful if the
-   application needs to use its own timezone data rather than rely on the
-   Unix timezone. */
+ * application needs to use its own timezone data rather than rely on the
+ * Unix timezone. */
 void	e_calendar_item_set_get_time_callback	(ECalendarItem *calitem,
 						 ECalendarItemGetTimeCallback cb,
 						 gpointer data,
diff --git a/widgets/misc/e-calendar.c b/widgets/misc/e-calendar.c
index 2c0c6ab9c0..1899d7c61f 100644
--- a/widgets/misc/e-calendar.c
+++ b/widgets/misc/e-calendar.c
@@ -51,7 +51,7 @@
 #define E_CALENDAR_ARROW_BUTTON_Y_PAD	0
 
 /* Vertical padding. The padding above the button includes the space for the
-   horizontal line. */
+ * horizontal line. */
 #define	E_CALENDAR_YPAD_ABOVE_LOWER_BUTTONS		4
 #define	E_CALENDAR_YPAD_BELOW_LOWER_BUTTONS		3
 
@@ -60,8 +60,8 @@
 #define E_CALENDAR_XPAD_BUTTONS				8
 
 /* The time between steps when the prev/next buttons is pressed, in 1/1000ths
-   of a second, and the number of timeouts we skip before we start
-   automatically moving back/forward. */
+ * of a second, and the number of timeouts we skip before we start
+ * automatically moving back/forward. */
 #define E_CALENDAR_AUTO_MOVE_TIMEOUT		150
 #define E_CALENDAR_AUTO_MOVE_TIMEOUT_DELAY	2
 
@@ -216,7 +216,7 @@ e_calendar_init (ECalendar *cal)
  * Creates a new #ECalendar.
  **/
 GtkWidget *
-e_calendar_new			(void)
+e_calendar_new (void)
 {
 	GtkWidget *cal;
 	AtkObject *a11y;
@@ -229,7 +229,7 @@ e_calendar_new			(void)
 }
 
 static void
-e_calendar_dispose		(GObject *object)
+e_calendar_dispose (GObject *object)
 {
 	ECalendar *cal;
 
@@ -256,15 +256,15 @@ e_calendar_realize (GtkWidget *widget)
 	(*GTK_WIDGET_CLASS (e_calendar_parent_class)->realize) (widget);
 
 	/* Set the background of the canvas window to the normal color,
-	   or the arrow buttons are not displayed properly. */
+	 * or the arrow buttons are not displayed properly. */
 	style = gtk_widget_get_style (widget);
 	window = gtk_layout_get_bin_window (GTK_LAYOUT (widget));
 	gdk_window_set_background (window, &style->bg[GTK_STATE_NORMAL]);
 }
 
 static void
-e_calendar_style_set		(GtkWidget	*widget,
-				 GtkStyle	*previous_style)
+e_calendar_style_set (GtkWidget *widget,
+                      GtkStyle *previous_style)
 {
 	ECalendar *e_calendar;
 
@@ -274,7 +274,7 @@ e_calendar_style_set		(GtkWidget	*widget,
 							       previous_style);
 
 	/* Set the background of the canvas window to the normal color,
-	   or the arrow buttons are not displayed properly. */
+	 * or the arrow buttons are not displayed properly. */
 	if (gtk_widget_get_realized (widget)) {
 		GtkStyle *style;
 		GdkWindow *window;
@@ -288,8 +288,8 @@ e_calendar_style_set		(GtkWidget	*widget,
 
 static void
 e_calendar_get_preferred_width (GtkWidget *widget,
-                                gint      *minimum,
-                                gint      *natural)
+                                gint *minimum,
+                                gint *natural)
 {
 	ECalendar *cal;
 	GtkStyle *style;
@@ -305,8 +305,8 @@ e_calendar_get_preferred_width (GtkWidget *widget,
 
 static void
 e_calendar_get_preferred_height (GtkWidget *widget,
-                                 gint      *minimum,
-                                 gint      *natural)
+                                 gint *minimum,
+                                 gint *natural)
 {
 	ECalendar *cal;
 	GtkStyle *style;
@@ -321,8 +321,8 @@ e_calendar_get_preferred_height (GtkWidget *widget,
 }
 
 static void
-e_calendar_size_allocate	(GtkWidget	*widget,
-				 GtkAllocation	*allocation)
+e_calendar_size_allocate (GtkWidget *widget,
+                          GtkAllocation *allocation)
 {
 	ECalendar *cal;
 	GtkStyle *style;
@@ -398,9 +398,9 @@ e_calendar_size_allocate	(GtkWidget	*widget,
 }
 
 void
-e_calendar_set_minimum_size	(ECalendar	*cal,
-				 gint		 rows,
-				 gint		 cols)
+e_calendar_set_minimum_size (ECalendar *cal,
+                             gint rows,
+                             gint cols)
 {
 	g_return_if_fail (E_IS_CALENDAR (cal));
 
@@ -416,9 +416,9 @@ e_calendar_set_minimum_size	(ECalendar	*cal,
 }
 
 void
-e_calendar_set_maximum_size	(ECalendar	*cal,
-				 gint		 rows,
-				 gint		 cols)
+e_calendar_set_maximum_size (ECalendar *cal,
+                             gint rows,
+                             gint cols)
 {
 	g_return_if_fail (E_IS_CALENDAR (cal));
 
@@ -435,11 +435,11 @@ e_calendar_set_maximum_size	(ECalendar	*cal,
 
 /* Returns the border size on each side of the month displays. */
 void
-e_calendar_get_border_size	(ECalendar	*cal,
-				 gint		*top,
-				 gint		*bottom,
-				 gint		*left,
-				 gint		*right)
+e_calendar_get_border_size (ECalendar *cal,
+                            gint *top,
+                            gint *bottom,
+                            gint *left,
+                            gint *right)
 {
 	GtkStyle *style;
 
@@ -458,20 +458,20 @@ e_calendar_get_border_size	(ECalendar	*cal,
 }
 
 static void
-e_calendar_on_prev_pressed	(ECalendar	*cal)
+e_calendar_on_prev_pressed (ECalendar *cal)
 {
 	e_calendar_start_auto_move (cal, FALSE);
 }
 
 static void
-e_calendar_on_next_pressed	(ECalendar	*cal)
+e_calendar_on_next_pressed (ECalendar *cal)
 {
 	e_calendar_start_auto_move (cal, TRUE);
 }
 
 static void
-e_calendar_start_auto_move	(ECalendar	*cal,
-				 gboolean	 moving_forward)
+e_calendar_start_auto_move (ECalendar *cal,
+                            gboolean moving_forward)
 {
 	if (cal->timeout_id == 0) {
 		cal->timeout_id = g_timeout_add (E_CALENDAR_AUTO_MOVE_TIMEOUT,
@@ -484,7 +484,7 @@ e_calendar_start_auto_move	(ECalendar	*cal,
 }
 
 static gboolean
-e_calendar_auto_move_handler	(gpointer	 data)
+e_calendar_auto_move_handler (gpointer data)
 {
 	ECalendar *cal;
 	ECalendarItem *calitem;
@@ -510,19 +510,19 @@ e_calendar_auto_move_handler	(gpointer	 data)
 }
 
 static void
-e_calendar_on_prev_released	(ECalendar	*cal)
+e_calendar_on_prev_released (ECalendar *cal)
 {
 	e_calendar_stop_auto_move (cal);
 }
 
 static void
-e_calendar_on_next_released	(ECalendar	*cal)
+e_calendar_on_next_released (ECalendar *cal)
 {
 	e_calendar_stop_auto_move (cal);
 }
 
 static void
-e_calendar_stop_auto_move	(ECalendar	*cal)
+e_calendar_stop_auto_move (ECalendar *cal)
 {
 	if (cal->timeout_id != 0) {
 		g_source_remove (cal->timeout_id);
@@ -531,45 +531,38 @@ e_calendar_stop_auto_move	(ECalendar	*cal)
 }
 
 static void
-e_calendar_on_prev_clicked      (ECalendar      *cal)
+e_calendar_on_prev_clicked (ECalendar *cal)
 {
 	e_calendar_item_set_first_month (cal->calitem, cal->calitem->year,
 		cal->calitem->month - 1);
 }
 
 static void
-e_calendar_on_next_clicked      (ECalendar      *cal)
+e_calendar_on_next_clicked (ECalendar *cal)
 {
 	e_calendar_item_set_first_month (cal->calitem, cal->calitem->year,
 		cal->calitem->month + 1);
 }
 
 static gint
-e_calendar_drag_motion (GtkWidget      *widget,
-			GdkDragContext *context,
-			gint            x,
-			gint            y,
-			guint           time)
+e_calendar_drag_motion (GtkWidget *widget,
+                        GdkDragContext *context,
+                        gint x,
+                        gint y,
+                        guint time)
 {
-#if 0
-	g_print ("In e_calendar_drag_motion\n");
-#endif
-
 	return FALSE;
 }
 
 static void
-e_calendar_drag_leave (GtkWidget      *widget,
-		       GdkDragContext *context,
-		       guint           time)
+e_calendar_drag_leave (GtkWidget *widget,
+                       GdkDragContext *context,
+                       guint time)
 {
-#if 0
-	g_print ("In e_calendar_drag_leave\n");
-#endif
 }
 
 static gboolean
-e_calendar_button_has_focus (ECalendar	*cal)
+e_calendar_button_has_focus (ECalendar *cal)
 {
 	GtkWidget *prev_widget, *next_widget;
 	gboolean ret_val;
@@ -584,7 +577,8 @@ e_calendar_button_has_focus (ECalendar	*cal)
 }
 
 static gboolean
-e_calendar_focus (GtkWidget *widget, GtkDirectionType direction)
+e_calendar_focus (GtkWidget *widget,
+                  GtkDirectionType direction)
 {
 #define E_CALENDAR_FOCUS_CHILDREN_NUM 3
 	ECalendar *cal;
@@ -641,7 +635,8 @@ e_calendar_focus (GtkWidget *widget, GtkDirectionType direction)
 }
 
 void
-e_calendar_set_focusable (ECalendar *cal, gboolean focusable)
+e_calendar_set_focusable (ECalendar *cal,
+                          gboolean focusable)
 {
 	GtkWidget *widget;
 	GtkWidget *prev_widget, *next_widget;
diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h
index a3d979c07e..027a1c1fc3 100644
--- a/widgets/misc/e-calendar.h
+++ b/widgets/misc/e-calendar.h
@@ -74,8 +74,8 @@ struct _ECalendar {
 	gint max_cols;
 
 	/* These are all used when the prev/next buttons are held down.
-	   moving_forward is TRUE if we are moving forward in time, i.e. the
-	   next button is pressed. */
+	 * moving_forward is TRUE if we are moving forward in time, i.e. the
+	 * next button is pressed. */
 	gint timeout_id;
 	gint timeout_delay;
 	gboolean moving_forward;
diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c
index dc415777d9..ea45aab4d5 100644
--- a/widgets/misc/e-canvas-background.c
+++ b/widgets/misc/e-canvas-background.c
@@ -68,7 +68,11 @@ enum {
 };
 
 static void
-ecb_bounds (GnomeCanvasItem *item, gdouble *x1, gdouble *y1, gdouble *x2, gdouble *y2)
+ecb_bounds (GnomeCanvasItem *item,
+            gdouble *x1,
+            gdouble *y1,
+            gdouble *x2,
+            gdouble *y2)
 {
 	*x1 = -G_MAXDOUBLE;
 	*y1 = -G_MAXDOUBLE;
@@ -77,7 +81,9 @@ ecb_bounds (GnomeCanvasItem *item, gdouble *x1, gdouble *y1, gdouble *x2, gdoubl
 }
 
 static void
-ecb_update (GnomeCanvasItem *item, const cairo_matrix_t *i2c, gint flags)
+ecb_update (GnomeCanvasItem *item,
+            const cairo_matrix_t *i2c,
+            gint flags)
 {
 	gdouble x1, y1, x2, y2;
 
@@ -112,9 +118,9 @@ ecb_dispose (GObject *object)
 
 static void
 ecb_set_property (GObject *object,
-		  guint prop_id,
-		  const GValue *value,
-		  GParamSpec *pspec)
+                  guint property_id,
+                  const GValue *value,
+                  GParamSpec *pspec)
 {
 	ECanvasBackground *ecb;
 
@@ -123,7 +129,7 @@ ecb_set_property (GObject *object,
 
 	ecb = E_CANVAS_BACKGROUND (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_FILL_COLOR:
 		if (g_value_get_string (value))
 			gdk_color_parse (g_value_get_string (value), &color);
@@ -157,20 +163,20 @@ ecb_set_property (GObject *object,
 
 static void
 ecb_get_property (GObject *object,
-		  guint prop_id,
-		  GValue *value,
-		  GParamSpec *pspec)
+                  guint property_id,
+                  GValue *value,
+                  GParamSpec *pspec)
 {
 	ECanvasBackground *ecb;
 
 	ecb = E_CANVAS_BACKGROUND (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_FILL_COLOR_RGBA:
 		g_value_set_uint (value, ecb->priv->rgba);
 		break;
 	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 		break;
 	}
 }
@@ -202,7 +208,11 @@ ecb_draw (GnomeCanvasItem *item,
 }
 
 static GnomeCanvasItem *
-ecb_point (GnomeCanvasItem *item, gdouble x, gdouble y, gint cx, gint cy)
+ecb_point (GnomeCanvasItem *item,
+           gdouble x,
+           gdouble y,
+           gint cx,
+           gint cy)
 {
 	return item;
 }
diff --git a/widgets/misc/e-canvas-utils.c b/widgets/misc/e-canvas-utils.c
index 4a697f8ed2..ec3aad3858 100644
--- a/widgets/misc/e-canvas-utils.c
+++ b/widgets/misc/e-canvas-utils.c
@@ -28,7 +28,9 @@
 #include "e-canvas-utils.h"
 
 void
-e_canvas_item_move_absolute (GnomeCanvasItem *item, gdouble dx, gdouble dy)
+e_canvas_item_move_absolute (GnomeCanvasItem *item,
+                             gdouble dx,
+                             gdouble dy)
 {
 	cairo_matrix_t translate;
 
@@ -40,7 +42,10 @@ e_canvas_item_move_absolute (GnomeCanvasItem *item, gdouble dx, gdouble dy)
 }
 
 static double
-compute_offset (gint top, gint bottom, gint page_top, gint page_bottom)
+compute_offset (gint top,
+                gint bottom,
+                gint page_top,
+                gint page_bottom)
 {
 	gint size = bottom - top;
 	gint offset = 0;
@@ -67,7 +72,11 @@ compute_offset (gint top, gint bottom, gint page_top, gint page_bottom)
 }
 
 static void
-e_canvas_show_area (GnomeCanvas *canvas, gdouble x1, gdouble y1, gdouble x2, gdouble y2)
+e_canvas_show_area (GnomeCanvas *canvas,
+                    gdouble x1,
+                    gdouble y1,
+                    gdouble x2,
+                    gdouble y2)
 {
 	GtkAdjustment *h, *v;
 	gint dx = 0, dy = 0;
@@ -99,7 +108,11 @@ e_canvas_show_area (GnomeCanvas *canvas, gdouble x1, gdouble y1, gdouble x2, gdo
 }
 
 void
-e_canvas_item_show_area (GnomeCanvasItem *item, gdouble x1, gdouble y1, gdouble x2, gdouble y2)
+e_canvas_item_show_area (GnomeCanvasItem *item,
+                         gdouble x1,
+                         gdouble y1,
+                         gdouble x2,
+                         gdouble y2)
 {
 	g_return_if_fail (item != NULL);
 	g_return_if_fail (GNOME_IS_CANVAS_ITEM (item));
@@ -111,7 +124,11 @@ e_canvas_item_show_area (GnomeCanvasItem *item, gdouble x1, gdouble y1, gdouble
 }
 
 static gboolean
-e_canvas_area_shown (GnomeCanvas *canvas, gdouble x1, gdouble y1, gdouble x2, gdouble y2)
+e_canvas_area_shown (GnomeCanvas *canvas,
+                     gdouble x1,
+                     gdouble y1,
+                     gdouble x2,
+                     gdouble y2)
 {
 	GtkAdjustment *h, *v;
 	gint dx = 0, dy = 0;
@@ -144,7 +161,11 @@ e_canvas_area_shown (GnomeCanvas *canvas, gdouble x1, gdouble y1, gdouble x2, gd
 }
 
 gboolean
-e_canvas_item_area_shown (GnomeCanvasItem *item, gdouble x1, gdouble y1, gdouble x2, gdouble y2)
+e_canvas_item_area_shown (GnomeCanvasItem *item,
+                          gdouble x1,
+                          gdouble y1,
+                          gdouble x2,
+                          gdouble y2)
 {
 	g_return_val_if_fail (item != NULL, FALSE);
 	g_return_val_if_fail (GNOME_IS_CANVAS_ITEM (item), FALSE);
@@ -175,7 +196,12 @@ show_area_timeout (gpointer data)
 }
 
 void
-e_canvas_item_show_area_delayed (GnomeCanvasItem *item, gdouble x1, gdouble y1, gdouble x2, gdouble y2, gint delay)
+e_canvas_item_show_area_delayed (GnomeCanvasItem *item,
+                                 gdouble x1,
+                                 gdouble y1,
+                                 gdouble x2,
+                                 gdouble y2,
+                                 gint delay)
 {
 	DoubsAndCanvas *dac;
 
diff --git a/widgets/misc/e-canvas-utils.h b/widgets/misc/e-canvas-utils.h
index 8f7600e72d..0843ba8f17 100644
--- a/widgets/misc/e-canvas-utils.h
+++ b/widgets/misc/e-canvas-utils.h
@@ -42,8 +42,8 @@ void      e_canvas_item_show_area_delayed  (GnomeCanvasItem *item,
 					    gdouble           y2,
 					    gint             delay);
 /* Returns TRUE if the area is already shown on the screen (including
-   spacing.)  This is equivelent to returning FALSE iff show_area
-   would do anything. */
+ * spacing.)  This is equivelent to returning FALSE iff show_area
+ * would do anything. */
 gboolean  e_canvas_item_area_shown         (GnomeCanvasItem *item,
 					    gdouble           x1,
 					    gdouble           y1,
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index 1513e44eb2..1b7e6ac900 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -36,8 +36,8 @@
 #include "e-canvas-utils.h"
 #include "e-canvas-vbox.h"
 
-static void e_canvas_vbox_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void e_canvas_vbox_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+static void e_canvas_vbox_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec);
+static void e_canvas_vbox_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec);
 static void e_canvas_vbox_dispose (GObject *object);
 
 static gint e_canvas_vbox_event   (GnomeCanvasItem *item, GdkEvent *event);
@@ -69,7 +69,7 @@ e_canvas_vbox_class_init (ECanvasVboxClass *klass)
 	GObjectClass *object_class;
 	GnomeCanvasItemClass *item_class;
 
-	object_class = (GObjectClass*) klass;
+	object_class = (GObjectClass *) klass;
 	item_class = (GnomeCanvasItemClass *) klass;
 
 	klass->add_item       = e_canvas_vbox_real_add_item;
@@ -123,7 +123,10 @@ e_canvas_vbox_init (ECanvasVbox *vbox)
 }
 
 static void
-e_canvas_vbox_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+e_canvas_vbox_set_property (GObject *object,
+                            guint property_id,
+                            const GValue *value,
+                            GParamSpec *pspec)
 {
 	GnomeCanvasItem *item;
 	ECanvasVbox *e_canvas_vbox;
@@ -131,7 +134,7 @@ e_canvas_vbox_set_property (GObject *object, guint prop_id, const GValue *value,
 	item = GNOME_CANVAS_ITEM (object);
 	e_canvas_vbox = E_CANVAS_VBOX (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_WIDTH:
 	case PROP_MINIMUM_WIDTH:
 		e_canvas_vbox->minimum_width = g_value_get_double (value);
@@ -146,13 +149,16 @@ e_canvas_vbox_set_property (GObject *object, guint prop_id, const GValue *value,
 }
 
 static void
-e_canvas_vbox_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+e_canvas_vbox_get_property (GObject *object,
+                            guint property_id,
+                            GValue *value,
+                            GParamSpec *pspec)
 {
 	ECanvasVbox *e_canvas_vbox;
 
 	e_canvas_vbox = E_CANVAS_VBOX (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_WIDTH:
 		g_value_set_double (value, e_canvas_vbox->width);
 		break;
@@ -166,14 +172,15 @@ e_canvas_vbox_get_property (GObject *object, guint prop_id, GValue *value, GPara
 		g_value_set_double (value, e_canvas_vbox->spacing);
 		break;
 	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 		break;
 	}
 }
 
 /* Used from g_list_foreach(); disconnects from an item's signals */
 static void
-disconnect_item_cb (gpointer data, gpointer user_data)
+disconnect_item_cb (gpointer data,
+                    gpointer user_data)
 {
 	ECanvasVbox *vbox;
 	GnomeCanvasItem *item;
@@ -202,7 +209,8 @@ e_canvas_vbox_dispose (GObject *object)
 }
 
 static gint
-e_canvas_vbox_event (GnomeCanvasItem *item, GdkEvent *event)
+e_canvas_vbox_event (GnomeCanvasItem *item,
+                     GdkEvent *event)
 {
 	gint return_val = TRUE;
 
@@ -249,14 +257,16 @@ e_canvas_vbox_realize (GnomeCanvasItem *item)
 }
 
 static void
-e_canvas_vbox_remove_item (gpointer data, GObject *where_object_was)
+e_canvas_vbox_remove_item (gpointer data,
+                           GObject *where_object_was)
 {
 	ECanvasVbox *vbox = data;
 	vbox->items = g_list_remove (vbox->items, where_object_was);
 }
 
 static void
-e_canvas_vbox_real_add_item (ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item)
+e_canvas_vbox_real_add_item (ECanvasVbox *e_canvas_vbox,
+                             GnomeCanvasItem *item)
 {
 	e_canvas_vbox->items = g_list_append (e_canvas_vbox->items, item);
 	g_object_weak_ref (G_OBJECT (item),
@@ -270,7 +280,8 @@ e_canvas_vbox_real_add_item (ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item)
 }
 
 static void
-e_canvas_vbox_real_add_item_start (ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item)
+e_canvas_vbox_real_add_item_start (ECanvasVbox *e_canvas_vbox,
+                                   GnomeCanvasItem *item)
 {
 	e_canvas_vbox->items = g_list_prepend (e_canvas_vbox->items, item);
 	g_object_weak_ref (G_OBJECT (item),
@@ -299,7 +310,8 @@ e_canvas_vbox_resize_children (GnomeCanvasItem *item)
 }
 
 static void
-e_canvas_vbox_reflow ( GnomeCanvasItem *item, gint flags )
+e_canvas_vbox_reflow (GnomeCanvasItem *item,
+                      gint flags)
 {
 	ECanvasVbox *e_canvas_vbox = E_CANVAS_VBOX (item);
 	if (item->flags & GNOME_CANVAS_ITEM_REALIZED) {
@@ -361,14 +373,16 @@ e_canvas_vbox_reflow ( GnomeCanvasItem *item, gint flags )
 }
 
 void
-e_canvas_vbox_add_item (ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item)
+e_canvas_vbox_add_item (ECanvasVbox *e_canvas_vbox,
+                        GnomeCanvasItem *item)
 {
 	if (E_CANVAS_VBOX_CLASS (G_OBJECT_GET_CLASS (e_canvas_vbox))->add_item)
 		(E_CANVAS_VBOX_CLASS (G_OBJECT_GET_CLASS (e_canvas_vbox))->add_item) (e_canvas_vbox, item);
 }
 
 void
-e_canvas_vbox_add_item_start (ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item)
+e_canvas_vbox_add_item_start (ECanvasVbox *e_canvas_vbox,
+                              GnomeCanvasItem *item)
 {
 	if (E_CANVAS_VBOX_CLASS (G_OBJECT_GET_CLASS (e_canvas_vbox))->add_item_start)
 		(E_CANVAS_VBOX_CLASS (G_OBJECT_GET_CLASS (e_canvas_vbox))->add_item_start) (e_canvas_vbox, item);
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index b27b7182d7..5e6889fa8e 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -195,7 +195,8 @@ gnome_canvas_item_invoke_point (GnomeCanvasItem *item,
 #define DISPLAY_X1(canvas) (GNOME_CANVAS (canvas)->layout.xoffset)
 #define DISPLAY_Y1(canvas) (GNOME_CANVAS (canvas)->layout.yoffset)
 static gint
-pick_current_item (GnomeCanvas *canvas, GdkEvent *event)
+pick_current_item (GnomeCanvas *canvas,
+                   GdkEvent *event)
 {
 	gint button_down;
 	gdouble x, y;
diff --git a/widgets/misc/e-cell-renderer-combo.c b/widgets/misc/e-cell-renderer-combo.c
index 5994c075c5..07382b9225 100644
--- a/widgets/misc/e-cell-renderer-combo.c
+++ b/widgets/misc/e-cell-renderer-combo.c
@@ -44,7 +44,8 @@ G_DEFINE_TYPE (
 	GTK_TYPE_CELL_RENDERER_TEXT)
 
 static void
-ecrc_editing_done (GtkCellEditable *editable, ECellRendererCombo *cell)
+ecrc_editing_done (GtkCellEditable *editable,
+                   ECellRendererCombo *cell)
 {
 	const gchar *new_text;
 
@@ -59,8 +60,13 @@ ecrc_editing_done (GtkCellEditable *editable, ECellRendererCombo *cell)
 }
 
 static GtkCellEditable *
-ecrc_start_editing (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, const gchar *path,
-		    const GdkRectangle *bg_area, const GdkRectangle *cell_area, GtkCellRendererState flags)
+ecrc_start_editing (GtkCellRenderer *cell,
+                    GdkEvent *event,
+                    GtkWidget *widget,
+                    const gchar *path,
+                    const GdkRectangle *bg_area,
+                    const GdkRectangle *cell_area,
+                    GtkCellRendererState flags)
 {
 	ECellRendererCombo *combo_cell = E_CELL_RENDERER_COMBO (cell);
 	GtkCellRendererText *text_cell = GTK_CELL_RENDERER_TEXT (cell);
@@ -91,8 +97,13 @@ ecrc_start_editing (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, c
 }
 
 static void
-ecrc_get_size (GtkCellRenderer *cell, GtkWidget *widget, const GdkRectangle *cell_area,
-	       gint *x_offset, gint *y_offset, gint *width, gint *height)
+ecrc_get_size (GtkCellRenderer *cell,
+               GtkWidget *widget,
+               const GdkRectangle *cell_area,
+               gint *x_offset,
+               gint *y_offset,
+               gint *width,
+               gint *height)
 {
 	GtkWidget *btn;
 	GtkRequisition req;
@@ -108,11 +119,14 @@ ecrc_get_size (GtkCellRenderer *cell, GtkWidget *widget, const GdkRectangle *cel
 }
 
 static void
-ecrc_get_prop (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+ecrc_get_prop (GObject *object,
+               guint property_id,
+               GValue *value,
+               GParamSpec *pspec)
 {
 	ECellRendererCombo *ecrc = E_CELL_RENDERER_COMBO (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_LIST:
 		g_value_set_pointer (value, ecrc->priv->list);
 		break;
@@ -122,11 +136,14 @@ ecrc_get_prop (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 }
 
 static void
-ecrc_set_prop (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+ecrc_set_prop (GObject *object,
+               guint property_id,
+               const GValue *value,
+               GParamSpec *pspec)
 {
 	ECellRendererCombo *ecrc = E_CELL_RENDERER_COMBO (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_LIST:
 		ecrc->priv->list = g_value_get_pointer (value);
 		break;
diff --git a/widgets/misc/e-combo-cell-editable.c b/widgets/misc/e-combo-cell-editable.c
index 49ce7ce733..00a8382833 100644
--- a/widgets/misc/e-combo-cell-editable.c
+++ b/widgets/misc/e-combo-cell-editable.c
@@ -61,7 +61,9 @@ kill_popup (EComboCellEditable *ecce)
 }
 
 static gboolean
-popup_key_press_cb (GtkWidget *widget, GdkEventKey *event, EComboCellEditable *ecce)
+popup_key_press_cb (GtkWidget *widget,
+                    GdkEventKey *event,
+                    EComboCellEditable *ecce)
 {
 	switch (event->keyval) {
 	case GDK_KEY_Escape:
@@ -83,7 +85,9 @@ popup_key_press_cb (GtkWidget *widget, GdkEventKey *event, EComboCellEditable *e
 }
 
 static gboolean
-popup_button_press_cb (GtkWidget *widget, GdkEventButton *event, EComboCellEditable *ecce)
+popup_button_press_cb (GtkWidget *widget,
+                       GdkEventButton *event,
+                       EComboCellEditable *ecce)
 {
 	GtkAllocation alloc;
 	GdkWindow *window;
@@ -110,14 +114,17 @@ popup_button_press_cb (GtkWidget *widget, GdkEventButton *event, EComboCellEdita
 }
 
 static gboolean
-tree_button_release_cb (GtkWidget *widget, GdkEventButton *event, EComboCellEditable *ecce)
+tree_button_release_cb (GtkWidget *widget,
+                        GdkEventButton *event,
+                        EComboCellEditable *ecce)
 {
 	kill_popup (ecce);
 	return TRUE;
 }
 
 static void
-selection_changed_cb (GtkTreeSelection *selection, EComboCellEditable *ecce)
+selection_changed_cb (GtkTreeSelection *selection,
+                      EComboCellEditable *ecce)
 {
 	GtkTreeModel *model;
 	GtkTreeIter iter;
@@ -179,7 +186,8 @@ build_popup (EComboCellEditable *ecce)
 }
 
 static gint
-lookup_row (GList *list, const gchar *text)
+lookup_row (GList *list,
+            const gchar *text)
 {
 	GList *l;
 	gint result = 0;
@@ -192,7 +200,8 @@ lookup_row (GList *list, const gchar *text)
 }
 
 static void
-set_cursor (GtkTreeView *tree_view, gint index)
+set_cursor (GtkTreeView *tree_view,
+            gint index)
 {
 	GtkTreePath *path = gtk_tree_path_new ();
 	gtk_tree_path_append_index (path, index);
@@ -210,7 +219,10 @@ grab_popup (GdkWindow *popup)
 }
 
 static void
-position_popup (EComboCellEditable *ecce, gint x, gint y, gint offset)
+position_popup (EComboCellEditable *ecce,
+                gint x,
+                gint y,
+                gint offset)
 {
 	GtkRequisition req;
 
@@ -258,7 +270,8 @@ show_popup (EComboCellEditable *ecce)
 }
 
 static void
-button_clicked_cb (GtkButton *btn, EComboCellEditable *ecce)
+button_clicked_cb (GtkButton *btn,
+                   EComboCellEditable *ecce)
 {
 	if (ecce->priv->popup) {
 		kill_popup (ecce);
@@ -269,14 +282,17 @@ button_clicked_cb (GtkButton *btn, EComboCellEditable *ecce)
 }
 
 static void
-entry_activated_cb (GtkEntry *entry, EComboCellEditable *widget)
+entry_activated_cb (GtkEntry *entry,
+                    EComboCellEditable *widget)
 {
 	gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (widget));
 	gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (widget));
 }
 
 static gboolean
-entry_key_press_event_cb (GtkEntry *entry, GdkEventKey *key_event, EComboCellEditable *ecce)
+entry_key_press_event_cb (GtkEntry *entry,
+                          GdkEventKey *key_event,
+                          EComboCellEditable *ecce)
 {
 	if (key_event->keyval == GDK_KEY_Escape) {
 		ecce->priv->cancelled = TRUE;
@@ -297,7 +313,8 @@ entry_key_press_event_cb (GtkEntry *entry, GdkEventKey *key_event, EComboCellEdi
 }
 
 static void
-ecce_start_editing (GtkCellEditable *cell_editable, GdkEvent *event)
+ecce_start_editing (GtkCellEditable *cell_editable,
+                    GdkEvent *event)
 {
 	EComboCellEditable *ecce = E_COMBO_CELL_EDITABLE (cell_editable);
 
@@ -383,7 +400,8 @@ e_combo_cell_editable_get_list (EComboCellEditable *ecce)
 }
 
 void
-e_combo_cell_editable_set_list (EComboCellEditable *ecce, GList *list)
+e_combo_cell_editable_set_list (EComboCellEditable *ecce,
+                                GList *list)
 {
 	g_return_if_fail (E_IS_COMBO_CELL_EDITABLE (ecce));
 
@@ -399,7 +417,8 @@ e_combo_cell_editable_get_text (EComboCellEditable *ecce)
 }
 
 void
-e_combo_cell_editable_set_text (EComboCellEditable *ecce, const gchar *text)
+e_combo_cell_editable_set_text (EComboCellEditable *ecce,
+                                const gchar *text)
 {
 	g_return_if_fail (E_IS_COMBO_CELL_EDITABLE (ecce));
 
diff --git a/widgets/misc/e-contact-map-window.c b/widgets/misc/e-contact-map-window.c
index 2984d4094d..9612f0d6ac 100644
--- a/widgets/misc/e-contact-map-window.c
+++ b/widgets/misc/e-contact-map-window.c
@@ -99,7 +99,7 @@ book_contacts_received_cb (GObject *source_object,
 
 	for (p = contacts; p; p = p->next)
 		e_contact_map_add_contact (
-			window->priv->map, (EContact*) p->data);
+			window->priv->map, (EContact *) p->data);
 
 	e_client_util_free_object_slist (contacts);
 	g_object_unref (client);
@@ -254,7 +254,7 @@ contact_map_window_entry_key_pressed_cb (GtkWidget *entry,
 
 static gboolean
 entry_completion_match_selected_cb (GtkEntryCompletion *widget,
-                                    GtkTreeModel* model,
+                                    GtkTreeModel *model,
                                     GtkTreeIter *iter,
                                     gpointer user_data)
 {
@@ -456,7 +456,7 @@ e_contact_map_window_load_addressbook (EContactMapWindow *map,
 	g_return_if_fail (E_IS_BOOK_CLIENT (book_client));
 
 	/* Reference book, so that it does not get deleted before the callback is
-	   involved. The book is unrefed in the callback */
+	 * involved. The book is unrefed in the callback */
 	g_object_ref (book_client);
 
 	book_query = e_book_query_field_exists (E_CONTACT_ADDRESS);
@@ -470,7 +470,7 @@ e_contact_map_window_load_addressbook (EContactMapWindow *map,
 	g_free (query_string);
 }
 
-EContactMap*
+EContactMap *
 e_contact_map_window_get_map (EContactMapWindow *window)
 {
 	g_return_val_if_fail (E_IS_CONTACT_MAP_WINDOW (window), NULL);
diff --git a/widgets/misc/e-contact-map-window.h b/widgets/misc/e-contact-map-window.h
index ea92d75c46..a73ce47e46 100644
--- a/widgets/misc/e-contact-map-window.h
+++ b/widgets/misc/e-contact-map-window.h
@@ -65,12 +65,12 @@ struct _EContactMapWindowClass {
 };
 
 GType			e_contact_map_window_get_type		(void) G_GNUC_CONST;
-EContactMapWindow*	e_contact_map_window_new		(void);
+EContactMapWindow *	e_contact_map_window_new		(void);
 
 void			e_contact_map_window_load_addressbook	(EContactMapWindow *window,
 								 EBookClient *book);
 
-EContactMap*		e_contact_map_window_get_map		(EContactMapWindow *window);
+EContactMap *		e_contact_map_window_get_map		(EContactMapWindow *window);
 
 G_END_DECLS
 
diff --git a/widgets/misc/e-contact-map.c b/widgets/misc/e-contact-map.c
index dfe5454011..500600de7c 100644
--- a/widgets/misc/e-contact-map.c
+++ b/widgets/misc/e-contact-map.c
@@ -83,13 +83,13 @@ contact_map_geocode_address (EContactAddress *address)
 
 static void
 contact_map_address_resolved_cb (GeoclueGeocode *geocode,
-				 GeocluePositionFields fields,
-				 double latitude,
-				 double longitude,
-				 double altitude,
-				 GeoclueAccuracy *accuracy,
-				 GError *error,
-				 struct GeoclueCallbackData *data)
+                                 GeocluePositionFields fields,
+                                 double latitude,
+                                 double longitude,
+                                 double altitude,
+                                 GeoclueAccuracy *accuracy,
+                                 GError *error,
+                                 struct GeoclueCallbackData *data)
 {
 	EContactMapPrivate *priv;
 	gpointer marker_ptr;
@@ -101,8 +101,8 @@ contact_map_address_resolved_cb (GeoclueGeocode *geocode,
 	g_return_if_fail (data->marker && E_IS_CONTACT_MARKER (data->marker));
 
 	/* If the marker_layer does not exist anymore, the map has probably been destroyed before this
-	   callback was launched. It's not a failure, just silently clean up what was left behind
-	   a pretend nothing happend */
+	 * callback was launched. It's not a failure, just silently clean up what was left behind
+	 * a pretend nothing happend */
 
 	if (!data->map->priv->marker_layer || !CHAMPLAIN_IS_MARKER_LAYER (data->map->priv->marker_layer)) {
 		goto exit;
@@ -150,8 +150,8 @@ exit:
 
 static void
 resolve_marker_position (EContactMap *map,
-			 EContactMarker *marker,
-			 EContactAddress *address)
+                         EContactMarker *marker,
+                         EContactAddress *address)
 {
 	GHashTable *details;
 
@@ -166,7 +166,7 @@ resolve_marker_position (EContactMap *map,
 		callback_data->marker = marker;
 
 		/* Make sure the map won't cease to exist before the address
-		   is resolved */
+		 * is resolved */
 		g_object_ref (map);
 
 		geocoder = geoclue_geocode_new ("org.freedesktop.Geoclue.Providers.Yahoo",
@@ -268,7 +268,7 @@ e_contact_map_init (EContactMap *map)
 	map->priv->marker_layer = layer;
 }
 
-GtkWidget*
+GtkWidget *
 e_contact_map_new (void)
 {
 	return g_object_new (
@@ -277,7 +277,7 @@ e_contact_map_new (void)
 
 void
 e_contact_map_add_contact (EContactMap *map,
-			   EContact *contact)
+                           EContact *contact)
 {
 	EContactAddress *address;
 	EContactPhoto *photo;
@@ -312,10 +312,10 @@ e_contact_map_add_contact (EContactMap *map,
 
 void
 e_contact_map_add_marker (EContactMap *map,
-			  const gchar *name,
-			  const gchar *contact_uid,
-			  EContactAddress *address,
-			  EContactPhoto *photo)
+                          const gchar *name,
+                          const gchar *contact_uid,
+                          EContactAddress *address,
+                          EContactPhoto *photo)
 {
 	EContactMarker *marker;
 
@@ -335,7 +335,7 @@ e_contact_map_add_marker (EContactMap *map,
  */
 void
 e_contact_map_remove_contact (EContactMap *map,
-			      const gchar *name)
+                              const gchar *name)
 {
 	ChamplainMarker *marker;
 
@@ -353,7 +353,7 @@ e_contact_map_remove_contact (EContactMap *map,
 
 void
 e_contact_map_remove_marker (EContactMap *map,
-			     ClutterActor *marker)
+                             ClutterActor *marker)
 {
 	const gchar *name;
 
@@ -367,7 +367,7 @@ e_contact_map_remove_marker (EContactMap *map,
 
 void
 e_contact_map_zoom_on_marker (EContactMap *map,
-			      ClutterActor *marker)
+                              ClutterActor *marker)
 {
 	ChamplainView *view;
 	gdouble lat, lng;
@@ -384,7 +384,7 @@ e_contact_map_zoom_on_marker (EContactMap *map,
 	champlain_view_set_zoom_level (view, 15);
 }
 
-ChamplainView*
+ChamplainView *
 e_contact_map_get_view (EContactMap *map)
 {
 	g_return_val_if_fail (E_IS_CONTACT_MAP (map), NULL);
diff --git a/widgets/misc/e-contact-map.h b/widgets/misc/e-contact-map.h
index f2f98f72b6..a5ff813ad8 100644
--- a/widgets/misc/e-contact-map.h
+++ b/widgets/misc/e-contact-map.h
@@ -97,7 +97,7 @@ void		e_contact_map_remove_marker	(EContactMap *map,
 void		e_contact_map_zoom_on_marker	(EContactMap *map,
 						 ClutterActor *marker);
 
-ChamplainView*  e_contact_map_get_view		(EContactMap *map);
+ChamplainView *  e_contact_map_get_view		(EContactMap *map);
 
 G_END_DECLS
 
diff --git a/widgets/misc/e-contact-marker.c b/widgets/misc/e-contact-marker.c
index b5781c8c3b..7d7f57db25 100644
--- a/widgets/misc/e-contact-marker.c
+++ b/widgets/misc/e-contact-marker.c
@@ -74,8 +74,8 @@ static ClutterColor DEFAULT_COLOR = { 0x33, 0x33, 0x33, 0xff };
 
 static gboolean
 contact_marker_clicked_cb (ClutterActor *actor,
-			   ClutterEvent *event,
-			   gpointer user_data)
+                           ClutterEvent *event,
+                           gpointer user_data)
 {
 	gint click_count = clutter_event_get_click_count (event);
 
@@ -87,7 +87,7 @@ contact_marker_clicked_cb (ClutterActor *actor,
 
 static ClutterActor *
 texture_new_from_pixbuf (GdkPixbuf *pixbuf,
-			 GError **error)
+                         GError **error)
 {
 	ClutterActor *texture = NULL;
 	const guchar *data;
@@ -114,7 +114,7 @@ texture_new_from_pixbuf (GdkPixbuf *pixbuf,
 	return texture;
 }
 
-static ClutterActor*
+static ClutterActor *
 contact_photo_to_texture (EContactPhoto *photo)
 {
 	GdkPixbuf *pixbuf;
@@ -168,9 +168,9 @@ contact_photo_to_texture (EContactPhoto *photo)
 
 static void
 draw_box (cairo_t *cr,
-	  gint width,
-	  gint height,
-	  gint point)
+          gint width,
+          gint height,
+          gint point)
 {
       cairo_move_to (cr, RADIUS, 0);
       cairo_line_to (cr, width - RADIUS, 0);
@@ -185,9 +185,9 @@ draw_box (cairo_t *cr,
 
 static void
 draw_shadow (EContactMarker *marker,
-	     gint width,
-	     gint height,
-	     gint point)
+             gint width,
+             gint height,
+             gint point)
 {
 	EContactMarkerPrivate *priv = marker->priv;
 	ClutterActor *shadow = NULL;
@@ -232,9 +232,9 @@ draw_shadow (EContactMarker *marker,
 
 static void
 draw_background (EContactMarker *marker,
-		 gint width,
-		 gint height,
-		 gint point)
+                 gint width,
+                 gint height,
+                 gint point)
 {
 	EContactMarkerPrivate *priv = marker->priv;
 	ClutterActor *bg = NULL;
@@ -295,7 +295,7 @@ draw_marker (EContactMarker *marker)
 	ClutterText *text;
 
 	if (priv->image) {
-		clutter_actor_set_position (priv->image, 2*PADDING, 2*PADDING);
+		clutter_actor_set_position (priv->image, 2 *PADDING, 2 *PADDING);
 		if (clutter_actor_get_parent (priv->image) == NULL)
 			clutter_container_add_actor (
 				CLUTTER_CONTAINER (priv->content_group),
@@ -326,14 +326,14 @@ draw_marker (EContactMarker *marker)
 	if (priv->image) {
 		clutter_actor_set_width (priv->text_actor,
 			clutter_actor_get_width (priv->image));
-		total_height = clutter_actor_get_height (priv->image) + 2*PADDING +
-			       clutter_actor_get_height (priv->text_actor) + 2*PADDING;
-		total_width = clutter_actor_get_width (priv->image) + 4*PADDING;
+		total_height = clutter_actor_get_height (priv->image) + 2 *PADDING +
+			       clutter_actor_get_height (priv->text_actor) + 2 *PADDING;
+		total_width = clutter_actor_get_width (priv->image) + 4 *PADDING;
 		clutter_actor_set_position (priv->text_actor, PADDING,
-			clutter_actor_get_height (priv->image)+2*PADDING+3);
+			clutter_actor_get_height (priv->image) + 2 *PADDING + 3);
 	} else {
-		total_height = clutter_actor_get_height (priv->text_actor) + 2*PADDING;
-		total_width = clutter_actor_get_width (priv->text_actor) + 4*PADDING;
+		total_height = clutter_actor_get_height (priv->text_actor) + 2 *PADDING;
+		total_width = clutter_actor_get_width (priv->text_actor) + 4 *PADDING;
 		clutter_actor_set_position (priv->text_actor, 2 * PADDING, PADDING);
 	}
 
@@ -395,8 +395,8 @@ queue_redraw (EContactMarker *marker)
 
 static void
 allocate (ClutterActor *self,
-	  const ClutterActorBox *box,
-	  ClutterAllocationFlags flags)
+          const ClutterActorBox *box,
+          ClutterAllocationFlags flags)
 {
 	ClutterActorBox child_box;
 	EContactMarkerPrivate *priv = E_CONTACT_MARKER (self)->priv;
@@ -473,8 +473,8 @@ pick (ClutterActor *self,
 
 static void
 notify_selected (GObject *gobject,
-		 G_GNUC_UNUSED GParamSpec *pspec,
-		 G_GNUC_UNUSED gpointer user_data)
+                 G_GNUC_UNUSED GParamSpec *pspec,
+                 G_GNUC_UNUSED gpointer user_data)
 {
 	queue_redraw (E_CONTACT_MARKER (gobject));
 }
@@ -573,8 +573,8 @@ e_contact_marker_init (EContactMarker *marker)
 
 ClutterActor *
 e_contact_marker_new (const gchar *name,
-		      const gchar *contact_uid,
-		      EContactPhoto *photo)
+                      const gchar *contact_uid,
+                      EContactPhoto *photo)
 {
 	ClutterActor *marker = CLUTTER_ACTOR (g_object_new (E_TYPE_CONTACT_MARKER, NULL));
 	EContactMarkerPrivate *priv = E_CONTACT_MARKER (marker)->priv;
diff --git a/widgets/misc/e-contact-marker.h b/widgets/misc/e-contact-marker.h
index 7b332b15e7..996e922e1c 100644
--- a/widgets/misc/e-contact-marker.h
+++ b/widgets/misc/e-contact-marker.h
@@ -71,7 +71,7 @@ struct _EContactMarkerClass
 
 GType e_contact_marker_get_type		(void);
 
-ClutterActor* e_contact_marker_new		(const gchar *name,
+ClutterActor * e_contact_marker_new		(const gchar *name,
 						 const gchar *contact_uid,
 						 EContactPhoto *photo);
 
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index acc3c08fe5..2a9eb7f457 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -56,7 +56,7 @@ struct _EDateEditPrivate {
 	GtkWidget *now_button;
 	GtkWidget *today_button;
 	GtkWidget *none_button;		/* This will only be visible if a
-					   'None' date/time is permitted. */
+					 * 'None' date/time is permitted. */
 
 	gboolean show_date;
 	gboolean show_time;
@@ -79,8 +79,8 @@ struct _EDateEditPrivate {
 	gboolean date_is_valid;
 
 	/* This is the last valid date which was set. If the date was set to
-	   'None' or empty, date_set_to_none will be TRUE and the other fields
-	   are undefined, so don't use them. */
+	 * 'None' or empty, date_set_to_none will be TRUE and the other fields
+	 * are undefined, so don't use them. */
 	gboolean date_set_to_none;
 	gint year;
 	gint month;
@@ -95,8 +95,8 @@ struct _EDateEditPrivate {
 	gboolean time_is_valid;
 
 	/* This is the last valid time which was set. If the time was set to
-	   'None' or empty, time_set_to_none will be TRUE and the other fields
-	   are undefined, so don't use them. */
+	 * 'None' or empty, time_set_to_none will be TRUE and the other fields
+	 * are undefined, so don't use them. */
 	gboolean time_set_to_none;
 	gint hour;
 	gint minute;
@@ -491,7 +491,7 @@ e_date_edit_init (EDateEdit *dedit)
  * Returns: a new #EDateEdit widget.
  */
 GtkWidget *
-e_date_edit_new			(void)
+e_date_edit_new (void)
 {
 	EDateEdit *dedit;
 	AtkObject *a11y;
@@ -504,7 +504,7 @@ e_date_edit_new			(void)
 }
 
 static void
-create_children			(EDateEdit	*dedit)
+create_children (EDateEdit *dedit)
 {
 	EDateEditPrivate *priv;
 	ECalendar *calendar;
@@ -673,7 +673,7 @@ create_children			(EDateEdit	*dedit)
 			  G_CALLBACK (on_date_popup_today_button_clicked), dedit);
 
 	/* Note that we don't show this here, since by default a 'None' date
-	   is not permitted. */
+	 * is not permitted. */
 	priv->none_button = gtk_button_new_with_mnemonic (_("_None"));
 	gtk_container_add (GTK_CONTAINER (bbox), priv->none_button);
 	g_signal_connect (priv->none_button, "clicked",
@@ -686,16 +686,17 @@ create_children			(EDateEdit	*dedit)
 
 /* GtkWidget::mnemonic_activate() handler for the EDateEdit */
 static gboolean
-e_date_edit_mnemonic_activate (GtkWidget *widget, gboolean group_cycling)
+e_date_edit_mnemonic_activate (GtkWidget *widget,
+                               gboolean group_cycling)
 {
 	e_date_edit_grab_focus (widget);
 	return TRUE;
 }
 
 /* Grab_focus handler for the EDateEdit. If the date field is being shown, we
-   grab the focus to that, otherwise we grab it to the time field. */
+ * grab the focus to that, otherwise we grab it to the time field. */
 static void
-e_date_edit_grab_focus		(GtkWidget	*widget)
+e_date_edit_grab_focus (GtkWidget *widget)
 {
 	EDateEdit *dedit;
 	GtkWidget *child;
@@ -721,7 +722,8 @@ e_date_edit_grab_focus		(GtkWidget	*widget)
  * date from the GtkEntry.
  */
 void
-e_date_edit_set_editable (EDateEdit *dedit, gboolean editable)
+e_date_edit_set_editable (EDateEdit *dedit,
+                          gboolean editable)
 {
 	EDateEditPrivate *priv;
 
@@ -746,7 +748,7 @@ e_date_edit_set_editable (EDateEdit *dedit, gboolean editable)
  * check this with e_date_edit_time_is_valid().
  */
 time_t
-e_date_edit_get_time		(EDateEdit	*dedit)
+e_date_edit_get_time (EDateEdit *dedit)
 {
 	EDateEditPrivate *priv;
 	struct tm tmp_tm = { 0 };
@@ -793,8 +795,8 @@ e_date_edit_get_time		(EDateEdit	*dedit)
  * e_date_edit_set_date() and e_date_edit_set_time_of_day() instead.
  */
 void
-e_date_edit_set_time		(EDateEdit	*dedit,
-				 time_t		 the_time)
+e_date_edit_set_time (EDateEdit *dedit,
+                      time_t the_time)
 {
 	EDateEditPrivate *priv;
 	struct tm tmp_tm;
@@ -852,10 +854,10 @@ e_date_edit_set_time		(EDateEdit	*dedit,
  * Returns the last valid date entered into the date field.
  */
 gboolean
-e_date_edit_get_date		(EDateEdit	*dedit,
-				 gint		*year,
-				 gint		*month,
-				 gint		*day)
+e_date_edit_get_date (EDateEdit *dedit,
+                      gint *year,
+                      gint *month,
+                      gint *day)
 {
 	EDateEditPrivate *priv;
 
@@ -887,10 +889,10 @@ e_date_edit_get_date		(EDateEdit	*dedit,
  * Sets the date in the date field.
  */
 void
-e_date_edit_set_date		(EDateEdit	*dedit,
-				 gint		 year,
-				 gint		 month,
-				 gint		 day)
+e_date_edit_set_date (EDateEdit *dedit,
+                      gint year,
+                      gint month,
+                      gint day)
 {
 	gboolean date_changed = FALSE;
 
@@ -918,9 +920,9 @@ e_date_edit_set_date		(EDateEdit	*dedit,
  * Returns the last valid time entered into the time field.
  */
 gboolean
-e_date_edit_get_time_of_day		(EDateEdit	*dedit,
-					 gint		*hour,
-					 gint		*minute)
+e_date_edit_get_time_of_day (EDateEdit *dedit,
+                             gint *hour,
+                             gint *minute)
 {
 	EDateEditPrivate *priv;
 
@@ -951,9 +953,9 @@ e_date_edit_get_time_of_day		(EDateEdit	*dedit,
  * Description: Sets the time in the time field.
  */
 void
-e_date_edit_set_time_of_day		(EDateEdit	*dedit,
-					 gint		 hour,
-					 gint		 minute)
+e_date_edit_set_time_of_day (EDateEdit *dedit,
+                             gint hour,
+                             gint minute)
 {
 	EDateEditPrivate *priv;
 	gboolean time_changed = FALSE;
@@ -985,12 +987,12 @@ e_date_edit_set_time_of_day		(EDateEdit	*dedit,
 }
 
 void
-e_date_edit_set_date_and_time_of_day       (EDateEdit      *dedit,
-					    gint            year,
-					    gint            month,
-					    gint            day,
-					    gint            hour,
-					    gint            minute)
+e_date_edit_set_date_and_time_of_day (EDateEdit *dedit,
+                                      gint year,
+                                      gint month,
+                                      gint day,
+                                      gint hour,
+                                      gint minute)
 {
 	gboolean date_changed, time_changed;
 
@@ -1017,7 +1019,7 @@ e_date_edit_set_date_and_time_of_day       (EDateEdit      *dedit,
  * Description: Returns TRUE if the date field is currently shown.
  */
 gboolean
-e_date_edit_get_show_date		(EDateEdit	*dedit)
+e_date_edit_get_show_date (EDateEdit *dedit)
 {
 	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), TRUE);
 
@@ -1033,8 +1035,8 @@ e_date_edit_get_show_date		(EDateEdit	*dedit)
  * field would be hidden if only a time needed to be entered.
  */
 void
-e_date_edit_set_show_date		(EDateEdit	*dedit,
-					 gboolean	 show_date)
+e_date_edit_set_show_date (EDateEdit *dedit,
+                           gboolean show_date)
 {
 	EDateEditPrivate *priv;
 
@@ -1074,7 +1076,7 @@ e_date_edit_set_show_date		(EDateEdit	*dedit,
  * Description: Returns TRUE if the time field is currently shown.
  */
 gboolean
-e_date_edit_get_show_time		(EDateEdit	*dedit)
+e_date_edit_get_show_time (EDateEdit *dedit)
 {
 	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), TRUE);
 
@@ -1090,8 +1092,8 @@ e_date_edit_get_show_time		(EDateEdit	*dedit)
  * field would be hidden if only a date needed to be entered.
  */
 void
-e_date_edit_set_show_time		(EDateEdit	*dedit,
-					 gboolean	 show_time)
+e_date_edit_set_show_time (EDateEdit *dedit,
+                           gboolean show_time)
 {
 	EDateEditPrivate *priv;
 
@@ -1119,7 +1121,7 @@ e_date_edit_set_show_time		(EDateEdit	*dedit,
  * hiding it.
  */
 gboolean
-e_date_edit_get_make_time_insensitive	(EDateEdit	*dedit)
+e_date_edit_get_make_time_insensitive (EDateEdit *dedit)
 {
 	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), TRUE);
 
@@ -1140,8 +1142,8 @@ e_date_edit_get_make_time_insensitive	(EDateEdit	*dedit)
  * disappear as that may affect the layout of the widgets.
  */
 void
-e_date_edit_set_make_time_insensitive	(EDateEdit	*dedit,
-					 gboolean	 make_insensitive)
+e_date_edit_set_make_time_insensitive (EDateEdit *dedit,
+                                       gboolean make_insensitive)
 {
 	EDateEditPrivate *priv;
 
@@ -1255,7 +1257,7 @@ e_date_edit_set_use_24_hour_format (EDateEdit *dedit,
 }
 
 /* Whether we allow the date to be set to 'None'. e_date_edit_get_time() will
-   return (time_t) -1 in this case. */
+ * return (time_t) -1 in this case. */
 gboolean
 e_date_edit_get_allow_no_date_set (EDateEdit *dedit)
 {
@@ -1274,8 +1276,8 @@ e_date_edit_set_allow_no_date_set (EDateEdit *dedit,
 
 	if (!allow_no_date_set) {
 		/* If the date is showing, we make sure it isn't 'None' (we
-		   don't really mind if the time is empty), else if just the
-		   time is showing we make sure it isn't 'None'. */
+		 * don't really mind if the time is empty), else if just the
+		 * time is showing we make sure it isn't 'None'. */
 		if (dedit->priv->show_date) {
 			if (dedit->priv->date_set_to_none)
 				e_date_edit_set_time (dedit, 0);
@@ -1290,9 +1292,9 @@ e_date_edit_set_allow_no_date_set (EDateEdit *dedit,
 
 /* The range of time to show in the time combo popup. */
 void
-e_date_edit_get_time_popup_range	(EDateEdit	*dedit,
-					 gint		*lower_hour,
-					 gint		*upper_hour)
+e_date_edit_get_time_popup_range (EDateEdit *dedit,
+                                  gint *lower_hour,
+                                  gint *upper_hour)
 {
 	g_return_if_fail (E_IS_DATE_EDIT (dedit));
 
@@ -1301,9 +1303,9 @@ e_date_edit_get_time_popup_range	(EDateEdit	*dedit,
 }
 
 void
-e_date_edit_set_time_popup_range	(EDateEdit	*dedit,
-					 gint		 lower_hour,
-					 gint		 upper_hour)
+e_date_edit_set_time_popup_range (EDateEdit *dedit,
+                                  gint lower_hour,
+                                  gint upper_hour)
 {
 	EDateEditPrivate *priv;
 
@@ -1321,22 +1323,22 @@ e_date_edit_set_time_popup_range	(EDateEdit	*dedit,
 	rebuild_time_popup (dedit);
 
 	/* Setting the combo list items seems to mess up the time entry, so
-	   we set it again. We have to reset it to its last valid time. */
+	 * we set it again. We have to reset it to its last valid time. */
 	priv->time_is_valid = TRUE;
 	e_date_edit_update_time_entry (dedit);
 }
 
 /* The arrow button beside the date field has been clicked, so we show the
-   popup with the ECalendar in. */
+ * popup with the ECalendar in. */
 static void
-on_date_button_clicked		(GtkWidget	*widget,
-				 EDateEdit	*dedit)
+on_date_button_clicked (GtkWidget *widget,
+                        EDateEdit *dedit)
 {
 	e_date_edit_show_date_popup (dedit);
 }
 
 static void
-e_date_edit_show_date_popup	(EDateEdit	*dedit)
+e_date_edit_show_date_popup (EDateEdit *dedit)
 {
 	EDateEditPrivate *priv;
 	ECalendar *calendar;
@@ -1365,7 +1367,7 @@ e_date_edit_show_date_popup	(EDateEdit	*dedit)
 	}
 
 	/* FIXME: Hack. Change ECalendarItem so it doesn't queue signal
-	   emissions. */
+	 * emissions. */
 	calendar->calitem->selection_changed = FALSE;
 
 	position_date_popup (dedit);
@@ -1385,9 +1387,9 @@ e_date_edit_show_date_popup	(EDateEdit	*dedit)
 }
 
 /* This positions the date popup below and to the left of the arrow button,
-   just before it is shown. */
+ * just before it is shown. */
 static void
-position_date_popup		(EDateEdit	*dedit)
+position_date_popup (EDateEdit *dedit)
 {
 	gint x, y;
 	gint win_x, win_y;
@@ -1427,10 +1429,10 @@ position_date_popup		(EDateEdit	*dedit)
 }
 
 /* A date has been selected in the date popup, so we set the date field
-   and hide the popup. */
+ * and hide the popup. */
 static void
-on_date_popup_date_selected	(ECalendarItem	*calitem,
-				 EDateEdit	*dedit)
+on_date_popup_date_selected (ECalendarItem *calitem,
+                             EDateEdit *dedit)
 {
 	GDate start_date, end_date;
 
@@ -1445,16 +1447,16 @@ on_date_popup_date_selected	(ECalendarItem	*calitem,
 }
 
 static void
-on_date_popup_now_button_clicked	(GtkWidget	*button,
-					 EDateEdit	*dedit)
+on_date_popup_now_button_clicked (GtkWidget *button,
+                                  EDateEdit *dedit)
 {
 	hide_date_popup (dedit);
 	e_date_edit_set_time (dedit, 0);
 }
 
 static void
-on_date_popup_today_button_clicked	(GtkWidget	*button,
-					 EDateEdit	*dedit)
+on_date_popup_today_button_clicked (GtkWidget *button,
+                                    EDateEdit *dedit)
 {
 	EDateEditPrivate *priv;
 	struct tm tmp_tm;
@@ -1476,19 +1478,19 @@ on_date_popup_today_button_clicked	(GtkWidget	*button,
 }
 
 static void
-on_date_popup_none_button_clicked	(GtkWidget	*button,
-					 EDateEdit	*dedit)
+on_date_popup_none_button_clicked (GtkWidget *button,
+                                   EDateEdit *dedit)
 {
 	hide_date_popup (dedit);
 	e_date_edit_set_time (dedit, -1);
 }
 
 /* A key has been pressed while the date popup is showing. If it is the Escape
-   key we hide the popup. */
+ * key we hide the popup. */
 static gint
-on_date_popup_key_press			(GtkWidget	*widget,
-					 GdkEventKey	*event,
-					 EDateEdit	*dedit)
+on_date_popup_key_press (GtkWidget *widget,
+                         GdkEventKey *event,
+                         EDateEdit *dedit)
 {
 	GdkWindow *window;
 
@@ -1506,13 +1508,13 @@ on_date_popup_key_press			(GtkWidget	*widget,
 }
 
 /* A mouse button has been pressed while the date popup is showing.
-   Any button press events used to select days etc. in the popup will have
-   have been handled elsewhere, so here we just hide the popup.
-   (This function is yanked from gtkcombo.c) */
+ * Any button press events used to select days etc. in the popup will have
+ * have been handled elsewhere, so here we just hide the popup.
+ * (This function is yanked from gtkcombo.c) */
 static gint
-on_date_popup_button_press	(GtkWidget	*widget,
-				 GdkEventButton *event,
-				 gpointer	 data)
+on_date_popup_button_press (GtkWidget *widget,
+                            GdkEventButton *event,
+                            gpointer data)
 {
 	EDateEdit *dedit;
 	GtkWidget *child;
@@ -1542,10 +1544,10 @@ on_date_popup_button_press	(GtkWidget	*widget,
 }
 
 /* A delete event has been received for the date popup, so we hide it and
-   return TRUE so it doesn't get destroyed. */
+ * return TRUE so it doesn't get destroyed. */
 static gint
-on_date_popup_delete_event	(GtkWidget	*widget,
-				 EDateEdit	*dedit)
+on_date_popup_delete_event (GtkWidget *widget,
+                            EDateEdit *dedit)
 {
 	hide_date_popup (dedit);
 	return TRUE;
@@ -1553,7 +1555,7 @@ on_date_popup_delete_event	(GtkWidget	*widget,
 
 /* Hides the date popup, removing any grabs. */
 static void
-hide_date_popup			(EDateEdit	*dedit)
+hide_date_popup (EDateEdit *dedit)
 {
 	gtk_widget_hide (dedit->priv->cal_popup);
 	gtk_grab_remove (dedit->priv->cal_popup);
@@ -1562,9 +1564,9 @@ hide_date_popup			(EDateEdit	*dedit)
 }
 
 /* Clears the time popup and rebuilds it using the lower_hour, upper_hour
-   and use_24_hour_format settings. */
+ * and use_24_hour_format settings. */
 static void
-rebuild_time_popup			(EDateEdit	*dedit)
+rebuild_time_popup (EDateEdit *dedit)
 {
 	EDateEditPrivate *priv;
 	GtkTreeModel *model;
@@ -1629,8 +1631,8 @@ rebuild_time_popup			(EDateEdit	*dedit)
 
 static gboolean
 e_date_edit_parse_date (EDateEdit *dedit,
-			const gchar *date_text,
-			struct tm *date_tm)
+                        const gchar *date_text,
+                        struct tm *date_tm)
 {
 	gboolean twodigit_year = FALSE;
 
@@ -1652,9 +1654,9 @@ e_date_edit_parse_date (EDateEdit *dedit,
 }
 
 static gboolean
-e_date_edit_parse_time	(EDateEdit	*dedit,
-			 const gchar	*time_text,
-			 struct tm	*time_tm)
+e_date_edit_parse_time (EDateEdit *dedit,
+                        const gchar *time_text,
+                        struct tm *time_tm)
 {
 	if (field_set_to_none (time_text)) {
 		time_tm->tm_hour = 0;
@@ -1669,7 +1671,7 @@ e_date_edit_parse_time	(EDateEdit	*dedit,
 }
 
 /* Returns TRUE if the string is empty or is "None" in the current locale.
-   It ignores whitespace. */
+ * It ignores whitespace. */
 static gboolean
 field_set_to_none (const gchar *text)
 {
@@ -1678,7 +1680,7 @@ field_set_to_none (const gchar *text)
 	gint n;
 
 	pos = text;
-	while (n = (gint)((guchar)*pos), isspace (n))
+	while (n = (gint)((guchar) * pos), isspace (n))
 		pos++;
 
 	/* Translators: "None" for date field of a date edit, shown when
@@ -1691,15 +1693,15 @@ field_set_to_none (const gchar *text)
 }
 
 static void
-on_date_edit_time_selected	(GtkComboBox	*combo,
-				 EDateEdit	*dedit)
+on_date_edit_time_selected (GtkComboBox *combo,
+                            EDateEdit *dedit)
 {
 	GtkWidget *child;
 
 	child = gtk_bin_get_child (GTK_BIN (combo));
 
 	/* We only want to emit signals when an item is selected explicitly,
-	   not when it is selected by the silly combo update thing. */
+	 * not when it is selected by the silly combo update thing. */
 	if (gtk_combo_box_get_active (combo) == -1)
 		return;
 
@@ -1710,9 +1712,9 @@ on_date_edit_time_selected	(GtkComboBox	*combo,
 }
 
 static gint
-on_date_entry_key_press			(GtkWidget	*widget,
-					 GdkEventKey	*event,
-					 EDateEdit	*dedit)
+on_date_entry_key_press (GtkWidget *widget,
+                         GdkEventKey *event,
+                         EDateEdit *dedit)
 {
 	if (event->state & GDK_MOD1_MASK
 	    && (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_Down
@@ -1724,7 +1726,7 @@ on_date_entry_key_press			(GtkWidget	*widget,
 	}
 
 	/* If the user hits the return key emit a "date_changed" signal if
-	   needed. But let the signal carry on. */
+	 * needed. But let the signal carry on. */
 	if (event->keyval == GDK_KEY_Return) {
 		e_date_edit_check_date_changed (dedit);
 		return FALSE;
@@ -1734,16 +1736,16 @@ on_date_entry_key_press			(GtkWidget	*widget,
 }
 
 static gint
-on_time_entry_key_press			(GtkWidget	*widget,
-					 GdkEventKey	*event,
-					 EDateEdit	*dedit)
+on_time_entry_key_press (GtkWidget *widget,
+                         GdkEventKey *event,
+                         EDateEdit *dedit)
 {
 	GtkWidget *child;
 
 	child = gtk_bin_get_child (GTK_BIN (dedit->priv->time_combo));
 
 	/* I'd like to use Alt+Up/Down for popping up the list, like Win32,
-	   but the combo steals any Up/Down keys, so we use Alt+Return. */
+	 * but the combo steals any Up/Down keys, so we use Alt + Return. */
 #if 0
 	if (event->state & GDK_MOD1_MASK
 	    && (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_Down)) {
@@ -1756,7 +1758,7 @@ on_time_entry_key_press			(GtkWidget	*widget,
 	}
 
 	/* Stop the return key from emitting the activate signal, and check
-	   if we need to emit a "time_changed" signal. */
+	 * if we need to emit a "time_changed" signal. */
 	if (event->keyval == GDK_KEY_Return) {
 		g_signal_stop_emission_by_name (widget,
 						"key_press_event");
@@ -1768,18 +1770,18 @@ on_time_entry_key_press			(GtkWidget	*widget,
 }
 
 static gint
-on_date_entry_key_release		(GtkWidget	*widget,
-					 GdkEventKey	*event,
-					 EDateEdit	*dedit)
+on_date_entry_key_release (GtkWidget *widget,
+                           GdkEventKey *event,
+                           EDateEdit *dedit)
 {
 	e_date_edit_check_date_changed (dedit);
 	return TRUE;
 }
 
 static gint
-on_time_entry_key_release		(GtkWidget	*widget,
-					 GdkEventKey	*event,
-					 EDateEdit	*dedit)
+on_time_entry_key_release (GtkWidget *widget,
+                           GdkEventKey *event,
+                           EDateEdit *dedit)
 {
 	if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_Down) {
 		g_signal_stop_emission_by_name (widget,
@@ -1792,9 +1794,9 @@ on_time_entry_key_release		(GtkWidget	*widget,
 }
 
 static gint
-on_date_entry_focus_out			(GtkEntry	*entry,
-					 GdkEventFocus  *event,
-					 EDateEdit	*dedit)
+on_date_entry_focus_out (GtkEntry *entry,
+                         GdkEventFocus *event,
+                         EDateEdit *dedit)
 {
 	struct tm tmp_tm;
 	GtkWidget *msg_dialog;
@@ -1841,16 +1843,16 @@ on_date_entry_focus_out			(GtkEntry	*entry,
 }
 
 static gint
-on_time_entry_focus_out			(GtkEntry	*entry,
-					 GdkEventFocus  *event,
-					 EDateEdit	*dedit)
+on_time_entry_focus_out (GtkEntry *entry,
+                         GdkEventFocus *event,
+                         EDateEdit *dedit)
 {
 	GtkWidget *msg_dialog;
 
 	e_date_edit_check_time_changed (dedit);
 
 	if (!e_date_edit_time_is_valid (dedit)) {
-		msg_dialog=gtk_message_dialog_new (NULL,
+		msg_dialog = gtk_message_dialog_new (NULL,
 						  GTK_DIALOG_MODAL,
 						  GTK_MESSAGE_WARNING,
 						  GTK_BUTTONS_OK,
@@ -1865,7 +1867,8 @@ on_time_entry_focus_out			(GtkEntry	*entry,
 }
 
 static void
-add_relation (EDateEdit *dedit, GtkWidget *widget)
+add_relation (EDateEdit *dedit,
+              GtkWidget *widget)
 {
 	AtkObject *a11yEdit, *a11yWidget;
 	AtkRelationSet *set;
@@ -1906,7 +1909,7 @@ add_relation (EDateEdit *dedit, GtkWidget *widget)
 
 /* This sets the text in the date entry according to the current settings. */
 static void
-e_date_edit_update_date_entry		(EDateEdit	*dedit)
+e_date_edit_update_date_entry (EDateEdit *dedit)
 {
 	EDateEditPrivate *priv;
 	gchar buffer[100];
@@ -2033,7 +2036,7 @@ e_date_edit_update_time_entry (EDateEdit *dedit)
 }
 
 static void
-e_date_edit_update_time_combo_state	(EDateEdit	*dedit)
+e_date_edit_update_time_combo_state (EDateEdit *dedit)
 {
 	EDateEditPrivate *priv;
 	gboolean show = TRUE, show_now_button = TRUE;
@@ -2043,7 +2046,7 @@ e_date_edit_update_time_combo_state	(EDateEdit	*dedit)
 	priv = dedit->priv;
 
 	/* If the date entry is currently shown, and it is set to None,
-	   clear the time entry and disable the time combo. */
+	 * clear the time entry and disable the time combo. */
 	if (priv->show_date && priv->date_set_to_none) {
 		clear_entry = TRUE;
 		sensitive = FALSE;
@@ -2090,9 +2093,9 @@ e_date_edit_update_time_combo_state	(EDateEdit	*dedit)
 }
 
 /* Parses the date, and if it is different from the current settings it
-   updates the settings and emits a "date_changed" signal. */
+ * updates the settings and emits a "date_changed" signal. */
 static void
-e_date_edit_check_date_changed		(EDateEdit	*dedit)
+e_date_edit_check_date_changed (EDateEdit *dedit)
 {
 	EDateEditPrivate *priv;
 	const gchar *date_text;
@@ -2127,9 +2130,9 @@ e_date_edit_check_date_changed		(EDateEdit	*dedit)
 }
 
 /* Parses the time, and if it is different from the current settings it
-   updates the settings and emits a "time_changed" signal. */
+ * updates the settings and emits a "time_changed" signal. */
 static void
-e_date_edit_check_time_changed		(EDateEdit	*dedit)
+e_date_edit_check_time_changed (EDateEdit *dedit)
 {
 	EDateEditPrivate *priv;
 	GtkWidget *child;
@@ -2171,7 +2174,7 @@ e_date_edit_check_time_changed		(EDateEdit	*dedit)
  * valid.
  */
 gboolean
-e_date_edit_date_is_valid	(EDateEdit	*dedit)
+e_date_edit_date_is_valid (EDateEdit *dedit)
 {
 	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), FALSE);
 
@@ -2198,7 +2201,7 @@ e_date_edit_date_is_valid	(EDateEdit	*dedit)
  * entered which was valid.
  */
 gboolean
-e_date_edit_time_is_valid	(EDateEdit	*dedit)
+e_date_edit_time_is_valid (EDateEdit *dedit)
 {
 	g_return_val_if_fail (E_IS_DATE_EDIT (dedit), FALSE);
 
@@ -2206,8 +2209,8 @@ e_date_edit_time_is_valid	(EDateEdit	*dedit)
 		return FALSE;
 
 	/* If the time is empty and that isn't permitted, return FALSE.
-	   Note that we don't mind an empty time if the date field is shown
-	   - in that case we just assume 0:00. */
+	 * Note that we don't mind an empty time if the date field is shown
+	 * - in that case we just assume 0:00. */
 	if (dedit->priv->time_set_to_none && !dedit->priv->show_date
 	    && !e_date_edit_get_allow_no_date_set (dedit))
 		return FALSE;
@@ -2233,12 +2236,12 @@ e_date_edit_have_time (EDateEdit *dedit)
 }
 
 static gboolean
-e_date_edit_set_date_internal	(EDateEdit	*dedit,
-				 gboolean	 valid,
-				 gboolean	 none,
-				 gint		 year,
-				 gint		 month,
-				 gint		 day)
+e_date_edit_set_date_internal (EDateEdit *dedit,
+                               gboolean valid,
+                               gboolean none,
+                               gint year,
+                               gint month,
+                               gint day)
 {
 	EDateEditPrivate *priv;
 	gboolean date_changed = FALSE;
@@ -2279,11 +2282,11 @@ e_date_edit_set_date_internal	(EDateEdit	*dedit,
 }
 
 static gboolean
-e_date_edit_set_time_internal	(EDateEdit	*dedit,
-				 gboolean	 valid,
-				 gboolean	 none,
-				 gint		 hour,
-				 gint		 minute)
+e_date_edit_set_time_internal (EDateEdit *dedit,
+                               gboolean valid,
+                               gboolean none,
+                               gint hour,
+                               gint minute)
 {
 	EDateEditPrivate *priv;
 	gboolean time_changed = FALSE;
@@ -2337,13 +2340,13 @@ void       e_date_edit_set_twodigit_year_can_future (EDateEdit  *dedit,
 }
 
 /* Sets a callback to use to get the current time. This is useful if the
-   application needs to use its own timezone data rather than rely on the
-   Unix timezone. */
+ * application needs to use its own timezone data rather than rely on the
+ * Unix timezone. */
 void
-e_date_edit_set_get_time_callback	(EDateEdit	*dedit,
-					 EDateEditGetTimeCallback cb,
-					 gpointer	 data,
-					 GDestroyNotify destroy)
+e_date_edit_set_get_time_callback (EDateEdit *dedit,
+                                   EDateEditGetTimeCallback cb,
+                                   gpointer data,
+                                   GDestroyNotify destroy)
 {
 	EDateEditPrivate *priv;
 
@@ -2361,7 +2364,7 @@ e_date_edit_set_get_time_callback	(EDateEdit	*dedit,
 }
 
 GtkWidget *
-e_date_edit_get_entry       (EDateEdit      *dedit)
+e_date_edit_get_entry (EDateEdit *dedit)
 {
 	EDateEditPrivate *priv;
 	priv = dedit->priv;
diff --git a/widgets/misc/e-dateedit.h b/widgets/misc/e-dateedit.h
index 28032dd8c9..f490a5f359 100644
--- a/widgets/misc/e-dateedit.h
+++ b/widgets/misc/e-dateedit.h
@@ -73,15 +73,15 @@ struct _EDateEditClass {
 };
 
 GType      e_date_edit_get_type			(void);
-GtkWidget* e_date_edit_new			(void);
+GtkWidget * e_date_edit_new			(void);
 
 /* Analogous to gtk_editable_set_editable.  disable editing, while still
-   allowing selection. */
+ * allowing selection. */
 void       e_date_edit_set_editable             (EDateEdit      *dedit, gboolean editable);
 
 /* Returns TRUE if the last date and time set were valid. The date and time
-   are only set when the user hits Return or switches keyboard focus, or
-   selects a date or time from the popup. */
+ * are only set when the user hits Return or switches keyboard focus, or
+ * selects a date or time from the popup. */
 gboolean   e_date_edit_date_is_valid		(EDateEdit	*dedit);
 gboolean   e_date_edit_time_is_valid		(EDateEdit	*dedit);
 
@@ -89,14 +89,14 @@ gboolean   e_date_edit_time_is_valid		(EDateEdit	*dedit);
 gboolean   e_date_edit_have_time		(EDateEdit	*dedit);
 
 /* Returns the last valid date & time set, or -1 if the date & time was set to
-   'None' and this is permitted via e_date_edit_set_allow_no_date_set. */
+ * 'None' and this is permitted via e_date_edit_set_allow_no_date_set. */
 time_t	   e_date_edit_get_time			(EDateEdit	*dedit);
 void       e_date_edit_set_time			(EDateEdit	*dedit,
 						 time_t		 the_time);
 
 /* This returns the last valid date set, without the time. It returns TRUE
-   if a date is set, or FALSE if the date is set to 'None' and this is
-   permitted via e_date_edit_set_allow_no_date_set. (Month is 1 - 12). */
+ * if a date is set, or FALSE if the date is set to 'None' and this is
+ * permitted via e_date_edit_set_allow_no_date_set. (Month is 1 - 12). */
 gboolean   e_date_edit_get_date			(EDateEdit	*dedit,
 						 gint		*year,
 						 gint		*month,
@@ -107,8 +107,8 @@ void	   e_date_edit_set_date			(EDateEdit	*dedit,
 						 gint		 day);
 
 /* This returns the last valid time set, without the date. It returns TRUE
-   if a time is set, or FALSE if the time is set to 'None' and this is
-   permitted via e_date_edit_set_allow_no_date_set. */
+ * if a time is set, or FALSE if the time is set to 'None' and this is
+ * permitted via e_date_edit_set_allow_no_date_set. */
 gboolean   e_date_edit_get_time_of_day		(EDateEdit	*dedit,
 						 gint		*hour,
 						 gint		*minute);
@@ -150,7 +150,7 @@ void       e_date_edit_set_use_24_hour_format	(EDateEdit	*dedit,
 						 gboolean	 use_24_hour_format);
 
 /* Whether we allow the date to be set to 'None'. e_date_edit_get_time() will
-   return (time_t) -1 in this case. */
+ * return (time_t) -1 in this case. */
 gboolean   e_date_edit_get_allow_no_date_set	(EDateEdit	*dedit);
 void       e_date_edit_set_allow_no_date_set	(EDateEdit	*dedit,
 						 gboolean	 allow_no_date_set);
@@ -174,13 +174,13 @@ void       e_date_edit_set_twodigit_year_can_future (EDateEdit  *dedit,
 						     gboolean    value);
 
 /* Sets a callback to use to get the current time. This is useful if the
-   application needs to use its own timezone data rather than rely on the
-   Unix timezone. */
+ * application needs to use its own timezone data rather than rely on the
+ * Unix timezone. */
 void	   e_date_edit_set_get_time_callback	(EDateEdit	*dedit,
 						 EDateEditGetTimeCallback cb,
 						 gpointer	 data,
 						 GDestroyNotify  destroy);
 
-GtkWidget* e_date_edit_get_entry       (EDateEdit      *dedit);
+GtkWidget * e_date_edit_get_entry       (EDateEdit      *dedit);
 
 #endif
diff --git a/widgets/misc/e-import-assistant.c b/widgets/misc/e-import-assistant.c
index 69cf847ae5..06dff88e29 100644
--- a/widgets/misc/e-import-assistant.c
+++ b/widgets/misc/e-import-assistant.c
@@ -159,7 +159,7 @@ filename_changed (GtkWidget *widget,
 		gboolean valid;
 		GSList *l;
 		EImportImporter *first = NULL;
-		gint i=0, firstitem=0;
+		gint i = 0, firstitem = 0;
 
 		g_free (page->target->uri_src);
 		page->target->uri_src = g_filename_to_uri (filename, NULL, NULL);
@@ -541,7 +541,7 @@ prepare_intelligent_page (GtkAssistant *assistant,
 
 	table = gtk_table_new (g_slist_length (l), 2, FALSE);
 	row = 0;
-	for (;l;l=l->next) {
+	for (; l; l = l->next) {
 		EImportImporter *eii = l->data;
 		gchar *str;
 		GtkWidget *w, *label;
@@ -558,11 +558,11 @@ prepare_intelligent_page (GtkAssistant *assistant,
 
 		gtk_table_attach (
 			GTK_TABLE (table), label,
-			0, 1, row, row+1, GTK_FILL, 0, 0, 0);
+			0, 1, row, row + 1, GTK_FILL, 0, 0, 0);
 		if (w)
 			gtk_table_attach (
 				GTK_TABLE (table), w,
-				1, 2, row, row+1, GTK_FILL, 0, 3, 0);
+				1, 2, row, row + 1, GTK_FILL, 0, 3, 0);
 		row++;
 	}
 
@@ -597,7 +597,8 @@ import_done (EImport *ei,
 }
 
 static void
-import_simple_done (EImport *ei, gpointer user_data)
+import_simple_done (EImport *ei,
+                    gpointer user_data)
 {
 	EImportAssistant *import_assistant = user_data;
 	EImportAssistantPrivate *priv;
@@ -775,7 +776,7 @@ prepare_progress_page (GtkAssistant *assistant,
 	gtk_assistant_add_action_widget (assistant, cancel_button);
 	gtk_widget_show (cancel_button);
 
-	g_object_get (G_OBJECT (assistant), "is-simple", &is_simple, NULL);
+	g_object_get (assistant, "is-simple", &is_simple, NULL);
 
 	intelligent_import = is_simple ? FALSE : gtk_toggle_button_get_active (
 		GTK_TOGGLE_BUTTON (priv->type_page.intelligent));
@@ -809,7 +810,8 @@ prepare_progress_page (GtkAssistant *assistant,
 }
 
 static void
-simple_filetype_changed_cb (GtkComboBox *combo_box, GtkAssistant *assistant)
+simple_filetype_changed_cb (GtkComboBox *combo_box,
+                            GtkAssistant *assistant)
 {
 	EImportAssistantPrivate *priv;
 	ImportSimplePage *page;
@@ -853,7 +855,8 @@ simple_filetype_changed_cb (GtkComboBox *combo_box, GtkAssistant *assistant)
 }
 
 static void
-prepare_simple_page (GtkAssistant *assistant, GtkWidget *vbox)
+prepare_simple_page (GtkAssistant *assistant,
+                     GtkWidget *vbox)
 {
 	EImportAssistantPrivate *priv;
 	GSList *importers, *imp;
@@ -963,7 +966,7 @@ forward_cb (gint current_page,
 	GtkToggleButton *toggle_button;
 	gboolean is_simple = FALSE;
 
-	g_object_get (G_OBJECT (import_assistant), "is-simple", &is_simple, NULL);
+	g_object_get (import_assistant, "is-simple", &is_simple, NULL);
 
 	if (is_simple) {
 		if (!import_assistant->priv->simple_page.has_preview)
@@ -1036,7 +1039,7 @@ set_import_uris (EImportAssistant *assistant,
 
 				if (importers != NULL) {
 					/* there is at least one importer which can be used,
-					   thus there can be done an import */
+					 * thus there can be done an import */
 					fileuris = g_ptr_array_new ();
 				}
 
@@ -1175,7 +1178,7 @@ import_assistant_prepare (GtkAssistant *assistant,
 	gint page_no = gtk_assistant_get_current_page (assistant);
 	gboolean is_simple = FALSE;
 
-	g_object_get (G_OBJECT (assistant), "is-simple", &is_simple, NULL);
+	g_object_get (assistant, "is-simple", &is_simple, NULL);
 
 	if (is_simple) {
 		if (page_no == 0) {
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c
index dd02486a43..a239709415 100644
--- a/widgets/misc/e-map.c
+++ b/widgets/misc/e-map.c
@@ -155,7 +155,8 @@ e_map_stop_tweening (EMap *map)
 }
 
 static void
-e_map_tween_destroy (EMap *map, EMapTween *tween)
+e_map_tween_destroy (EMap *map,
+                     EMapTween *tween)
 {
 	map->priv->tweens = g_slist_remove (map->priv->tweens, tween);
 	g_slice_free (EMapTween, tween);
@@ -313,7 +314,8 @@ e_map_apply_tween (EMapTween *tween,
 }
 
 static void
-e_map_tweens_compute_matrix (EMap *map, cairo_matrix_t *matrix)
+e_map_tweens_compute_matrix (EMap *map,
+                             cairo_matrix_t *matrix)
 {
 	GSList *walk;
 	gdouble zoom, x, y, latitude, longitude, effect;
@@ -348,7 +350,8 @@ e_map_tweens_compute_matrix (EMap *map, cairo_matrix_t *matrix)
 /* GtkScrollable implementation */
 
 static void
-e_map_adjustment_changed (GtkAdjustment *adjustment, EMap *map)
+e_map_adjustment_changed (GtkAdjustment *adjustment,
+                          EMap *map)
 {
 	EMapPrivate *priv = map->priv;
 
@@ -420,7 +423,8 @@ e_map_set_vadjustment_values (EMap *map)
 }
 
 static void
-e_map_set_hadjustment (EMap *map, GtkAdjustment *adjustment)
+e_map_set_hadjustment (EMap *map,
+                       GtkAdjustment *adjustment)
 {
 	EMapPrivate *priv = map->priv;
 
@@ -447,7 +451,8 @@ e_map_set_hadjustment (EMap *map, GtkAdjustment *adjustment)
 }
 
 static void
-e_map_set_vadjustment (EMap *map, GtkAdjustment *adjustment)
+e_map_set_vadjustment (EMap *map,
+                       GtkAdjustment *adjustment)
 {
 	EMapPrivate *priv = map->priv;
 
@@ -479,7 +484,7 @@ e_map_set_vadjustment (EMap *map, GtkAdjustment *adjustment)
 
 static void
 e_map_set_property (GObject *object,
-                    guint prop_id,
+                    guint property_id,
                     const GValue *value,
                     GParamSpec *pspec)
 {
@@ -487,7 +492,7 @@ e_map_set_property (GObject *object,
 
 	map = E_MAP (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_HADJUSTMENT:
 		e_map_set_hadjustment (map, g_value_get_object (value));
 		break;
@@ -504,14 +509,14 @@ e_map_set_property (GObject *object,
 		break;
 
 	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 		break;
 	}
 }
 
 static void
 e_map_get_property (GObject *object,
-                    guint prop_id,
+                    guint property_id,
                     GValue *value,
                     GParamSpec *pspec)
 {
@@ -519,7 +524,7 @@ e_map_get_property (GObject *object,
 
 	map = E_MAP (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_HADJUSTMENT:
 		g_value_set_object (value, map->priv->hadjustment);
 		break;
@@ -534,7 +539,7 @@ e_map_get_property (GObject *object,
 		break;
 
 	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 		break;
 	}
 }
@@ -618,7 +623,9 @@ e_map_unrealize (GtkWidget *widget)
 }
 
 static void
-e_map_get_preferred_width (GtkWidget *widget, gint *minimum, gint *natural)
+e_map_get_preferred_width (GtkWidget *widget,
+                           gint *minimum,
+                           gint *natural)
 {
 	EMap *map;
 
@@ -633,7 +640,9 @@ e_map_get_preferred_width (GtkWidget *widget, gint *minimum, gint *natural)
 }
 
 static void
-e_map_get_preferred_height (GtkWidget *widget, gint *minimum, gint *natural)
+e_map_get_preferred_height (GtkWidget *widget,
+                            gint *minimum,
+                            gint *natural)
 {
 	EMap *view;
 	EMapPrivate *priv;
@@ -650,7 +659,8 @@ e_map_get_preferred_height (GtkWidget *widget, gint *minimum, gint *natural)
 }
 
 static void
-e_map_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
+e_map_size_allocate (GtkWidget *widget,
+                     GtkAllocation *allocation)
 {
 	EMap *map;
 
@@ -680,7 +690,8 @@ e_map_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 }
 
 static gboolean
-e_map_draw (GtkWidget *widget, cairo_t *cr)
+e_map_draw (GtkWidget *widget,
+            cairo_t *cr)
 {
 	EMap *map;
 	cairo_matrix_t matrix;
@@ -704,14 +715,16 @@ e_map_draw (GtkWidget *widget, cairo_t *cr)
 }
 
 static gint
-e_map_button_press (GtkWidget *widget, GdkEventButton *event)
+e_map_button_press (GtkWidget *widget,
+                    GdkEventButton *event)
 {
 	if (!gtk_widget_has_focus (widget)) gtk_widget_grab_focus (widget);
 		return TRUE;
 }
 
 static gint
-e_map_button_release (GtkWidget *widget, GdkEventButton *event)
+e_map_button_release (GtkWidget *widget,
+                      GdkEventButton *event)
 {
 	if (event->button != 1) return FALSE;
 
@@ -720,7 +733,8 @@ e_map_button_release (GtkWidget *widget, GdkEventButton *event)
 }
 
 static gint
-e_map_motion (GtkWidget *widget, GdkEventMotion *event)
+e_map_motion (GtkWidget *widget,
+              GdkEventMotion *event)
 {
 	return FALSE;
 }
@@ -934,7 +948,8 @@ e_map_get_magnification (EMap *map)
 }
 
 static void
-e_map_set_zoom (EMap *map, EMapZoomState zoom)
+e_map_set_zoom (EMap *map,
+                EMapZoomState zoom)
 {
 	if (map->priv->zoom_state == zoom)
 		return;
@@ -986,7 +1001,8 @@ e_map_zoom_out (EMap *map)
 }
 
 void
-e_map_set_smooth_zoom (EMap *map, gboolean state)
+e_map_set_smooth_zoom (EMap *map,
+                       gboolean state)
 {
 	((EMapPrivate *) map->priv)->smooth_zoom = state;
 }
@@ -1040,7 +1056,8 @@ e_map_add_point (EMap *map,
 }
 
 void
-e_map_remove_point (EMap *map, EMapPoint *point)
+e_map_remove_point (EMap *map,
+                    EMapPoint *point)
 {
 	g_ptr_array_remove (map->priv->points, point);
 
@@ -1094,7 +1111,8 @@ e_map_point_set_color_rgba (EMap *map,
 }
 
 void
-e_map_point_set_data (EMapPoint *point, gpointer data)
+e_map_point_set_data (EMapPoint *point,
+                      gpointer data)
 {
 	point->user_data = data;
 }
@@ -1106,7 +1124,8 @@ e_map_point_get_data (EMapPoint *point)
 }
 
 gboolean
-e_map_point_is_in_view (EMap *map, EMapPoint *point)
+e_map_point_is_in_view (EMap *map,
+                        EMapPoint *point)
 {
 	GtkAllocation allocation;
 	gdouble x, y;
@@ -1165,7 +1184,8 @@ update_and_paint (EMap *map)
 }
 
 static gint
-load_map_background (EMap *map, gchar *name)
+load_map_background (EMap *map,
+                     gchar *name)
 {
 	GdkPixbuf *pb0;
 
@@ -1251,7 +1271,8 @@ update_render_surface (EMap *map,
 /* Redraw point in client surface */
 
 static void
-update_render_point (EMap *map, EMapPoint *point)
+update_render_point (EMap *map,
+                     EMapPoint *point)
 {
 	cairo_t *cr;
 	gdouble px, py;
@@ -1295,7 +1316,8 @@ update_render_point (EMap *map, EMapPoint *point)
 /* Repaint point on X server */
 
 static void
-repaint_point (EMap *map, EMapPoint *point)
+repaint_point (EMap *map,
+               EMapPoint *point)
 {
 	gdouble px, py;
 
@@ -1310,7 +1332,9 @@ repaint_point (EMap *map, EMapPoint *point)
 }
 
 static void
-center_at (EMap *map, gdouble longitude, gdouble latitude)
+center_at (EMap *map,
+           gdouble longitude,
+           gdouble latitude)
 {
 	GtkAllocation allocation;
 	gint pb_width, pb_height;
@@ -1335,7 +1359,9 @@ center_at (EMap *map, gdouble longitude, gdouble latitude)
 /* Scrolls the view to the specified offsets.  Does not perform range checking!  */
 
 static void
-scroll_to (EMap *map, gint x, gint y)
+scroll_to (EMap *map,
+           gint x,
+           gint y)
 {
 	gint xofs, yofs;
 
@@ -1354,7 +1380,9 @@ scroll_to (EMap *map, gint x, gint y)
 }
 
 static void
-set_scroll_area (EMap *view, gint width, gint height)
+set_scroll_area (EMap *view,
+                 gint width,
+                 gint height)
 {
 	EMapPrivate *priv;
 	GtkAllocation allocation;
diff --git a/widgets/misc/e-paned.c b/widgets/misc/e-paned.c
index b98dc1928d..c90d40c140 100644
--- a/widgets/misc/e-paned.c
+++ b/widgets/misc/e-paned.c
@@ -57,6 +57,14 @@ G_DEFINE_TYPE (
 	GTK_TYPE_PANED)
 
 static gboolean
+paned_queue_resize_on_idle (GtkWidget *paned)
+{
+	gtk_widget_queue_resize_no_redraw (paned);
+
+	return FALSE;
+}
+
+static gboolean
 paned_window_state_event_cb (EPaned *paned,
                              GdkEventWindowState *event,
                              GtkWidget *toplevel)
@@ -240,19 +248,6 @@ paned_realize (GtkWidget *widget)
 		priv->toplevel_ready = TRUE;
 }
 
-static gboolean
-paned_queue_resize_on_idle (gpointer user_data)
-{
-	GtkWidget *paned = user_data;
-
-	g_return_val_if_fail (paned != NULL, FALSE);
-
-	gtk_widget_queue_resize_no_redraw (paned);
-	g_object_unref (paned);
-
-	return FALSE;
-}
-
 static void
 paned_size_allocate (GtkWidget *widget,
                      GtkAllocation *allocation)
@@ -297,10 +292,13 @@ paned_size_allocate (GtkWidget *widget,
 	paned->priv->sync_request = SYNC_REQUEST_NONE;
 
 	/* gtk_paned_set_position() calls queue_resize, which cannot
-	   be called from size_allocate, thus call it on idle to take
-	   the change in the effect.
-	*/
-	g_idle_add (paned_queue_resize_on_idle, g_object_ref (paned));
+	 * be called from size_allocate, so schedule it from an idle
+	 * callback so the change takes effect. */
+	g_idle_add_full (
+		G_PRIORITY_DEFAULT_IDLE,
+		(GSourceFunc) paned_queue_resize_on_idle,
+		g_object_ref (paned),
+		(GDestroyNotify) g_object_unref);
 }
 
 static void
diff --git a/widgets/misc/e-picture-gallery.c b/widgets/misc/e-picture-gallery.c
index a657dbf373..a742a5e37c 100644
--- a/widgets/misc/e-picture-gallery.c
+++ b/widgets/misc/e-picture-gallery.c
@@ -47,7 +47,10 @@ enum {
 G_DEFINE_TYPE (EPictureGallery, e_picture_gallery, GTK_TYPE_ICON_VIEW)
 
 static gboolean
-update_file_iter (GtkListStore *list_store, GtkTreeIter *iter, GFile *file, gboolean force_thumbnail_update)
+update_file_iter (GtkListStore *list_store,
+                  GtkTreeIter *iter,
+                  GFile *file,
+                  gboolean force_thumbnail_update)
 {
 	GFileInfo *file_info;
 	gchar *uri;
@@ -85,7 +88,7 @@ update_file_iter (GtkListStore *list_store, GtkTreeIter *iter, GFile *file, gboo
 		}
 
 		if (existing_thumb && !g_file_info_get_attribute_boolean (file_info, G_FILE_ATTRIBUTE_THUMBNAILING_FAILED)) {
-			GdkPixbuf* pixbuf;
+			GdkPixbuf * pixbuf;
 
 			pixbuf = gdk_pixbuf_new_from_file (existing_thumb, NULL);
 
@@ -125,7 +128,8 @@ update_file_iter (GtkListStore *list_store, GtkTreeIter *iter, GFile *file, gboo
 }
 
 static void
-add_file (GtkListStore *list_store, GFile *file)
+add_file (GtkListStore *list_store,
+          GFile *file)
 {
 	GtkTreeIter iter;
 
@@ -138,7 +142,9 @@ add_file (GtkListStore *list_store, GFile *file)
 }
 
 static gboolean
-find_file_uri (GtkListStore *list_store, const gchar *uri, GtkTreeIter *iter)
+find_file_uri (GtkListStore *list_store,
+               const gchar *uri,
+               GtkTreeIter *iter)
 {
 	GtkTreeModel *model;
 
@@ -171,14 +177,16 @@ find_file_uri (GtkListStore *list_store, const gchar *uri, GtkTreeIter *iter)
 }
 
 static void
-picture_gallery_dir_changed_cb (GFileMonitor *monitor, GFile *file, GFile *other_file, GFileMonitorEvent event_type, EPictureGallery *gallery)
+picture_gallery_dir_changed_cb (GFileMonitor *monitor,
+                                GFile *file,
+                                GFile *other_file,
+                                GFileMonitorEvent event_type,
+                                EPictureGallery *gallery)
 {
 	gchar *uri;
 	GtkListStore *list_store;
 	GtkTreeIter iter;
 
-	g_return_if_fail (gallery != NULL);
-	g_return_if_fail (gallery->priv != NULL);
 	g_return_if_fail (file != NULL);
 
 	list_store = GTK_LIST_STORE (gtk_icon_view_get_model (GTK_ICON_VIEW (gallery)));
@@ -273,9 +281,9 @@ e_picture_gallery_get_path (EPictureGallery *gallery)
 }
 
 static void
-picture_gallery_set_path (EPictureGallery *gallery, const gchar *path)
+picture_gallery_set_path (EPictureGallery *gallery,
+                          const gchar *path)
 {
-	g_return_if_fail (gallery != NULL);
 	g_return_if_fail (E_IS_PICTURE_GALLERY (gallery));
 	g_return_if_fail (gallery->priv != NULL);
 
@@ -288,7 +296,10 @@ picture_gallery_set_path (EPictureGallery *gallery, const gchar *path)
 }
 
 static void
-picture_gallery_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+picture_gallery_get_property (GObject *object,
+                              guint property_id,
+                              GValue *value,
+                              GParamSpec *pspec)
 {
 	switch (property_id) {
 	case PROP_PATH:
@@ -300,7 +311,10 @@ picture_gallery_get_property (GObject *object, guint property_id, GValue *value,
 }
 
 static void
-picture_gallery_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+picture_gallery_set_property (GObject *object,
+                              guint property_id,
+                              const GValue *value,
+                              GParamSpec *pspec)
 {
 	switch (property_id) {
 	case PROP_PATH:
@@ -314,9 +328,6 @@ picture_gallery_set_property (GObject *object, guint property_id, const GValue *
 static void
 visible_cb (EPictureGallery *gallery)
 {
-	g_return_if_fail (gallery != NULL);
-	g_return_if_fail (gallery->priv != NULL);
-
 	if (!gallery->priv->initialized && gtk_widget_get_visible (GTK_WIDGET (gallery))) {
 		gallery->priv->initialized = TRUE;
 
@@ -367,9 +378,6 @@ picture_gallery_dispose (GObject *object)
 
 	gallery = E_PICTURE_GALLERY (object);
 
-	g_return_if_fail (gallery != NULL);
-	g_return_if_fail (gallery->priv != NULL);
-
 	if (gallery->priv->monitor) {
 		g_object_unref (gallery->priv->monitor);
 		gallery->priv->monitor = NULL;
diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c
index a918081480..ada5398523 100644
--- a/widgets/misc/e-printable.c
+++ b/widgets/misc/e-printable.c
@@ -121,11 +121,11 @@ e_printable_new (void)
 }
 
 void
-e_printable_print_page          (EPrintable        *e_printable,
-				 GtkPrintContext *context,
-				 gdouble            width,
-				 gdouble            height,
-				 gboolean           quantized)
+e_printable_print_page (EPrintable *e_printable,
+                        GtkPrintContext *context,
+                        gdouble width,
+                        gdouble height,
+                        gboolean quantized)
 {
 	g_return_if_fail (e_printable != NULL);
 	g_return_if_fail (E_IS_PRINTABLE (e_printable));
@@ -139,7 +139,7 @@ e_printable_print_page          (EPrintable        *e_printable,
 }
 
 gboolean
-e_printable_data_left           (EPrintable        *e_printable)
+e_printable_data_left (EPrintable *e_printable)
 {
 	gboolean ret_val;
 
@@ -154,7 +154,7 @@ e_printable_data_left           (EPrintable        *e_printable)
 }
 
 void
-e_printable_reset               (EPrintable        *e_printable)
+e_printable_reset (EPrintable *e_printable)
 {
 	g_return_if_fail (e_printable != NULL);
 	g_return_if_fail (E_IS_PRINTABLE (e_printable));
@@ -164,11 +164,11 @@ e_printable_reset               (EPrintable        *e_printable)
 }
 
 gdouble
-e_printable_height              (EPrintable        *e_printable,
-				 GtkPrintContext *context,
-				 gdouble            width,
-				 gdouble            max_height,
-				 gboolean           quantized)
+e_printable_height (EPrintable *e_printable,
+                    GtkPrintContext *context,
+                    gdouble width,
+                    gdouble max_height,
+                    gboolean quantized)
 {
 	gdouble ret_val;
 
@@ -187,11 +187,11 @@ e_printable_height              (EPrintable        *e_printable,
 }
 
 gboolean
-e_printable_will_fit            (EPrintable        *e_printable,
-				 GtkPrintContext *context,
-				 gdouble            width,
-				 gdouble            max_height,
-				 gboolean           quantized)
+e_printable_will_fit (EPrintable *e_printable,
+                      GtkPrintContext *context,
+                      gdouble width,
+                      gdouble max_height,
+                      gboolean quantized)
 {
 	gboolean ret_val;
 
diff --git a/widgets/misc/e-searching-tokenizer.c b/widgets/misc/e-searching-tokenizer.c
index 3720030815..c3a7dfff2e 100644
--- a/widgets/misc/e-searching-tokenizer.c
+++ b/widgets/misc/e-searching-tokenizer.c
@@ -56,7 +56,7 @@ G_DEFINE_TYPE (
 static inline guint32
 camel_utf8_getc (const guchar **ptr)
 {
-	register guchar *p = (guchar *)*ptr;
+	register guchar *p = (guchar *) * ptr;
 	register guchar c, r;
 	register guint32 v, m;
 
@@ -75,7 +75,7 @@ loop:
 				r = c;
 				goto loop;
 			}
-			v = (v<<6) | (c & 0x3f);
+			v = (v << 6) | (c & 0x3f);
 			r<<=1;
 			m<<=5;
 		} while (r & 0x40);
@@ -93,22 +93,22 @@ loop:
 /* note: our tags of interest are 7 bit ascii
  * only no need to do any fancy utf8 stuff */
 /* tags should be upper case
-   if this list gets longer than 10 entries, consider binary search */
+ * if this list gets longer than 10 entries, consider binary search */
 static const gchar *ignored_tags[] = {
 	"B", "I", "FONT", "TT", "EM", /* and more? */};
 
 static gint
 ignore_tag (const gchar *tag)
 {
-	gchar *t = g_alloca (strlen (tag)+1), c, *out;
+	gchar *t = g_alloca (strlen (tag) + 1), c, *out;
 	const gchar *in;
 	gint i;
 
 	/* we could use a aho-corasick matcher here too ... but we wont */
 
 	/* normalise tag into 't'.
-	   Note we use the property that the only tags we're interested in
-	   are 7 bit ascii to shortcut and simplify case insensitivity */
+	 * Note we use the property that the only tags we're interested in
+	 * are 7 bit ascii to shortcut and simplify case insensitivity */
 	in = tag+2;		/* skip: TAG_ESCAPE '<' */
 	if (*in == '/')
 		in++;
@@ -163,20 +163,21 @@ struct _trie {
 /* will be enabled only if debug is enabled */
 #if d(1) -1 != -1
 static void
-dump_trie (struct _state *s, gint d)
+dump_trie (struct _state *s,
+           gint d)
 {
-	gchar *p = g_alloca (d*2+1);
+	gchar *p = g_alloca (d *2 + 1);
 	struct _match *m;
 
-	memset (p, ' ', d*2);
-	p[d*2]=0;
+	memset (p, ' ', d *2);
+	p[d *2]=0;
 
 	printf("%s[state] %p: %d  fail->%p\n", p, s, s->final, s->fail);
 	m = s->matches;
 	while (m) {
 		printf(" %s'%c' -> %p\n", p, m->ch, m->match);
 		if (m->match)
-			dump_trie (m->match, d+1);
+			dump_trie (m->match, d + 1);
 		m = m->next;
 	}
 }
@@ -184,11 +185,12 @@ dump_trie (struct _state *s, gint d)
 
 /* This builds an Aho-Corasick search trie for a set of utf8 words */
 /* See
-    http://www-sr.informatik.uni-tuebingen.de/~buehler/AC/AC.html
-   for a neat demo */
+ *  http://www-sr.informatik.uni-tuebingen.de/~buehler/AC/AC.html
+ * for a neat demo */
 
 static inline struct _match *
-g (struct _state *q, guint32 c)
+g (struct _state *q,
+   guint32 c)
 {
 	struct _match *m = q->matches;
 
@@ -199,7 +201,9 @@ g (struct _state *q, guint32 c)
 }
 
 static struct _trie *
-build_trie (gint nocase, gint len, guchar **words)
+build_trie (gint nocase,
+            gint len,
+            guchar **words)
 {
 	struct _state *q, *qt, *r;
 	const guchar *word;
@@ -222,14 +226,14 @@ build_trie (gint nocase, gint len, guchar **words)
 	/* This will correspond to the length of the longest pattern */
 	state_depth_size = 0;
 	state_depth_max = 64;
-	state_depth = g_malloc (sizeof (*state_depth[0])*64);
+	state_depth = g_malloc (sizeof (*state_depth[0]) * 64);
 	state_depth[0] = NULL;
 
 	/* Step 1: Build trie */
 
 	/* This just builds a tree that merges all common prefixes into the same branch */
 
-	for (i=0;i<len;i++) {
+	for (i = 0; i < len; i++) {
 		word = words[i];
 		q = &trie->root;
 		depth = 0;
@@ -277,7 +281,7 @@ build_trie (gint nocase, gint len, guchar **words)
 	 * find multiple substrings concurrently, using aho-corasick's
 	 * algorithm. */
 
-	for (i=0;i<state_depth_size;i++) {
+	for (i = 0; i < state_depth_size; i++) {
 		q = state_depth[i];
 		while (q) {
 			m = q->matches;
@@ -411,17 +415,17 @@ searcher_new (gint flags,
 	s->offout = 0;
 
 	/* rotating queue of previous character positions */
-	m = s->t->max_depth+1;
+	m = s->t->max_depth + 1;
 	i = 2;
-	while (i<m)
+	while (i < m)
 		i<<=2;
-	s->last = g_malloc (sizeof (s->last[0])*i);
-	s->last_mask = i-1;
+	s->last = g_malloc (sizeof (s->last[0]) * i);
+	s->last_mask = i - 1;
 	s->lastp = 0;
 
 	/* a stack of possible submatches */
 	s->submatchp = 0;
-	s->submatches = g_malloc (sizeof (s->submatches[0])*argc+1);
+	s->submatches = g_malloc (sizeof (s->submatches[0]) * argc + 1);
 
 	return s;
 }
@@ -444,13 +448,15 @@ searcher_free (struct _searcher *s)
 }
 
 static struct _token *
-append_token (GQueue *queue, const gchar *tok, gint len)
+append_token (GQueue *queue,
+              const gchar *tok,
+              gint len)
 {
 	struct _token *token;
 
 	if (len == -1)
 		len = strlen (tok);
-	token = g_malloc (sizeof (*token) + len+1);
+	token = g_malloc (sizeof (*token) + len + 1);
 	token->offset = 0;	/* set by caller when required */
 	memcpy (token->tok, tok, len);
 	token->tok[len] = 0;
@@ -462,7 +468,8 @@ append_token (GQueue *queue, const gchar *tok, gint len)
 #define free_token(x) (g_free (x))
 
 static void
-output_token (struct _searcher *s, struct _token *token)
+output_token (struct _searcher *s,
+              struct _token *token)
 {
 	gint offend;
 	gint left, pre;
@@ -475,11 +482,11 @@ output_token (struct _searcher *s, struct _token *token)
 		}
 	} else {
 		offend = token->offset + strlen (token->tok);
-		left = offend-s->offout;
+		left = offend - s->offout;
 		if (left > 0) {
 			pre = s->offout - token->offset;
-			if (pre>0)
-				memmove (token->tok, token->tok+pre, left+1);
+			if (pre > 0)
+				memmove (token->tok, token->tok + pre, left + 1);
 			s->offout = offend;
 			g_queue_push_tail (&s->output, token);
 		} else {
@@ -489,7 +496,8 @@ output_token (struct _searcher *s, struct _token *token)
 }
 
 static struct _token *
-find_token (struct _searcher *s, gint start)
+find_token (struct _searcher *s,
+            gint start)
 {
 	GList *link;
 
@@ -508,7 +516,9 @@ find_token (struct _searcher *s, gint start)
 }
 
 static void
-output_match (struct _searcher *s, guint start, guint end)
+output_match (struct _searcher *s,
+              guint start,
+              guint end)
 {
 	register struct _token *token;
 	struct _token *starttoken, *endtoken;
@@ -534,8 +544,8 @@ output_match (struct _searcher *s, guint start, guint end)
 	if (s->offout < start) {
 		token = append_token (
 			&s->output, starttoken->tok +
-			(s->offout-starttoken->offset),
-			start-s->offout);
+			(s->offout - starttoken->offset),
+			start - s->offout);
 		s->offout = start;
 	}
 
@@ -559,8 +569,8 @@ output_match (struct _searcher *s, guint start, guint end)
 	if (s->offout < end) {
 		token = append_token (
 			&s->output, endtoken->tok +
-			(s->offout-endtoken->offset),
-			end-s->offout);
+			(s->offout - endtoken->offset),
+			end - s->offout);
 		s->offout = end;
 	}
 
@@ -581,29 +591,31 @@ output_subpending (struct _searcher *s)
 {
 	gint i;
 
-	for (i=s->submatchp-1;i>=0;i--)
+	for (i = s->submatchp - 1; i >= 0; i--)
 		output_match (s, s->submatches[i].offstart, s->submatches[i].offend);
 	s->submatchp = 0;
 }
 
 /* returns true if a merge took place */
 static gint
-merge_subpending (struct _searcher *s, gint offstart, gint offend)
+merge_subpending (struct _searcher *s,
+                  gint offstart,
+                  gint offend)
 {
 	gint i;
 
 	/* merges overlapping or abutting match strings */
 	if (s->submatchp &&
-	    s->submatches[s->submatchp-1].offend >= offstart) {
+	    s->submatches[s->submatchp - 1].offend >= offstart) {
 
 		/* go from end, any that match 'invalidate' follow-on ones too */
-		for (i=s->submatchp-1;i>=0;i--) {
+		for (i = s->submatchp - 1; i >= 0; i--) {
 			if (s->submatches[i].offend >= offstart) {
 				if (offstart < s->submatches[i].offstart)
 					s->submatches[i].offstart = offstart;
 				s->submatches[i].offend = offend;
 				if (s->submatchp > i)
-					s->submatchp = i+1;
+					s->submatchp = i + 1;
 			}
 		}
 		return 1;
@@ -613,13 +625,15 @@ merge_subpending (struct _searcher *s, gint offstart, gint offend)
 }
 
 static void
-push_subpending (struct _searcher *s, gint offstart, gint offend)
+push_subpending (struct _searcher *s,
+                 gint offstart,
+                 gint offend)
 {
 	/* This is really an assertion, we just ignore the
 	 * last pending match instead of crashing though. */
 	if (s->submatchp >= s->words) {
 		d (printf("ERROR: submatch pending stack overflow\n"));
-		s->submatchp = s->words-1;
+		s->submatchp = s->words - 1;
 	}
 
 	s->submatches[s->submatchp].offstart = offstart;
@@ -648,7 +662,7 @@ flush_extra (struct _searcher *s)
 
 	/* find earliest gchar that can be in contention */
 	start = s->offset - s->t->max_depth;
-	for (i=0;i<s->submatchp;i++)
+	for (i = 0; i < s->submatchp; i++)
 		if (s->submatches[i].offstart < start)
 			start = s->submatches[i].offstart;
 
@@ -713,8 +727,8 @@ searcher_next_token (struct _searcher *s)
 				q = &t->root;
 			} else if (m != NULL) {
 				/* keep track of previous offsets of utf8 chars, rotating buffer */
-				s->last[s->lastp] = s->offset + (pre_tok-stok);
-				s->lastp = (s->lastp+1)&s->last_mask;
+				s->last[s->lastp] = s->offset + (pre_tok - stok);
+				s->lastp = (s->lastp + 1) &s->last_mask;
 
 				q = m->match;
 				/* we have a match of q->final characters for a matching word */
@@ -722,7 +736,7 @@ searcher_next_token (struct _searcher *s)
 					s->matchcount++;
 
 					/* use the last buffer to find the real offset of this gchar */
-					offstart = s->last[(s->lastp - q->final)&s->last_mask];
+					offstart = s->last[(s->lastp - q->final) &s->last_mask];
 					offend = s->offset + (tok - stok);
 
 					if (q->matches == NULL) {
@@ -752,7 +766,7 @@ searcher_next_token (struct _searcher *s)
 			pre_tok = tok;
 		}
 
-		s->offset += (pre_tok-stok);
+		s->offset += (pre_tok - stok);
 
 		flush_extra (s);
 	}
@@ -794,8 +808,8 @@ searcher_pending (struct _searcher *s)
 struct _search_info {
 	GPtrArray *strv;
 	gchar *color;
-	guint size:8;
-	guint flags:8;
+	guint size : 8;
+	guint flags : 8;
 };
 
 /** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/
@@ -812,20 +826,24 @@ search_info_new (void)
 }
 
 static void
-search_info_set_flags (struct _search_info *si, guint flags, guint mask)
+search_info_set_flags (struct _search_info *si,
+                       guint flags,
+                       guint mask)
 {
 	si->flags = (si->flags & ~mask) | (flags & mask);
 }
 
 static void
-search_info_set_color (struct _search_info *si, const gchar *color)
+search_info_set_color (struct _search_info *si,
+                       const gchar *color)
 {
 	g_free (si->color);
 	si->color = g_strdup (color);
 }
 
 static void
-search_info_add_string (struct _search_info *si, const gchar *s)
+search_info_add_string (struct _search_info *si,
+                        const gchar *s)
 {
 	const guchar *start;
 	guint32 c;
@@ -851,7 +869,7 @@ search_info_clear (struct _search_info *si)
 {
 	gint i;
 
-	for (i=0;i<si->strv->len;i++)
+	for (i = 0; i < si->strv->len; i++)
 		g_free (si->strv->pdata[i]);
 
 	g_ptr_array_set_size (si->strv, 0);
@@ -862,7 +880,7 @@ search_info_free (struct _search_info *si)
 {
 	gint i;
 
-	for (i=0;i<si->strv->len;i++)
+	for (i = 0; i < si->strv->len; i++)
 		g_free (si->strv->pdata[i]);
 
 	g_ptr_array_free (si->strv, TRUE);
@@ -877,7 +895,7 @@ search_info_clone (struct _search_info *si)
 	gint i;
 
 	out = search_info_new ();
-	for (i=0;i<si->strv->len;i++)
+	for (i = 0; i < si->strv->len; i++)
 		g_ptr_array_add (out->strv, g_strdup (si->strv->pdata[i]));
 	out->color = g_strdup (si->color);
 	out->flags = si->flags;
@@ -900,7 +918,7 @@ search_info_to_searcher (struct _search_info *si)
 	else
 		col = si->color;
 
-	tags = g_alloca (20+strlen (col));
+	tags = g_alloca (20 + strlen (col));
 	sprintf(tags, "%c<font color=\"%s\">", TAG_ESCAPE, col);
 	tage = g_alloca (20);
 	sprintf(tage, "%c</font>", TAG_ESCAPE);
@@ -922,7 +940,7 @@ struct _ESearchingTokenizerPrivate {
 /** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/
 
 /* blah blah the htmltokeniser doesn't like being asked
-   for a token if it doens't hvae any! */
+ * for a token if it doens't hvae any! */
 static gchar *
 get_token (HTMLTokenizer *tokenizer)
 {
diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c
index a023ea5916..d744111bb4 100644
--- a/widgets/misc/e-selection-model-array.c
+++ b/widgets/misc/e-selection-model-array.c
@@ -55,7 +55,8 @@ e_selection_model_array_confirm_row_count (ESelectionModelArray *esma)
 }
 
 static gint
-es_row_model_to_sorted (ESelectionModelArray *esma, gint model_row)
+es_row_model_to_sorted (ESelectionModelArray *esma,
+                        gint model_row)
 {
 	if (model_row >= 0 && esma && esma->base.sorter && e_sorter_needs_sorting (esma->base.sorter))
 		return e_sorter_model_to_sorted (esma->base.sorter, model_row);
@@ -64,7 +65,8 @@ es_row_model_to_sorted (ESelectionModelArray *esma, gint model_row)
 }
 
 static gint
-es_row_sorted_to_model (ESelectionModelArray *esma, gint sorted_row)
+es_row_sorted_to_model (ESelectionModelArray *esma,
+                        gint sorted_row)
 {
 	if (sorted_row >= 0 && esma && esma->base.sorter && e_sorter_needs_sorting (esma->base.sorter))
 		return e_sorter_sorted_to_model (esma->base.sorter, sorted_row);
@@ -74,7 +76,9 @@ es_row_sorted_to_model (ESelectionModelArray *esma, gint sorted_row)
 
 /* FIXME: Should this deal with moving the selection if it's in single mode? */
 void
-e_selection_model_array_delete_rows (ESelectionModelArray *esma, gint row, gint count)
+e_selection_model_array_delete_rows (ESelectionModelArray *esma,
+                                     gint row,
+                                     gint count)
 {
 	if (esma->eba) {
 		if (E_SELECTION_MODEL (esma)->mode == GTK_SELECTION_SINGLE)
@@ -124,7 +128,9 @@ e_selection_model_array_delete_rows (ESelectionModelArray *esma, gint row, gint
 }
 
 void
-e_selection_model_array_insert_rows (ESelectionModelArray *esma, gint row, gint count)
+e_selection_model_array_insert_rows (ESelectionModelArray *esma,
+                                     gint row,
+                                     gint count)
 {
 	if (esma->eba) {
 		e_bit_array_insert (esma->eba, row, count);
@@ -140,7 +146,9 @@ e_selection_model_array_insert_rows (ESelectionModelArray *esma, gint row, gint
 }
 
 void
-e_selection_model_array_move_row (ESelectionModelArray *esma, gint old_row, gint new_row)
+e_selection_model_array_move_row (ESelectionModelArray *esma,
+                                  gint old_row,
+                                  gint new_row)
 {
 	ESelectionModel *esm = E_SELECTION_MODEL (esma);
 
@@ -195,11 +203,14 @@ esma_dispose (GObject *object)
 }
 
 static void
-esma_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+esma_get_property (GObject *object,
+                   guint property_id,
+                   GValue *value,
+                   GParamSpec *pspec)
 {
 	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_CURSOR_ROW:
 		g_value_set_int (value, esma->cursor_row);
 		break;
@@ -211,12 +222,15 @@ esma_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *ps
 }
 
 static void
-esma_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+esma_set_property (GObject *object,
+                   guint property_id,
+                   const GValue *value,
+                   GParamSpec *pspec)
 {
 	ESelectionModel *esm = E_SELECTION_MODEL (object);
 	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_CURSOR_ROW:
 		e_selection_model_do_something (esm, g_value_get_int (value), esma->cursor_col, 0);
 		break;
@@ -238,7 +252,7 @@ esma_set_property (GObject *object, guint prop_id, const GValue *value, GParamSp
  */
 static gboolean
 esma_is_row_selected (ESelectionModel *selection,
-		      gint             n)
+                      gint n)
 {
 	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY (selection);
 	if (esma->eba)
@@ -258,8 +272,8 @@ esma_is_row_selected (ESelectionModel *selection,
  */
 static void
 esma_foreach (ESelectionModel *selection,
-	      EForeachFunc     callback,
-	      gpointer         closure)
+              EForeachFunc callback,
+              gpointer closure)
 {
 	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY (selection);
 	if (esma->eba)
@@ -371,7 +385,9 @@ esma_row_count (ESelectionModel *selection)
 }
 
 static void
-esma_change_one_row (ESelectionModel *selection, gint row, gboolean grow)
+esma_change_one_row (ESelectionModel *selection,
+                     gint row,
+                     gboolean grow)
 {
 	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY (selection);
 	e_selection_model_array_confirm_row_count (esma);
@@ -379,7 +395,9 @@ esma_change_one_row (ESelectionModel *selection, gint row, gboolean grow)
 }
 
 static void
-esma_change_cursor (ESelectionModel *selection, gint row, gint col)
+esma_change_cursor (ESelectionModel *selection,
+                    gint row,
+                    gint col)
 {
 	ESelectionModelArray *esma;
 
@@ -394,7 +412,10 @@ esma_change_cursor (ESelectionModel *selection, gint row, gint col)
 }
 
 static void
-esma_change_range (ESelectionModel *selection, gint start, gint end, gboolean grow)
+esma_change_range (ESelectionModel *selection,
+                   gint start,
+                   gint end,
+                   gboolean grow)
 {
 	gint i;
 	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY (selection);
@@ -425,7 +446,8 @@ esma_cursor_col (ESelectionModel *selection)
 }
 
 static void
-esma_real_select_single_row (ESelectionModel *selection, gint row)
+esma_real_select_single_row (ESelectionModel *selection,
+                             gint row)
 {
 	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY (selection);
 
@@ -439,7 +461,8 @@ esma_real_select_single_row (ESelectionModel *selection, gint row)
 }
 
 static void
-esma_select_single_row (ESelectionModel *selection, gint row)
+esma_select_single_row (ESelectionModel *selection,
+                        gint row)
 {
 	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY (selection);
 	gint selected_row = esma->selected_row;
@@ -456,7 +479,8 @@ esma_select_single_row (ESelectionModel *selection, gint row)
 }
 
 static void
-esma_toggle_single_row (ESelectionModel *selection, gint row)
+esma_toggle_single_row (ESelectionModel *selection,
+                        gint row)
 {
 	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY (selection);
 
@@ -470,7 +494,8 @@ esma_toggle_single_row (ESelectionModel *selection, gint row)
 }
 
 static void
-esma_real_move_selection_end (ESelectionModel *selection, gint row)
+esma_real_move_selection_end (ESelectionModel *selection,
+                              gint row)
 {
 	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY (selection);
 	gint old_start;
@@ -506,14 +531,16 @@ esma_real_move_selection_end (ESelectionModel *selection, gint row)
 }
 
 static void
-esma_move_selection_end (ESelectionModel *selection, gint row)
+esma_move_selection_end (ESelectionModel *selection,
+                         gint row)
 {
 	esma_real_move_selection_end (selection, row);
 	e_selection_model_selection_changed (selection);
 }
 
 static void
-esma_set_selection_end (ESelectionModel *selection, gint row)
+esma_set_selection_end (ESelectionModel *selection,
+                        gint row)
 {
 	ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY (selection);
 	gint selected_range_end = esma->selected_range_end;
diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c
index 4f00369b16..fc73df6b5e 100644
--- a/widgets/misc/e-selection-model.c
+++ b/widgets/misc/e-selection-model.c
@@ -54,7 +54,8 @@ enum {
 };
 
 inline static void
-add_sorter (ESelectionModel *esm, ESorter *sorter)
+add_sorter (ESelectionModel *esm,
+            ESorter *sorter)
 {
 	esm->sorter = sorter;
 	if (sorter) {
diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c
index 9a916fbf0b..103697fd0b 100644
--- a/widgets/misc/e-send-options.c
+++ b/widgets/misc/e-send-options.c
@@ -259,7 +259,8 @@ sensitize_widgets (ESendOptionsDialog *sod)
 }
 
 static void
-expiration_toggled_cb (GtkToggleButton *toggle, gpointer data)
+expiration_toggled_cb (GtkToggleButton *toggle,
+                       gpointer data)
 {
 	gboolean active;
 	ESendOptionsDialog *sod;
@@ -274,7 +275,8 @@ expiration_toggled_cb (GtkToggleButton *toggle, gpointer data)
 }
 
 static void
-reply_request_toggled_cb (GtkToggleButton *toggle, gpointer data)
+reply_request_toggled_cb (GtkToggleButton *toggle,
+                          gpointer data)
 {
 	gboolean active;
 	ESendOptionsDialog *sod;
@@ -291,7 +293,8 @@ reply_request_toggled_cb (GtkToggleButton *toggle, gpointer data)
 }
 
 static void
-delay_delivery_toggled_cb (GtkToggleButton *toggle, gpointer data)
+delay_delivery_toggled_cb (GtkToggleButton *toggle,
+                           gpointer data)
 {
 	gboolean active;
 	ESendOptionsDialog *sod;
@@ -305,7 +308,8 @@ delay_delivery_toggled_cb (GtkToggleButton *toggle, gpointer data)
 }
 
 static void
-sent_item_toggled_cb (GtkToggleButton *toggle, gpointer data)
+sent_item_toggled_cb (GtkToggleButton *toggle,
+                      gpointer data)
 {
 	gboolean active;
 	ESendOptionsDialog *sod;
@@ -322,7 +326,8 @@ sent_item_toggled_cb (GtkToggleButton *toggle, gpointer data)
 }
 
 static void
-delay_until_date_changed_cb (GtkWidget *dedit, gpointer data)
+delay_until_date_changed_cb (GtkWidget *dedit,
+                             gpointer data)
 {
 	ESendOptionsDialog *sod;
 	ESendOptionsDialogPrivate *priv;
@@ -340,7 +345,10 @@ delay_until_date_changed_cb (GtkWidget *dedit, gpointer data)
 
 }
 static void
-page_changed_cb (GtkNotebook *notebook, GtkWidget *page, gint num, gpointer data)
+page_changed_cb (GtkNotebook *notebook,
+                 GtkWidget *page,
+                 gint num,
+                 gpointer data)
 {
 	ESendOptionsDialog *sod = data;
 	ESendOptionsDialogPrivate *priv = sod->priv;
@@ -484,7 +492,8 @@ get_widgets (ESendOptionsDialog *sod)
 }
 
 static void
-setup_widgets (ESendOptionsDialog *sod, Item_type type)
+setup_widgets (ESendOptionsDialog *sod,
+               Item_type type)
 {
 	ESendOptionsDialogPrivate *priv;
 
@@ -558,7 +567,8 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type)
 }
 
 ESendOptionsDialog *
-e_send_options_dialog_new (void) {
+e_send_options_dialog_new (void)
+{
 	ESendOptionsDialog *sod;
 
 	sod = g_object_new (E_TYPE_SENDOPTIONS_DIALOG, NULL);
@@ -567,7 +577,8 @@ e_send_options_dialog_new (void) {
 }
 
 void
-e_send_options_set_need_general_options (ESendOptionsDialog *sod, gboolean needed)
+e_send_options_set_need_general_options (ESendOptionsDialog *sod,
+                                         gboolean needed)
 {
 	g_return_if_fail (E_IS_SENDOPTIONS_DIALOG (sod));
 
@@ -583,7 +594,8 @@ e_send_options_get_need_general_options (ESendOptionsDialog *sod)
 }
 
 gboolean
-e_send_options_set_global (ESendOptionsDialog *sod, gboolean set)
+e_send_options_set_global (ESendOptionsDialog *sod,
+                           gboolean set)
 {
 	g_return_val_if_fail (E_IS_SENDOPTIONS_DIALOG (sod), FALSE);
 
@@ -592,7 +604,10 @@ e_send_options_set_global (ESendOptionsDialog *sod, gboolean set)
 	return TRUE;
 }
 
-static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data)
+static void
+e_send_options_cb (GtkDialog *dialog,
+                   gint state,
+                   gpointer func_data)
 {
 	ESendOptionsDialogPrivate *priv;
 	ESendOptionsDialog *sod;
@@ -619,7 +634,9 @@ static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data
 }
 
 gboolean
-e_send_options_dialog_run (ESendOptionsDialog *sod, GtkWidget *parent, Item_type type)
+e_send_options_dialog_run (ESendOptionsDialog *sod,
+                           GtkWidget *parent,
+                           Item_type type)
 {
 	ESendOptionsDialogPrivate *priv;
 	GtkWidget *toplevel;
diff --git a/widgets/misc/e-url-entry.c b/widgets/misc/e-url-entry.c
index eaefdccddd..c4a174c0a6 100644
--- a/widgets/misc/e-url-entry.c
+++ b/widgets/misc/e-url-entry.c
@@ -106,7 +106,8 @@ finalize (GObject *object)
 
 /* GtkWidget::mnemonic_activate() handler for the EUrlEntry */
 static gboolean
-mnemonic_activate (GtkWidget *widget, gboolean group_cycling)
+mnemonic_activate (GtkWidget *widget,
+                   gboolean group_cycling)
 {
 	EUrlEntry *url_entry;
 	EUrlEntryPrivate *priv;
@@ -139,7 +140,8 @@ e_url_entry_get_entry (EUrlEntry *url_entry)
 }
 
 static void
-button_clicked_cb (GtkWidget *widget, gpointer data)
+button_clicked_cb (GtkWidget *widget,
+                   gpointer data)
 {
 	EUrlEntry *url_entry;
 	EUrlEntryPrivate *priv;
@@ -155,7 +157,8 @@ button_clicked_cb (GtkWidget *widget, gpointer data)
 }
 
 static void
-entry_changed_cb (GtkEditable *editable, gpointer data)
+entry_changed_cb (GtkEditable *editable,
+                  gpointer data)
 {
 	EUrlEntry *url_entry;
 	EUrlEntryPrivate *priv;
diff --git a/widgets/misc/e-web-view-preview.c b/widgets/misc/e-web-view-preview.c
index 763d31329e..12270da0b7 100644
--- a/widgets/misc/e-web-view-preview.c
+++ b/widgets/misc/e-web-view-preview.c
@@ -47,9 +47,9 @@ G_DEFINE_TYPE (
 
 static void
 web_view_preview_set_property (GObject *object,
-                       guint property_id,
-                       const GValue *value,
-                       GParamSpec *pspec)
+                               guint property_id,
+                               const GValue *value,
+                               GParamSpec *pspec)
 {
 	switch (property_id) {
 		case PROP_ESCAPE_VALUES:
@@ -64,9 +64,9 @@ web_view_preview_set_property (GObject *object,
 
 static void
 web_view_preview_get_property (GObject *object,
-                       guint property_id,
-                       GValue *value,
-                       GParamSpec *pspec)
+                               guint property_id,
+                               GValue *value,
+                               GParamSpec *pspec)
 {
 	switch (property_id) {
 		case PROP_TREE_VIEW:
@@ -108,13 +108,13 @@ web_view_preview_dispose (GObject *object)
 }
 
 static void
-e_web_view_preview_class_init (EWebViewPreviewClass *klass)
+e_web_view_preview_class_init (EWebViewPreviewClass *class)
 {
 	GObjectClass *object_class;
 
-	g_type_class_add_private (klass, sizeof (EWebViewPreviewPrivate));
+	g_type_class_add_private (class, sizeof (EWebViewPreviewPrivate));
 
-	object_class = G_OBJECT_CLASS (klass);
+	object_class = G_OBJECT_CLASS (class);
 	object_class->set_property = web_view_preview_set_property;
 	object_class->get_property = web_view_preview_get_property;
 	object_class->dispose = web_view_preview_dispose;
@@ -206,7 +206,7 @@ e_web_view_preview_get_tree_view (EWebViewPreview *preview)
 }
 
 GtkWidget *
-e_web_view_preview_get_preview	(EWebViewPreview *preview)
+e_web_view_preview_get_preview (EWebViewPreview *preview)
 {
 	g_return_val_if_fail (preview != NULL, NULL);
 	g_return_val_if_fail (E_IS_WEB_VIEW_PREVIEW (preview), NULL);
@@ -215,13 +215,12 @@ e_web_view_preview_get_preview	(EWebViewPreview *preview)
 }
 
 void
-e_web_view_preview_set_preview	(EWebViewPreview *preview, GtkWidget *preview_widget)
+e_web_view_preview_set_preview (EWebViewPreview *preview,
+                                GtkWidget *preview_widget)
 {
 	GtkWidget *old_child;
 
-	g_return_if_fail (preview != NULL);
 	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
-	g_return_if_fail (preview_widget != NULL);
 	g_return_if_fail (GTK_IS_WIDGET (preview_widget));
 
 	old_child = gtk_bin_get_child (GTK_BIN (gtk_paned_get_child2 (GTK_PANED (preview))));
@@ -236,7 +235,6 @@ e_web_view_preview_set_preview	(EWebViewPreview *preview, GtkWidget *preview_wid
 void
 e_web_view_preview_show_tree_view (EWebViewPreview *preview)
 {
-	g_return_if_fail (preview != NULL);
 	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
 
 	gtk_widget_show (gtk_paned_get_child1 (GTK_PANED (preview)));
@@ -245,18 +243,16 @@ e_web_view_preview_show_tree_view (EWebViewPreview *preview)
 void
 e_web_view_preview_hide_tree_view (EWebViewPreview *preview)
 {
-	g_return_if_fail (preview != NULL);
 	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
 
 	gtk_widget_hide (gtk_paned_get_child1 (GTK_PANED (preview)));
 }
 
 void
-e_web_view_preview_set_escape_values (EWebViewPreview *preview, gboolean escape)
+e_web_view_preview_set_escape_values (EWebViewPreview *preview,
+                                      gboolean escape)
 {
-	g_return_if_fail (preview != NULL);
 	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
-	g_return_if_fail (preview->priv != NULL);
 
 	preview->priv->escape_values = escape;
 }
@@ -274,9 +270,7 @@ e_web_view_preview_get_escape_values (EWebViewPreview *preview)
 void
 e_web_view_preview_begin_update (EWebViewPreview *preview)
 {
-	g_return_if_fail (preview != NULL);
 	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
-	g_return_if_fail (preview->priv != NULL);
 
 	if (preview->priv->updating_content) {
 		g_warning ("%s: Previous content update isn't finished with e_web_view_preview_end_update()", G_STRFUNC);
@@ -291,9 +285,7 @@ e_web_view_preview_end_update (EWebViewPreview *preview)
 {
 	GtkWidget *web_view;
 
-	g_return_if_fail (preview != NULL);
 	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
-	g_return_if_fail (preview->priv != NULL);
 	g_return_if_fail (preview->priv->updating_content != NULL);
 
 	g_string_append (preview->priv->updating_content, "</TABLE>");
@@ -307,7 +299,9 @@ e_web_view_preview_end_update (EWebViewPreview *preview)
 }
 
 static gchar *
-replace_string (const gchar *text, const gchar *find, const gchar *replace)
+replace_string (const gchar *text,
+                const gchar *find,
+                const gchar *replace)
 {
 	const gchar *p, *next;
 	GString *str;
@@ -337,7 +331,8 @@ replace_string (const gchar *text, const gchar *find, const gchar *replace)
 }
 
 static gchar *
-web_view_preview_escape_text (EWebViewPreview *preview, const gchar *text)
+web_view_preview_escape_text (EWebViewPreview *preview,
+                              const gchar *text)
 {
 	gchar *utf8_valid, *res, *end;
 
@@ -375,13 +370,13 @@ web_view_preview_escape_text (EWebViewPreview *preview, const gchar *text)
 }
 
 void
-e_web_view_preview_add_header (EWebViewPreview *preview, gint index, const gchar *header)
+e_web_view_preview_add_header (EWebViewPreview *preview,
+                               gint index,
+                               const gchar *header)
 {
 	gchar *escaped;
 
-	g_return_if_fail (preview != NULL);
 	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
-	g_return_if_fail (preview->priv != NULL);
 	g_return_if_fail (preview->priv->updating_content != NULL);
 	g_return_if_fail (header != NULL);
 
@@ -400,13 +395,12 @@ e_web_view_preview_add_header (EWebViewPreview *preview, gint index, const gchar
 }
 
 void
-e_web_view_preview_add_text (EWebViewPreview *preview, const gchar *text)
+e_web_view_preview_add_text (EWebViewPreview *preview,
+                             const gchar *text)
 {
 	gchar *escaped;
 
-	g_return_if_fail (preview != NULL);
 	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
-	g_return_if_fail (preview->priv != NULL);
 	g_return_if_fail (preview->priv->updating_content != NULL);
 	g_return_if_fail (text != NULL);
 
@@ -420,11 +414,10 @@ e_web_view_preview_add_text (EWebViewPreview *preview, const gchar *text)
 }
 
 void
-e_web_view_preview_add_raw_html (EWebViewPreview *preview, const gchar *raw_html)
+e_web_view_preview_add_raw_html (EWebViewPreview *preview,
+                                 const gchar *raw_html)
 {
-	g_return_if_fail (preview != NULL);
 	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
-	g_return_if_fail (preview->priv != NULL);
 	g_return_if_fail (preview->priv->updating_content != NULL);
 	g_return_if_fail (raw_html != NULL);
 
@@ -434,9 +427,7 @@ e_web_view_preview_add_raw_html (EWebViewPreview *preview, const gchar *raw_html
 void
 e_web_view_preview_add_separator (EWebViewPreview *preview)
 {
-	g_return_if_fail (preview != NULL);
 	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
-	g_return_if_fail (preview->priv != NULL);
 	g_return_if_fail (preview->priv->updating_content != NULL);
 
 	g_string_append (preview->priv->updating_content, "<TR><TD colspan=2><HR></TD></TR>");
@@ -445,9 +436,7 @@ e_web_view_preview_add_separator (EWebViewPreview *preview)
 void
 e_web_view_preview_add_empty_line (EWebViewPreview *preview)
 {
-	g_return_if_fail (preview != NULL);
 	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
-	g_return_if_fail (preview->priv != NULL);
 	g_return_if_fail (preview->priv->updating_content != NULL);
 
 	g_string_append (preview->priv->updating_content, "<TR><TD colspan=2>&nbsp;</TD></TR>");
@@ -455,13 +444,13 @@ e_web_view_preview_add_empty_line (EWebViewPreview *preview)
 
 /* section can be NULL, but value cannot */
 void
-e_web_view_preview_add_section (EWebViewPreview *preview, const gchar *section, const gchar *value)
+e_web_view_preview_add_section (EWebViewPreview *preview,
+                                const gchar *section,
+                                const gchar *value)
 {
 	gchar *escaped_section = NULL, *escaped_value;
 
-	g_return_if_fail (preview != NULL);
 	g_return_if_fail (E_IS_WEB_VIEW_PREVIEW (preview));
-	g_return_if_fail (preview->priv != NULL);
 	g_return_if_fail (preview->priv->updating_content != NULL);
 	g_return_if_fail (value != NULL);
 
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index 18529b603e..8e037ac66c 100644
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@ -2049,7 +2049,8 @@ e_web_view_get_cursor_image_src (EWebView *web_view)
 }
 
 void
-e_web_view_set_cursor_image_src (EWebView *web_view, const gchar *src_uri)
+e_web_view_set_cursor_image_src (EWebView *web_view,
+                                 const gchar *src_uri)
 {
 	g_return_if_fail (E_IS_WEB_VIEW (web_view));
 
diff --git a/widgets/misc/ea-calendar-cell.c b/widgets/misc/ea-calendar-cell.c
index b8e53fd359..c71f4f4d47 100644
--- a/widgets/misc/ea-calendar-cell.c
+++ b/widgets/misc/ea-calendar-cell.c
@@ -70,7 +70,9 @@ e_calendar_cell_class_init (ECalendarCellClass *class)
 }
 
 ECalendarCell *
-e_calendar_cell_new (ECalendarItem *calitem, gint row, gint column)
+e_calendar_cell_new (ECalendarItem *calitem,
+                     gint row,
+                     gint column)
 {
 	GObject *object;
 	ECalendarCell *cell;
@@ -182,7 +184,7 @@ ea_calendar_cell_init (EaCalendarCell *a11y)
 	atk_state_set_add_state (a11y->state_set, ATK_STATE_FOCUSABLE);
 }
 
-AtkObject*
+AtkObject *
 ea_calendar_cell_new (GObject *obj)
 {
 	gpointer object;
@@ -316,8 +318,11 @@ atk_component_interface_init (AtkComponentIface *iface)
 
 static void
 component_interface_get_extents (AtkComponent *component,
-				 gint *x, gint *y, gint *width, gint *height,
-				 AtkCoordType coord_type)
+                                 gint *x,
+                                 gint *y,
+                                 gint *width,
+                                 gint *height,
+                                 AtkCoordType coord_type)
 {
 	GObject *g_obj;
 	AtkObject *atk_obj, *atk_canvas;
diff --git a/widgets/misc/ea-calendar-cell.h b/widgets/misc/ea-calendar-cell.h
index fa68fdca55..2fd2051538 100644
--- a/widgets/misc/ea-calendar-cell.h
+++ b/widgets/misc/ea-calendar-cell.h
@@ -79,7 +79,7 @@ struct _EaCalendarCellClass
 	AtkGObjectAccessibleClass parent_class;
 };
 
-AtkObject*     ea_calendar_cell_new         (GObject *gobj);
+AtkObject *     ea_calendar_cell_new         (GObject *gobj);
 
 G_END_DECLS
 
diff --git a/widgets/misc/ea-calendar-item.c b/widgets/misc/ea-calendar-item.c
index 5d482feb40..98a715eacf 100644
--- a/widgets/misc/ea-calendar-item.c
+++ b/widgets/misc/ea-calendar-item.c
@@ -45,7 +45,7 @@ static const gchar * ea_calendar_item_get_name (AtkObject *accessible);
 static const gchar * ea_calendar_item_get_description (AtkObject *accessible);
 static gint ea_calendar_item_get_n_children (AtkObject *accessible);
 static AtkObject *ea_calendar_item_ref_child (AtkObject *accessible, gint index);
-static AtkStateSet* ea_calendar_item_ref_state_set (AtkObject *accessible);
+static AtkStateSet * ea_calendar_item_ref_state_set (AtkObject *accessible);
 
 /* atk table interface */
 static void atk_table_interface_init (AtkTableIface *iface);
@@ -56,7 +56,7 @@ static gint table_interface_get_column_at_index (AtkTable *table,
 						 gint     index);
 static gint table_interface_get_row_at_index (AtkTable *table,
 					      gint     index);
-static AtkObject* table_interface_ref_at (AtkTable *table,
+static AtkObject * table_interface_ref_at (AtkTable *table,
 					  gint     row,
 					  gint     column);
 static gint table_interface_get_n_rows (AtkTable *table);
@@ -86,29 +86,31 @@ static gboolean table_interface_add_column_selection (AtkTable *table,
 						      gint column);
 static gboolean table_interface_remove_column_selection (AtkTable *table,
 							 gint column);
-static AtkObject* table_interface_get_row_header (AtkTable *table, gint row);
-static AtkObject* table_interface_get_column_header (AtkTable *table,
+static AtkObject * table_interface_get_row_header (AtkTable *table, gint row);
+static AtkObject * table_interface_get_column_header (AtkTable *table,
 						     gint in_col);
-static AtkObject* table_interface_get_caption (AtkTable *table);
+static AtkObject * table_interface_get_caption (AtkTable *table);
 
 static const gchar *
-table_interface_get_column_description (AtkTable *table, gint in_col);
+table_interface_get_column_description (AtkTable *table,
+                                        gint in_col);
 
 static const gchar *
-table_interface_get_row_description (AtkTable *table, gint row);
+table_interface_get_row_description (AtkTable *table,
+                                     gint row);
 
-static AtkObject* table_interface_get_summary (AtkTable *table);
+static AtkObject *table_interface_get_summary (AtkTable *table);
 
 /* atk selection interface */
 static void atk_selection_interface_init (AtkSelectionIface *iface);
 static gboolean selection_interface_add_selection (AtkSelection *selection,
-						   gint i);
+                                                   gint i);
 static gboolean selection_interface_clear_selection (AtkSelection *selection);
-static AtkObject* selection_interface_ref_selection (AtkSelection *selection,
-						     gint i);
+static AtkObject *selection_interface_ref_selection (AtkSelection *selection,
+                                                     gint i);
 static gint selection_interface_get_selection_count (AtkSelection *selection);
 static gboolean selection_interface_is_child_selected (AtkSelection *selection,
-						       gint i);
+                                                       gint i);
 
 /* callbacks */
 static void selection_preview_change_cb (ECalendarItem *calitem);
@@ -118,18 +120,20 @@ static void date_range_changed_cb (ECalendarItem *calitem);
 static EaCellTable *ea_calendar_item_get_cell_data (EaCalendarItem *ea_calitem);
 static void ea_calendar_item_destory_cell_data (EaCalendarItem *ea_calitem);
 static gboolean ea_calendar_item_get_column_label (EaCalendarItem *ea_calitem,
-						   gint column,
-						   gchar *buffer,
-						   gint buffer_size);
+                                                   gint column,
+                                                   gchar *buffer,
+                                                   gint buffer_size);
 static gboolean ea_calendar_item_get_row_label (EaCalendarItem *ea_calitem,
-						gint row,
-						gchar *buffer,
-						gint buffer_size);
+                                                gint row,
+                                                gchar *buffer,
+                                                gint buffer_size);
 static gboolean e_calendar_item_get_offset_for_date (ECalendarItem *calitem,
-						     gint year, gint month, gint day,
-						     gint *offset);
+                                                     gint year,
+                                                     gint month,
+                                                     gint day,
+                                                     gint *offset);
 static void ea_calendar_set_focus_object (EaCalendarItem *ea_calitem,
-					  AtkObject *item_cell);
+                                          AtkObject *item_cell);
 
 #ifdef ACC_DEBUG
 static gint n_ea_calendar_item_created = 0;
@@ -212,7 +216,7 @@ ea_calendar_item_class_init (EaCalendarItemClass *klass)
 	class->ref_child = ea_calendar_item_ref_child;
 }
 
-AtkObject*
+AtkObject *
 ea_calendar_item_new (GObject *obj)
 {
 	gpointer object;
@@ -350,7 +354,7 @@ ea_calendar_item_get_description (AtkObject *accessible)
 	return _("evolution calendar item");
 }
 
-static AtkStateSet*
+static AtkStateSet *
 ea_calendar_item_ref_state_set (AtkObject *accessible)
 {
 	AtkStateSet *state_set;
@@ -403,7 +407,8 @@ ea_calendar_item_get_n_children (AtkObject *accessible)
 }
 
 static AtkObject *
-ea_calendar_item_ref_child (AtkObject *accessible, gint index)
+ea_calendar_item_ref_child (AtkObject *accessible,
+                            gint index)
 {
 	AtkGObjectAccessible *atk_gobj;
 	GObject *g_obj;
@@ -482,14 +487,14 @@ atk_table_interface_init (AtkTableIface *iface)
 	iface->get_column_description = table_interface_get_column_description;
 }
 
-static AtkObject*
+static AtkObject *
 table_interface_ref_at (AtkTable *table,
-			gint     row,
-			gint     column)
+                        gint row,
+                        gint column)
 {
 	gint index;
 
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
+	EaCalendarItem * ea_calitem = EA_CALENDAR_ITEM (table);
 	index = EA_CALENDAR_COLUMN_NUM * row + column;
 	return ea_calendar_item_ref_child (ATK_OBJECT (ea_calitem), index);
 }
@@ -499,7 +504,7 @@ table_interface_get_n_rows (AtkTable *table)
 {
 	AtkGObjectAccessible *atk_gobj;
 	GObject *g_obj;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
+	EaCalendarItem * ea_calitem = EA_CALENDAR_ITEM (table);
 	gint n_children;
 
 	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
@@ -516,7 +521,7 @@ table_interface_get_n_columns (AtkTable *table)
 {
 	AtkGObjectAccessible *atk_gobj;
 	GObject *g_obj;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
+	EaCalendarItem * ea_calitem = EA_CALENDAR_ITEM (table);
 
 	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
 	g_obj = atk_gobject_accessible_get_object (atk_gobj);
@@ -528,12 +533,12 @@ table_interface_get_n_columns (AtkTable *table)
 
 static gint
 table_interface_get_index_at (AtkTable *table,
-			      gint     row,
-			      gint     column)
+                              gint row,
+                              gint column)
 {
 	AtkGObjectAccessible *atk_gobj;
 	GObject *g_obj;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
+	EaCalendarItem * ea_calitem = EA_CALENDAR_ITEM (table);
 
 	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
 	g_obj = atk_gobject_accessible_get_object (atk_gobj);
@@ -545,11 +550,11 @@ table_interface_get_index_at (AtkTable *table,
 
 static gint
 table_interface_get_column_at_index (AtkTable *table,
-				     gint index)
+                                     gint index)
 {
 	AtkGObjectAccessible *atk_gobj;
 	GObject *g_obj;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
+	EaCalendarItem * ea_calitem = EA_CALENDAR_ITEM (table);
 	gint n_children;
 
 	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
@@ -565,11 +570,11 @@ table_interface_get_column_at_index (AtkTable *table,
 
 static gint
 table_interface_get_row_at_index (AtkTable *table,
-				  gint     index)
+                                  gint index)
 {
 	AtkGObjectAccessible *atk_gobj;
 	GObject *g_obj;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
+	EaCalendarItem * ea_calitem = EA_CALENDAR_ITEM (table);
 	gint n_children;
 
 	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
@@ -584,14 +589,14 @@ table_interface_get_row_at_index (AtkTable *table,
 }
 
 static gint
-table_interface_get_column_extent_at (AtkTable      *table,
-				      gint          row,
-				      gint          column)
+table_interface_get_column_extent_at (AtkTable *table,
+                                      gint row,
+                                      gint column)
 {
 	AtkGObjectAccessible *atk_gobj;
 	GObject *g_obj;
 	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
+	EaCalendarItem * ea_calitem = EA_CALENDAR_ITEM (table);
 
 	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
 	g_obj = atk_gobject_accessible_get_object (atk_gobj);
@@ -604,12 +609,13 @@ table_interface_get_column_extent_at (AtkTable      *table,
 
 static gint
 table_interface_get_row_extent_at (AtkTable *table,
-				   gint row, gint column)
+                                   gint row,
+                                   gint column)
 {
 	AtkGObjectAccessible *atk_gobj;
 	GObject *g_obj;
 	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
+	EaCalendarItem * ea_calitem = EA_CALENDAR_ITEM (table);
 
 	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
 	g_obj = atk_gobject_accessible_get_object (atk_gobj);
@@ -623,7 +629,7 @@ table_interface_get_row_extent_at (AtkTable *table,
 /* any day in the row is selected, the row is selected */
 static gboolean
 table_interface_is_row_selected (AtkTable *table,
-				 gint row)
+                                 gint row)
 {
 	AtkGObjectAccessible *atk_gobj;
 	GObject *g_obj;
@@ -673,8 +679,8 @@ table_interface_is_row_selected (AtkTable *table,
 
 static gboolean
 table_interface_is_selected (AtkTable *table,
-			     gint     row,
-			     gint     column)
+                             gint row,
+                             gint column)
 {
 	AtkGObjectAccessible *atk_gobj;
 	GObject *g_obj;
@@ -722,14 +728,14 @@ table_interface_is_selected (AtkTable *table,
 
 static gboolean
 table_interface_is_column_selected (AtkTable *table,
-				    gint column)
+                                    gint column)
 {
 	return FALSE;
 }
 
 static gint
 table_interface_get_selected_rows (AtkTable *table,
-				   gint **rows_selected)
+                                   gint **rows_selected)
 {
 	*rows_selected = NULL;
 	return -1;
@@ -737,7 +743,7 @@ table_interface_get_selected_rows (AtkTable *table,
 
 static gint
 table_interface_get_selected_columns (AtkTable *table,
-				      gint **columns_selected)
+                                      gint **columns_selected)
 {
 	*columns_selected = NULL;
 	return -1;
@@ -745,62 +751,63 @@ table_interface_get_selected_columns (AtkTable *table,
 
 static gboolean
 table_interface_add_row_selection (AtkTable *table,
-				   gint row)
+                                   gint row)
 {
 	return FALSE;
 }
 
 static gboolean
 table_interface_remove_row_selection (AtkTable *table,
-				      gint row)
+                                      gint row)
 {
 	return FALSE;
 }
 
 static gboolean
 table_interface_add_column_selection (AtkTable *table,
-				      gint column)
+                                      gint column)
 {
 	return FALSE;
 }
 
 static gboolean
 table_interface_remove_column_selection (AtkTable *table,
-					 gint     column)
+                                         gint column)
 {
 	/* FIXME: NOT IMPLEMENTED */
 	return FALSE;
 }
 
-static AtkObject*
+static AtkObject *
 table_interface_get_row_header (AtkTable *table,
-				gint     row)
+                                gint row)
 {
 	/* FIXME: NOT IMPLEMENTED */
 	return NULL;
 }
 
-static AtkObject*
+static AtkObject *
 table_interface_get_column_header (AtkTable *table,
-				   gint     in_col)
+                                   gint in_col)
 {
 	/* FIXME: NOT IMPLEMENTED */
 	return NULL;
 }
 
-static AtkObject*
-table_interface_get_caption (AtkTable	*table)
+static AtkObject *
+table_interface_get_caption (AtkTable *table)
 {
 	/* FIXME: NOT IMPLEMENTED */
 	return NULL;
 }
 
 static const gchar *
-table_interface_get_column_description (AtkTable *table, gint in_col)
+table_interface_get_column_description (AtkTable *table,
+                                        gint in_col)
 {
 	AtkGObjectAccessible *atk_gobj;
 	GObject *g_obj;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
+	EaCalendarItem * ea_calitem = EA_CALENDAR_ITEM (table);
 	const gchar *description = NULL;
 	EaCellTable *cell_data;
 	gint n_columns;
@@ -830,11 +837,12 @@ table_interface_get_column_description (AtkTable *table, gint in_col)
 }
 
 static const gchar *
-table_interface_get_row_description (AtkTable *table, gint row)
+table_interface_get_row_description (AtkTable *table,
+                                     gint row)
 {
 	AtkGObjectAccessible *atk_gobj;
 	GObject *g_obj;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (table);
+	EaCalendarItem * ea_calitem = EA_CALENDAR_ITEM (table);
 	const gchar *description = NULL;
 	EaCellTable *cell_data;
 	gint n_rows;
@@ -863,8 +871,8 @@ table_interface_get_row_description (AtkTable *table, gint row)
 	return description;
 }
 
-static AtkObject*
-table_interface_get_summary (AtkTable	*table)
+static AtkObject *
+table_interface_get_summary (AtkTable *table)
 {
 	/* FIXME: NOT IMPLEMENTED */
 	return NULL;
@@ -885,12 +893,13 @@ atk_selection_interface_init (AtkSelectionIface *iface)
 }
 
 static gboolean
-selection_interface_add_selection (AtkSelection *selection, gint index)
+selection_interface_add_selection (AtkSelection *selection,
+                                   gint index)
 {
 	AtkGObjectAccessible *atk_gobj;
 	GObject *g_obj;
 	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (selection);
+	EaCalendarItem * ea_calitem = EA_CALENDAR_ITEM (selection);
 	gint year, month, day;
 	GDate start_date, end_date;
 
@@ -917,7 +926,7 @@ selection_interface_clear_selection (AtkSelection *selection)
 	AtkGObjectAccessible *atk_gobj;
 	GObject *g_obj;
 	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (selection);
+	EaCalendarItem * ea_calitem = EA_CALENDAR_ITEM (selection);
 
 	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
 	g_obj = atk_gobject_accessible_get_object (atk_gobj);
@@ -930,12 +939,13 @@ selection_interface_clear_selection (AtkSelection *selection)
 	return TRUE;
 }
 
-static AtkObject*
-selection_interface_ref_selection (AtkSelection *selection, gint i)
+static AtkObject *
+selection_interface_ref_selection (AtkSelection *selection,
+                                   gint i)
 {
 	GObject *g_obj;
 	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (selection);
+	EaCalendarItem * ea_calitem = EA_CALENDAR_ITEM (selection);
 	gint count, sel_offset;
 	GDate start_date, end_date;
 
@@ -964,7 +974,7 @@ selection_interface_get_selection_count (AtkSelection *selection)
 	AtkGObjectAccessible *atk_gobj;
 	GObject *g_obj;
 	ECalendarItem *calitem;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (selection);
+	EaCalendarItem * ea_calitem = EA_CALENDAR_ITEM (selection);
 	GDate start_date, end_date;
 
 	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
@@ -980,11 +990,12 @@ selection_interface_get_selection_count (AtkSelection *selection)
 }
 
 static gboolean
-selection_interface_is_child_selected (AtkSelection *selection, gint index)
+selection_interface_is_child_selected (AtkSelection *selection,
+                                       gint index)
 {
 	AtkGObjectAccessible *atk_gobj;
 	GObject *g_obj;
-	EaCalendarItem* ea_calitem = EA_CALENDAR_ITEM (selection);
+	EaCalendarItem * ea_calitem = EA_CALENDAR_ITEM (selection);
 	gint row, column, n_children;
 
 	atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_calitem);
@@ -1066,7 +1077,7 @@ ea_calendar_item_get_cell_data (EaCalendarItem *ea_calitem)
 
 	if (!cell_data) {
 		gint n_cells = ea_calendar_item_get_n_children (ATK_OBJECT (ea_calitem));
-		cell_data = ea_cell_table_create (n_cells/EA_CALENDAR_COLUMN_NUM,
+		cell_data = ea_cell_table_create (n_cells / EA_CALENDAR_COLUMN_NUM,
 						  EA_CALENDAR_COLUMN_NUM,
 						  FALSE);
 		g_object_set_data (G_OBJECT (ea_calitem),
@@ -1092,8 +1103,10 @@ ea_calendar_item_destory_cell_data (EaCalendarItem *ea_calitem)
 }
 
 static gboolean
-ea_calendar_item_get_row_label (EaCalendarItem *ea_calitem, gint row,
-				gchar *buffer, gint buffer_size)
+ea_calendar_item_get_row_label (EaCalendarItem *ea_calitem,
+                                gint row,
+                                gchar *buffer,
+                                gint buffer_size)
 {
 	AtkGObjectAccessible *atk_gobj;
 	GObject *g_obj;
@@ -1123,8 +1136,10 @@ ea_calendar_item_get_row_label (EaCalendarItem *ea_calitem, gint row,
 }
 
 static gboolean
-ea_calendar_item_get_column_label (EaCalendarItem *ea_calitem, gint column,
-				   gchar *buffer, gint buffer_size)
+ea_calendar_item_get_column_label (EaCalendarItem *ea_calitem,
+                                   gint column,
+                                   gchar *buffer,
+                                   gint buffer_size)
 {
 	AtkGObjectAccessible *atk_gobj;
 	GObject *g_obj;
@@ -1147,9 +1162,13 @@ ea_calendar_item_get_column_label (EaCalendarItem *ea_calitem, gint column,
 /* the coordinate the e-calendar canvas coord */
 gboolean
 e_calendar_item_get_day_extents (ECalendarItem *calitem,
-				 gint year, gint month, gint date,
-				 gint *x, gint *y,
-				 gint *width, gint *height)
+                                 gint year,
+                                 gint month,
+                                 gint date,
+                                 gint *x,
+                                 gint *y,
+                                 gint *width,
+                                 gint *height)
 {
 	GnomeCanvasItem *item;
 	GtkWidget *widget;
@@ -1229,8 +1248,11 @@ e_calendar_item_get_day_extents (ECalendarItem *calitem,
 
 /* month is from 0 to 11 */
 gboolean
-e_calendar_item_get_date_for_offset (ECalendarItem *calitem, gint day_offset,
-				     gint *year, gint *month, gint *day)
+e_calendar_item_get_date_for_offset (ECalendarItem *calitem,
+                                     gint day_offset,
+                                     gint *year,
+                                     gint *month,
+                                     gint *day)
 {
 	gint start_year, start_month, start_day;
 	gint end_year, end_month, end_day;
@@ -1258,8 +1280,10 @@ e_calendar_item_get_date_for_offset (ECalendarItem *calitem, gint day_offset,
 /* the arg month is from 0 to 11 */
 static gboolean
 e_calendar_item_get_offset_for_date (ECalendarItem *calitem,
-				     gint year, gint month, gint day,
-				     gint *offset)
+                                     gint year,
+                                     gint month,
+                                     gint day,
+                                     gint *offset)
 {
 	gint start_year, start_month, start_day;
 	gint end_year, end_month, end_day;
@@ -1286,7 +1310,8 @@ e_calendar_item_get_offset_for_date (ECalendarItem *calitem,
 
 gint
 e_calendar_item_get_n_days_from_week_start (ECalendarItem *calitem,
-					    gint year, gint month)
+                                            gint year,
+                                            gint month)
 {
 	struct tm tmp_tm;
 	gint start_weekday, days_from_week_start;
@@ -1304,7 +1329,8 @@ e_calendar_item_get_n_days_from_week_start (ECalendarItem *calitem,
 }
 
 static void
-ea_calendar_set_focus_object (EaCalendarItem *ea_calitem, AtkObject *item_cell)
+ea_calendar_set_focus_object (EaCalendarItem *ea_calitem,
+                              AtkObject *item_cell)
 {
 	AtkStateSet *state_set, *old_state_set;
 	AtkObject *old_cell;
diff --git a/widgets/misc/ea-cell-table.c b/widgets/misc/ea-cell-table.c
index c0c2bc0cde..bbdef0aea1 100644
--- a/widgets/misc/ea-cell-table.c
+++ b/widgets/misc/ea-cell-table.c
@@ -27,9 +27,11 @@
 #include "ea-cell-table.h"
 
 EaCellTable *
-ea_cell_table_create (gint rows, gint columns, gboolean column_first)
+ea_cell_table_create (gint rows,
+                      gint columns,
+                      gboolean column_first)
 {
-	EaCellTable * cell_data;
+	EaCellTable *cell_data;
 	gint index;
 
 	g_return_val_if_fail (((columns > 0) && (rows > 0)), NULL);
@@ -55,7 +57,7 @@ ea_cell_table_create (gint rows, gint columns, gboolean column_first)
 }
 
 void
-ea_cell_table_destroy (EaCellTable * cell_data)
+ea_cell_table_destroy (EaCellTable *cell_data)
 {
 	gint index;
 	g_return_if_fail (cell_data);
@@ -80,8 +82,9 @@ ea_cell_table_destroy (EaCellTable * cell_data)
 }
 
 gpointer
-ea_cell_table_get_cell (EaCellTable * cell_data,
-			gint row, gint column)
+ea_cell_table_get_cell (EaCellTable *cell_data,
+                        gint row,
+                        gint column)
 {
 	gint index;
 
@@ -95,8 +98,10 @@ ea_cell_table_get_cell (EaCellTable * cell_data,
 }
 
 gboolean
-ea_cell_table_set_cell (EaCellTable * cell_data,
-			gint row, gint column, gpointer cell)
+ea_cell_table_set_cell (EaCellTable *cell_data,
+                        gint row,
+                        gint column,
+                        gpointer cell)
 {
 	gint index;
 
@@ -117,8 +122,8 @@ ea_cell_table_set_cell (EaCellTable * cell_data,
 }
 
 gpointer
-ea_cell_table_get_cell_at_index (EaCellTable * cell_data,
-				 gint index)
+ea_cell_table_get_cell_at_index (EaCellTable *cell_data,
+                                 gint index)
 {
 	g_return_val_if_fail (cell_data, NULL);
 
@@ -128,8 +133,9 @@ ea_cell_table_get_cell_at_index (EaCellTable * cell_data,
 }
 
 gboolean
-ea_cell_table_set_cell_at_index (EaCellTable * cell_data,
-				 gint index, gpointer cell)
+ea_cell_table_set_cell_at_index (EaCellTable *cell_data,
+                                 gint index,
+                                 gpointer cell)
 {
 	g_return_val_if_fail (cell_data, FALSE);
 
@@ -147,8 +153,8 @@ ea_cell_table_set_cell_at_index (EaCellTable * cell_data,
 }
 
 const gchar *
-ea_cell_table_get_column_label (EaCellTable * cell_data,
-				gint column)
+ea_cell_table_get_column_label (EaCellTable *cell_data,
+                                gint column)
 {
 	g_return_val_if_fail (cell_data, NULL);
 	g_return_val_if_fail ((column >= 0 && column < cell_data->columns), NULL);
@@ -157,8 +163,9 @@ ea_cell_table_get_column_label (EaCellTable * cell_data,
 }
 
 void
-ea_cell_table_set_column_label (EaCellTable * cell_data,
-				gint column, const gchar *label)
+ea_cell_table_set_column_label (EaCellTable *cell_data,
+                                gint column,
+                                const gchar *label)
 {
 	g_return_if_fail (cell_data);
 	g_return_if_fail ((column >= 0 && column < cell_data->columns));
@@ -169,8 +176,8 @@ ea_cell_table_set_column_label (EaCellTable * cell_data,
 }
 
 const gchar *
-ea_cell_table_get_row_label (EaCellTable * cell_data,
-			     gint row)
+ea_cell_table_get_row_label (EaCellTable *cell_data,
+                             gint row)
 {
 	g_return_val_if_fail (cell_data, NULL);
 	g_return_val_if_fail ((row >= 0 && row < cell_data->rows), NULL);
@@ -179,8 +186,9 @@ ea_cell_table_get_row_label (EaCellTable * cell_data,
 }
 
 void
-ea_cell_table_set_row_label (EaCellTable * cell_data,
-			     gint row, const gchar *label)
+ea_cell_table_set_row_label (EaCellTable *cell_data,
+                             gint row,
+                             const gchar *label)
 {
 	g_return_if_fail (cell_data);
 	g_return_if_fail ((row >= 0 && row < cell_data->rows));
@@ -192,7 +200,8 @@ ea_cell_table_set_row_label (EaCellTable * cell_data,
 
 gint
 ea_cell_table_get_index (EaCellTable *cell_data,
-			 gint row, gint column)
+                         gint row,
+                         gint column)
 {
 	g_return_val_if_fail (cell_data, -1);
 	if (row < 0 || row >= cell_data->rows ||
diff --git a/widgets/misc/test-calendar.c b/widgets/misc/test-calendar.c
index 83b8f11cd7..7a4d2f8954 100644
--- a/widgets/misc/test-calendar.c
+++ b/widgets/misc/test-calendar.c
@@ -46,14 +46,15 @@ static void on_selection_changed	(ECalendarItem *calitem);
 
 static void
 delete_event_cb (GtkWidget *widget,
-		 GdkEventAny *event,
-		 gpointer data)
+                 GdkEventAny *event,
+                 gpointer data)
 {
 	gtk_main_quit ();
 }
 
 gint
-main (gint argc, gchar **argv)
+main (gint argc,
+      gchar **argv)
 {
 	GtkWidget *window;
 	GtkWidget *cal;
diff --git a/widgets/misc/test-dateedit.c b/widgets/misc/test-dateedit.c
index 79ca726c3e..2629fad4e0 100644
--- a/widgets/misc/test-dateedit.c
+++ b/widgets/misc/test-dateedit.c
@@ -48,7 +48,8 @@ static void on_time_changed		(EDateEdit	*dedit,
 #endif
 
 gint
-main (gint argc, gchar **argv)
+main (gint argc,
+      gchar **argv)
 {
 	GtkWidget *window;
 	EDateEdit *dedit;
@@ -94,14 +95,14 @@ main (gint argc, gchar **argv)
 	gtk_table_attach (GTK_TABLE (table), button,
 			  1, 2, 0, 1, 0, 0, 0, 0);
 	gtk_widget_show (button);
-	g_signal_connect((button), "clicked",
+	g_signal_connect ((button), "clicked",
 			    G_CALLBACK (on_get_date_clicked), dedit);
 
 	/* EDateEdit 2. */
 	dedit = E_DATE_EDIT (e_date_edit_new ());
-	gtk_table_attach (GTK_TABLE (table), (GtkWidget*) dedit,
+	gtk_table_attach (GTK_TABLE (table), (GtkWidget *) dedit,
 			  0, 1, 1, 2, GTK_FILL, GTK_EXPAND, 0, 0);
-	gtk_widget_show ((GtkWidget*) (dedit));
+	gtk_widget_show ((GtkWidget *) (dedit));
 	e_date_edit_set_week_start_day (dedit, 1);
 	e_date_edit_set_show_week_numbers (dedit, TRUE);
 	e_date_edit_set_use_24_hour_format (dedit, FALSE);
@@ -127,9 +128,9 @@ main (gint argc, gchar **argv)
 
 	/* EDateEdit 3. */
 	dedit = E_DATE_EDIT (e_date_edit_new ());
-	gtk_table_attach (GTK_TABLE (table), (GtkWidget*) dedit,
+	gtk_table_attach (GTK_TABLE (table), (GtkWidget *) dedit,
 			  0, 1, 2, 3, GTK_FILL, GTK_EXPAND, 0, 0);
-	gtk_widget_show ((GtkWidget*) (dedit));
+	gtk_widget_show ((GtkWidget *) (dedit));
 	e_date_edit_set_week_start_day (dedit, 1);
 	e_date_edit_set_show_week_numbers (dedit, TRUE);
 	e_date_edit_set_use_24_hour_format (dedit, FALSE);
@@ -168,9 +169,9 @@ main (gint argc, gchar **argv)
 }
 
 static void
-delete_event_cb		(GtkWidget	*widget,
-			 GdkEventAny	*event,
-			 GtkWidget	*window)
+delete_event_cb (GtkWidget *widget,
+                 GdkEventAny *event,
+                 GtkWidget *window)
 {
 	gtk_widget_destroy (window);
 
@@ -178,8 +179,8 @@ delete_event_cb		(GtkWidget	*widget,
 }
 
 static void
-on_get_date_clicked	(GtkWidget	*button,
-			 EDateEdit	*dedit)
+on_get_date_clicked (GtkWidget *button,
+                     EDateEdit *dedit)
 {
 	time_t t;
 
@@ -197,8 +198,8 @@ on_get_date_clicked	(GtkWidget	*button,
 }
 
 static void
-on_toggle_24_hour_clicked	(GtkWidget	*button,
-				 EDateEdit	*dedit)
+on_toggle_24_hour_clicked (GtkWidget *button,
+                           EDateEdit *dedit)
 {
 	gboolean use_24_hour_format;
 
@@ -208,8 +209,8 @@ on_toggle_24_hour_clicked	(GtkWidget	*button,
 
 #if 0
 static void
-on_date_changed		(EDateEdit	*dedit,
-			 gchar		*name)
+on_date_changed (EDateEdit *dedit,
+                 gchar *name)
 {
 	gint year, month, day;
 
@@ -226,8 +227,8 @@ on_date_changed		(EDateEdit	*dedit,
 }
 
 static void
-on_time_changed		(EDateEdit	*dedit,
-			 gchar		*name)
+on_time_changed (EDateEdit *dedit,
+                 gchar *name)
 {
 	gint hour, minute;
 
@@ -245,8 +246,8 @@ on_time_changed		(EDateEdit	*dedit,
 #endif
 
 static void
-on_changed		(EDateEdit	*dedit,
-			 gchar		*name)
+on_changed (EDateEdit *dedit,
+            gchar *name)
 {
 	gint year, month, day, hour, minute;
 
diff --git a/widgets/misc/test-preferences-window.c b/widgets/misc/test-preferences-window.c
index e7c4499d6a..738d7ff403 100644
--- a/widgets/misc/test-preferences-window.c
+++ b/widgets/misc/test-preferences-window.c
@@ -71,8 +71,8 @@ add_pages (EPreferencesWindow *preferences_window)
 
 static gint
 delete_event_callback (GtkWidget *widget,
-		       GdkEventAny *event,
-		       gpointer data)
+                       GdkEventAny *event,
+                       gpointer data)
 {
 	gtk_main_quit ();
 
@@ -80,7 +80,8 @@ delete_event_callback (GtkWidget *widget,
 }
 
 gint
-main (gint argc, gchar **argv)
+main (gint argc,
+      gchar **argv)
 {
 	GtkWidget *window;