More whitespace cleanup.

31 files changed, 409 insertions, 408 deletions

diff --git a/calendar/gui/alarm-notify/util.c b/calendar/gui/alarm-notify/util.c
index e0bbf10245..d5c6678cc4 100644
--- a/calendar/gui/alarm-notify/util.c
+++ b/calendar/gui/alarm-notify/util.c
@@ -61,7 +61,7 @@ calculate_time (time_t start, time_t end)
 	gchar *joined;
 	gint   i;
 
-        i = 0;
+	i = 0;
 	if (difference >= 3600) {
 		hours = difference / 3600;
 		difference %= 3600;
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index 418bf8a704..6d4219c2b4 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -129,7 +129,7 @@ static const gint action_map[] = {
 static const gchar *action_map_cap[] = {
 	CAL_STATIC_CAPABILITY_NO_DISPLAY_ALARMS,
 	CAL_STATIC_CAPABILITY_NO_AUDIO_ALARMS,
-        CAL_STATIC_CAPABILITY_NO_PROCEDURE_ALARMS,
+	CAL_STATIC_CAPABILITY_NO_PROCEDURE_ALARMS,
 	CAL_STATIC_CAPABILITY_NO_EMAIL_ALARMS
 };
 
@@ -499,46 +499,46 @@ malarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
 static void
 alarm_to_malarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm )
 {
-    ENameSelectorModel *name_selector_model;
-    EDestinationStore *destination_store;
-    ECalComponentText description;
-    GtkTextBuffer *text_buffer;
-    GSList *attendee_list, *l;
-    gint len;
-
-    /* Attendees */
-    name_selector_model = e_name_selector_peek_model (dialog->name_selector);
-    e_name_selector_model_peek_section (name_selector_model, section_name, NULL, &destination_store);
-
-    e_cal_component_alarm_get_attendee_list (alarm, &attendee_list);
-    len = g_slist_length (attendee_list);
-    if (len > 0) {
-        for (l = attendee_list; l; l = g_slist_next (l)) {
-            ECalComponentAttendee *a = l->data;
-            EDestination *dest;
-
-            dest = e_destination_new ();
-            if (a->cn != NULL && *a->cn)
-                e_destination_set_name (dest, a->cn);
-            if (a->value != NULL && *a->value) {
-                if (!strncasecmp (a->value, "MAILTO:", 7))
-                    e_destination_set_email (dest, a->value + 7);
-                else
-                    e_destination_set_email (dest, a->value);
-            }
-            e_destination_store_append_destination (destination_store, dest);
-            g_object_unref (G_OBJECT (dest));
-        }
-        e_cal_component_free_attendee_list (attendee_list);
-    }
-
-    /* Description */
-    e_cal_component_alarm_get_description (alarm, &description);
-    if (description.value) {
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->malarm_message), TRUE);
-        text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->malarm_description));
-        gtk_text_buffer_set_text (text_buffer, description.value, -1);
-    }
+	ENameSelectorModel *name_selector_model;
+	EDestinationStore *destination_store;
+	ECalComponentText description;
+	GtkTextBuffer *text_buffer;
+	GSList *attendee_list, *l;
+	gint len;
+
+	/* Attendees */
+	name_selector_model = e_name_selector_peek_model (dialog->name_selector);
+	e_name_selector_model_peek_section (name_selector_model, section_name, NULL, &destination_store);
+
+	e_cal_component_alarm_get_attendee_list (alarm, &attendee_list);
+	len = g_slist_length (attendee_list);
+	if (len > 0) {
+	for (l = attendee_list; l; l = g_slist_next (l)) {
+		ECalComponentAttendee *a = l->data;
+		EDestination *dest;
+
+		dest = e_destination_new ();
+		if (a->cn != NULL && *a->cn)
+		e_destination_set_name (dest, a->cn);
+		if (a->value != NULL && *a->value) {
+				if (!strncasecmp (a->value, "MAILTO:", 7))
+			e_destination_set_email (dest, a->value + 7);
+		else
+			e_destination_set_email (dest, a->value);
+		}
+		e_destination_store_append_destination (destination_store, dest);
+		g_object_unref (G_OBJECT (dest));
+	}
+	e_cal_component_free_attendee_list (attendee_list);
+	}
+
+	/* Description */
+	e_cal_component_alarm_get_description (alarm, &description);
+	if (description.value) {
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->malarm_message), TRUE);
+	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->malarm_description));
+	gtk_text_buffer_set_text (text_buffer, description.value, -1);
+	}
 }
 
 /* Fills the widgets from procedure alarm data */
@@ -634,8 +634,8 @@ populate_widgets_from_alarm (Dialog *dialog)
 	case E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_END:
 		e_dialog_combo_box_set (dialog->time_combo, E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_END, time_map);
 		break;
-        default:
-                g_warning ("%s: Unexpected alarm type (%d)", G_STRLOC, trigger->type);
+	default:
+		g_warning ("%s: Unexpected alarm type (%d)", G_STRLOC, trigger->type);
 	}
 
 	switch (trigger->u.rel_duration.is_neg) {
@@ -692,8 +692,8 @@ populate_widgets_from_alarm (Dialog *dialog)
 	case E_CAL_COMPONENT_ALARM_PROCEDURE:
 		alarm_to_palarm_widgets (dialog, dialog->alarm);
 		break;
-        default:
-                g_warning ("%s: Unexpected alarm action (%d)", G_STRLOC, *action);
+	default:
+		g_warning ("%s: Unexpected alarm action (%d)", G_STRLOC, *action);
 	}
 }
 
@@ -1085,8 +1085,8 @@ check_custom_email (Dialog *dialog)
 }
 
 static void
-malarm_addresses_changed_cb  (GtkWidget *editable,
-			      gpointer   data)
+malarm_addresses_changed_cb (GtkWidget *editable,
+                             gpointer data)
 {
 	Dialog *dialog = data;
 
@@ -1241,8 +1241,9 @@ alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm)
 	gtk_window_set_icon_name (
 		GTK_WINDOW (dialog.toplevel), "x-office-calendar");
 
-	gtk_window_set_transient_for (GTK_WINDOW (dialog.toplevel),
-				      GTK_WINDOW (parent));
+	gtk_window_set_transient_for (
+		GTK_WINDOW (dialog.toplevel),
+		GTK_WINDOW (parent));
 
 	response_id = gtk_dialog_run (GTK_DIALOG (dialog.toplevel));
 
diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
index 0fb09c6c29..0dbf9f81d0 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ b/calendar/gui/dialogs/alarm-list-dialog.c
@@ -131,7 +131,7 @@ add_clicked_cb (GtkButton *button, gpointer data)
 	icalcomp = e_cal_component_alarm_get_icalcomponent (alarm);
 	icalprop = icalproperty_new_x ("1");
 	icalproperty_set_x_name (icalprop, "X-EVOLUTION-NEEDS-DESCRIPTION");
-        icalcomponent_add_property (icalcomp, icalprop);
+	icalcomponent_add_property (icalcomp, icalprop);
 
 	if (alarm_dialog_run (dialog->toplevel, dialog->ecal, alarm)) {
 		e_alarm_list_append (dialog->list_store, &iter, alarm);
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 0115f85a0e..7628f7f1bb 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -229,7 +229,7 @@ static void
 attachment_store_changed_cb (CompEditor *editor)
 {
 	/* Mark the editor as changed so it prompts about unsaved
-           changes on close */
+	   changes on close */
 	comp_editor_set_changed (editor, TRUE);
 }
 
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index b0ccb953b2..850728449e 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -88,7 +88,7 @@ delete_component_dialog (ECalComponent *comp,
 
 		switch (vtype) {
 		case E_CAL_COMPONENT_EVENT:
-                        attendees = e_cal_component_has_attendees (comp);
+			attendees = e_cal_component_has_attendees (comp);
 			if (arg0) {
 				if (attendees)
 					id = "calendar:prompt-delete-titled-meeting";
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 5bf870e512..7d7e1d4859 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -847,7 +847,7 @@ sensitize_widgets (EventPage *epage)
 			gtk_combo_box_set_active (GTK_COMBO_BOX (priv->end_time_combo), 1);
 		else
 			gtk_combo_box_set_active (GTK_COMBO_BOX (priv->end_time_combo), 0);
-        } else
+	} else
 		gtk_combo_box_set_active (GTK_COMBO_BOX (priv->end_time_combo), 1);
 
 	gtk_widget_set_sensitive (priv->hour_selector, sensitize);
@@ -1673,16 +1673,16 @@ void update_end_time_combo (EventPage *epage)
 	priv = epage->priv;
 
 	e_date_edit_get_date (E_DATE_EDIT (priv->start_time),
-                             &start_tt.year,
-                             &start_tt.month,
-                             &start_tt.day);
-        e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time),
+			     &start_tt.year,
+			     &start_tt.month,
+			     &start_tt.day);
+	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time),
 				     &start_tt.hour,
 				     &start_tt.minute);
 	e_date_edit_get_date (E_DATE_EDIT (priv->end_time),
-                             &end_tt.year,
-                             &end_tt.month,
-                             &end_tt.day);
+			     &end_tt.year,
+			     &end_tt.month,
+			     &end_tt.day);
 	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->end_time),
 				     &end_tt.hour,
 				     &end_tt.minute);
@@ -1720,12 +1720,12 @@ hour_minute_changed (EventPage *epage)
 	priv = epage->priv;
 
 	e_date_edit_get_date (E_DATE_EDIT (priv->start_time),
-                              &end_tt.year,
-                              &end_tt.month,
-                              &end_tt.day);
-        e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time),
-                                     &end_tt.hour,
-                                     &end_tt.minute);
+			      &end_tt.year,
+			      &end_tt.month,
+			      &end_tt.day);
+	e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time),
+				     &end_tt.hour,
+				     &end_tt.minute);
 
 	for_hours = gtk_spin_button_get_value (GTK_SPIN_BUTTON (priv->hour_selector));
 	for_minutes = gtk_spin_button_get_value (GTK_SPIN_BUTTON (priv->minute_selector));
diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c
index e517819c6b..79905d5f01 100644
--- a/calendar/gui/dialogs/select-source-dialog.c
+++ b/calendar/gui/dialogs/select-source-dialog.c
@@ -48,7 +48,7 @@ select_source_dialog (GtkWindow *parent, ECalSourceType obj_type, ESource *excep
 		gconf_key = "/apps/evolution/calendar/sources";
 	else if (obj_type == E_CAL_SOURCE_TYPE_TODO)
 		gconf_key = "/apps/evolution/tasks/sources";
-        else if (obj_type == E_CAL_SOURCE_TYPE_JOURNAL)
+	else if (obj_type == E_CAL_SOURCE_TYPE_JOURNAL)
                 gconf_key = "/apps/evolution/memos/sources";
 	else
 		return NULL;
@@ -63,7 +63,7 @@ select_source_dialog (GtkWindow *parent, ECalSourceType obj_type, ESource *excep
 		icon_name = "x-office-calendar";
 	else if (obj_type == E_CAL_SOURCE_TYPE_TODO)
 		icon_name = "stock_todo";
-        else if (obj_type == E_CAL_SOURCE_TYPE_JOURNAL)
+	else if (obj_type == E_CAL_SOURCE_TYPE_JOURNAL)
                 icon_name = "stock_journal";
 
 	if (icon_name)
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c
index dc23153997..636e734d82 100644
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@ -134,8 +134,8 @@ timet_to_str_with_zone (ECalComponentDateTime *dt,
 {
 	struct icaltimetype itt;
 	icaltimezone *zone;
-        struct tm tm;
-        gchar buf[256];
+	struct tm tm;
+	gchar buf[256];
 
 	if (dt->tzid) {
 		/* If we can't find the zone, we'll guess its "local" */
@@ -150,9 +150,9 @@ timet_to_str_with_zone (ECalComponentDateTime *dt,
 	itt = *dt->value;
 	if (zone)
 		icaltimezone_convert_time (&itt, zone, default_zone);
-        tm = icaltimetype_to_tm (&itt);
+	tm = icaltimetype_to_tm (&itt);
 
-        e_time_format_date_and_time (
+	e_time_format_date_and_time (
 		&tm, use_24_hour_format,
 		FALSE, FALSE, buf, sizeof (buf));
 
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index b4a7cf2d16..b6efb3e0e1 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -819,7 +819,7 @@ static ECellDateEditValue*
 get_dtstart (ECalModel *model, ECalModelComponent *comp_data)
 {
 	ECalModelPrivate *priv;
-        struct icaltimetype tt_start;
+	struct icaltimetype tt_start;
 
 	priv = model->priv;
 
@@ -867,7 +867,7 @@ static ECellDateEditValue*
 get_datetime_from_utc (ECalModel *model, ECalModelComponent *comp_data, icalproperty_kind propkind, struct icaltimetype (*get_value)(const icalproperty* prop), ECellDateEditValue **buffer)
 {
 	ECalModelPrivate *priv;
-        struct icaltimetype tt_value;
+	struct icaltimetype tt_value;
 	icalproperty *prop;
 	ECellDateEditValue *res;
 
@@ -3234,15 +3234,15 @@ e_cal_model_component_get_type (void)
 
 	if (!e_cal_model_component_type) {
 		static GTypeInfo info = {
-                        sizeof (ECalModelComponentClass),
-                        (GBaseInitFunc) NULL,
-                        (GBaseFinalizeFunc) NULL,
-                        (GClassInitFunc) e_cal_model_component_class_init,
-                        NULL, NULL,
-                        sizeof (ECalModelComponent),
-                        0,
-                        (GInstanceInitFunc) e_cal_model_component_init
-                };
+			sizeof (ECalModelComponentClass),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) e_cal_model_component_class_init,
+			NULL, NULL,
+			sizeof (ECalModelComponent),
+			0,
+			(GInstanceInitFunc) e_cal_model_component_init
+		};
 		e_cal_model_component_type = g_type_register_static (G_TYPE_OBJECT, "ECalModelComponent", &info, 0);
 	}
 
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 132f9cc29d..181d4a19f4 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -1717,7 +1717,7 @@ tooltip_grab (GtkWidget *tooltip, GdkEventKey *event, ECalendarView *view)
 static gchar *
 get_label (struct icaltimetype *tt, icaltimezone *f_zone, icaltimezone *t_zone)
 {
-        struct tm tmp_tm;
+	struct tm tmp_tm;
 
 	tmp_tm = icaltimetype_to_tm_with_zone (tt, f_zone, t_zone);
 
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index 7e5fed0275..838295c6d6 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -251,7 +251,7 @@ day_view_main_item_draw_day_event (EDayViewMainItem *main_item,
 	   column of the day, we might not want to paint over the vertical bar,
 	   since that is used for multiple events. But then you can't see
 	   where the event in the first column finishes. The border is drawn
-           along with the event using cairo*/
+	   along with the event using cairo*/
 
 	red = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].red;
 	green = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].green;
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index def481ea2a..d6faa6151c 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -309,7 +309,7 @@ day_view_top_item_draw_long_event (EDayViewTopItem *top_item,
 
 	time_width = e_day_view_get_time_string_width (day_view);
 
-        gdk_cairo_set_source_color (cr, &style->fg[GTK_STATE_NORMAL]);
+	gdk_cairo_set_source_color (cr, &style->fg[GTK_STATE_NORMAL]);
 
 	if (event->start > day_view->day_starts[start_day]) {
 		offset = day_view->first_hour_shown * 60
@@ -329,23 +329,23 @@ day_view_top_item_draw_long_event (EDayViewTopItem *top_item,
 				    display_hour, minute, suffix);
 		}
 
-                cairo_save (cr);
+		cairo_save (cr);
 
-                cairo_rectangle (cr,
-                                 item_x - x, item_y - y,
+		cairo_rectangle (cr,
+				 item_x - x, item_y - y,
 				 item_w - E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH, item_h);
-                cairo_clip (cr);
+		cairo_clip (cr);
 
 		time_x = item_x + E_DAY_VIEW_LONG_EVENT_X_PAD - x;
 		if (display_hour < 10)
 			time_x += day_view->digit_width;
 
 		layout = gtk_widget_create_pango_layout (GTK_WIDGET (day_view), buffer);
-                cairo_move_to (cr,
-                               time_x,
-                               item_y + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT +
-                               E_DAY_VIEW_LONG_EVENT_Y_PAD - y);
-                pango_cairo_show_layout (cr, layout);
+		cairo_move_to (cr,
+			       time_x,
+			       item_y + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT +
+			       E_DAY_VIEW_LONG_EVENT_Y_PAD - y);
+		pango_cairo_show_layout (cr, layout);
 		g_object_unref (layout);
 
 		cairo_restore (cr);
@@ -386,9 +386,9 @@ day_view_top_item_draw_long_event (EDayViewTopItem *top_item,
 				time_x += day_view->digit_width;
 
 			layout = gtk_widget_create_pango_layout (GTK_WIDGET (day_view), buffer);
-                        cairo_move_to (cr,
-                                       time_x,
-                                       item_y + E_DAY_VIEW_LONG_EVENT_Y_PAD + 1 - y);
+			cairo_move_to (cr,
+				       time_x,
+				       item_y + E_DAY_VIEW_LONG_EVENT_Y_PAD + 1 - y);
 			pango_cairo_show_layout (cr, layout);
 			g_object_unref (layout);
 
@@ -458,12 +458,12 @@ day_view_top_item_draw_long_event (EDayViewTopItem *top_item,
 
 		if (icon_x <= max_icon_x) {
 			gdk_cairo_set_source_pixbuf (cr, pixbuf,
-                                                     icon_x, icon_y);
-                        cairo_rectangle (cr,
-                                         icon_x, icon_y,
+						     icon_x, icon_y);
+			cairo_rectangle (cr,
+					 icon_x, icon_y,
 					 E_DAY_VIEW_ICON_WIDTH,
 					 E_DAY_VIEW_ICON_HEIGHT);
-                        cairo_fill (cr);
+			cairo_fill (cr);
 			icon_x -= icon_x_inc;
 		}
 	}
@@ -675,21 +675,21 @@ day_view_top_item_draw (GnomeCanvasItem *canvas_item,
 				clip_rect.width = day_view->day_widths[day];
 			clip_rect.height = item_height - 2;
 
-                        cairo_save (cr);
+			cairo_save (cr);
 
-                        gdk_cairo_rectangle (cr, &clip_rect);
-                        cairo_clip (cr);
+			gdk_cairo_rectangle (cr, &clip_rect);
+			cairo_clip (cr);
 
 			layout = gtk_widget_create_pango_layout (GTK_WIDGET (day_view), buffer);
 			pango_layout_get_pixel_size (layout, &date_width, NULL);
 			date_x = day_view->day_offsets[day] + (clip_rect.width - date_width) / 2;
 
-                        gdk_cairo_set_source_color (cr, &style->fg[GTK_STATE_NORMAL]);
-                        cairo_move_to (cr, date_x - x, 3 - y);
-                        pango_cairo_show_layout (cr, layout);
+			gdk_cairo_set_source_color (cr, &style->fg[GTK_STATE_NORMAL]);
+			cairo_move_to (cr, date_x - x, 3 - y);
+			pango_cairo_show_layout (cr, layout);
 
 			g_object_unref (layout);
-                        cairo_restore (cr);
+			cairo_restore (cr);
 
 			/* Draw the lines down the left and right of the date cols. */
 			if (day != 0) {
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index f881fc99e7..52d34f511e 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -5065,7 +5065,7 @@ e_day_view_add_new_event_in_selected_range (EDayView *day_view, GdkEventKey *key
 	time_t dtstart, dtend;
 	ECalComponentDateTime start_dt, end_dt;
 	struct icaltimetype start_tt, end_tt;
-        const gchar *uid;
+	const gchar *uid;
 	AddEventData add_event_data;
 	gboolean read_only = TRUE;
 
@@ -6018,10 +6018,10 @@ e_day_view_start_editing_event (EDayView *day_view,
 	e_canvas_item_grab_focus (event->canvas_item, TRUE);
 
 	if (key_event) {
-                if (gtk_im_context_filter_keypress (((EText *)(event->canvas_item))->im_context, key_event)) {
-                        ((EText *)(event->canvas_item))->need_im_reset = TRUE;
-                }
-                else {
+		if (gtk_im_context_filter_keypress (((EText *)(event->canvas_item))->im_context, key_event)) {
+			((EText *)(event->canvas_item))->need_im_reset = TRUE;
+		}
+		else {
 			gchar *initial_text;
 
 			initial_text = e_utf8_from_gtk_event_key (GTK_WIDGET (day_view), key_event->keyval, key_event->string);
@@ -6171,18 +6171,18 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item,
 			/* focus should go to day view when stop editing */
 			gtk_widget_grab_focus (GTK_WIDGET (day_view));
 			return TRUE;
-               } else if ((event->key.keyval == GDK_KEY_Up)
-                          && (event->key.state & GDK_SHIFT_MASK)
-                          && (event->key.state & GDK_CONTROL_MASK)
-                          && !(event->key.state & GDK_MOD1_MASK)) {
-                       e_day_view_change_event_end_time_up (day_view);
-                       return TRUE;
-               } else if ((event->key.keyval == GDK_KEY_Down)
-                          && (event->key.state & GDK_SHIFT_MASK)
-                          && (event->key.state & GDK_CONTROL_MASK)
-                          && !(event->key.state & GDK_MOD1_MASK)) {
-                       e_day_view_change_event_end_time_down (day_view);
-                       return TRUE;
+	       } else if ((event->key.keyval == GDK_KEY_Up)
+			  && (event->key.state & GDK_SHIFT_MASK)
+			  && (event->key.state & GDK_CONTROL_MASK)
+			  && !(event->key.state & GDK_MOD1_MASK)) {
+		       e_day_view_change_event_end_time_up (day_view);
+		       return TRUE;
+	       } else if ((event->key.keyval == GDK_KEY_Down)
+			  && (event->key.state & GDK_SHIFT_MASK)
+			  && (event->key.state & GDK_CONTROL_MASK)
+			  && !(event->key.state & GDK_MOD1_MASK)) {
+		       e_day_view_change_event_end_time_down (day_view);
+		       return TRUE;
 		}
 		break;
 	case GDK_2BUTTON_PRESS:
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index f3c5cb8b49..b72662ce8f 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -613,21 +613,21 @@ change_edit_cols_for_user (gpointer key, gpointer value, gpointer user_data)
        gint key_val = GPOINTER_TO_INT (key);
        switch (key_val)
        {
-               case E_MEETING_STORE_ATTENDEE_COL:
+	       case E_MEETING_STORE_ATTENDEE_COL:
                        g_object_set (G_OBJECT (renderer), "editable", FALSE, NULL);
-               break;
-               case E_MEETING_STORE_ROLE_COL:
+	       break;
+	       case E_MEETING_STORE_ROLE_COL:
                        g_object_set (G_OBJECT (renderer), "editable", FALSE, NULL);
-               break;
-               case E_MEETING_STORE_TYPE_COL:
+	       break;
+	       case E_MEETING_STORE_TYPE_COL:
                        g_object_set (G_OBJECT (renderer), "editable", FALSE, NULL);
-               break;
-               case E_MEETING_STORE_RSVP_COL:
+	       break;
+	       case E_MEETING_STORE_RSVP_COL:
                        g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL);
-               break;
-               case E_MEETING_STORE_STATUS_COL:
+	       break;
+	       case E_MEETING_STORE_STATUS_COL:
                        g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL);
-               break;
+	       break;
        }
 }
 
@@ -654,9 +654,9 @@ row_activated_cb (GtkTreeSelection *selection, EMeetingListView *view)
        priv = view->priv;
 
        if (!(paths = gtk_tree_selection_get_selected_rows (selection, &model)))
-               return;
+	       return;
        if (g_list_length (paths) > 1)
-               return;
+	       return;
        path = g_list_nth_data (paths, 0);
        if (!path)
 	       return;
@@ -667,20 +667,20 @@ row_activated_cb (GtkTreeSelection *selection, EMeetingListView *view)
 
        switch (el)
        {
-               case  E_MEETING_ATTENDEE_EDIT_NONE:
-               edit_level = FALSE;
-               g_hash_table_foreach (priv->renderers, change_edit_cols_for_organizer, GINT_TO_POINTER (edit_level));
-               break;
-
-               case E_MEETING_ATTENDEE_EDIT_FULL:
-               edit_level = TRUE;
-               g_hash_table_foreach (priv->renderers, change_edit_cols_for_organizer, GINT_TO_POINTER (edit_level));
-               break;
-
-               case E_MEETING_ATTENDEE_EDIT_STATUS:
-               edit_level = FALSE;
-               g_hash_table_foreach (priv->renderers, change_edit_cols_for_user, GINT_TO_POINTER (edit_level));
-               break;
+	       case  E_MEETING_ATTENDEE_EDIT_NONE:
+	       edit_level = FALSE;
+	       g_hash_table_foreach (priv->renderers, change_edit_cols_for_organizer, GINT_TO_POINTER (edit_level));
+	       break;
+
+	       case E_MEETING_ATTENDEE_EDIT_FULL:
+	       edit_level = TRUE;
+	       g_hash_table_foreach (priv->renderers, change_edit_cols_for_organizer, GINT_TO_POINTER (edit_level));
+	       break;
+
+	       case E_MEETING_ATTENDEE_EDIT_STATUS:
+	       edit_level = FALSE;
+	       g_hash_table_foreach (priv->renderers, change_edit_cols_for_user, GINT_TO_POINTER (edit_level));
+	       break;
        }
 
 }
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index d694a4a6fe..ef221c4288 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -909,12 +909,12 @@ e_meeting_time_selector_draw_key_color (GtkWidget *darea, cairo_t *cr, GdkColor
 	if (color) {
 		gdk_cairo_set_source_color (cr, color);
 	} else {
-                cairo_set_source (cr, mts->no_info_pattern);
+		cairo_set_source (cr, mts->no_info_pattern);
 	}
-        cairo_rectangle (cr,
-                         1, 1,
-                         allocation.width - 2, allocation.height - 2);
-        cairo_fill (cr);
+	cairo_rectangle (cr,
+			 1, 1,
+			 allocation.width - 2, allocation.height - 2);
+	cairo_fill (cr);
 
 	return TRUE;
 }
@@ -1032,35 +1032,35 @@ e_meeting_time_selector_set_week_start_day (EMeetingTimeSelector *mts,
 static cairo_pattern_t *
 e_meeting_time_selector_create_no_info_pattern (EMeetingTimeSelector *mts)
 {
-        cairo_surface_t *surface;
-        cairo_pattern_t *pattern;
-        GdkColor color;
-        cairo_t *cr;
+	cairo_surface_t *surface;
+	cairo_pattern_t *pattern;
+	GdkColor color;
+	cairo_t *cr;
 
-        surface = gdk_window_create_similar_surface (gtk_widget_get_window (GTK_WIDGET (mts)),
-                                                     CAIRO_CONTENT_COLOR, 8, 8);
-        cr = cairo_create (surface);
+	surface = gdk_window_create_similar_surface (gtk_widget_get_window (GTK_WIDGET (mts)),
+						     CAIRO_CONTENT_COLOR, 8, 8);
+	cr = cairo_create (surface);
 
         gdk_color_parse ("white", &color);
-        gdk_cairo_set_source_color (cr, &color);
-        cairo_paint (cr);
+	gdk_cairo_set_source_color (cr, &color);
+	cairo_paint (cr);
 
-        gdk_cairo_set_source_color (cr, &mts->grid_color);
-        cairo_set_line_width (cr, 1.0);
-        cairo_move_to (cr, -1,  5);
-        cairo_line_to (cr,  9, -5);
-        cairo_move_to (cr, -1, 13);
-        cairo_line_to (cr,  9,  3);
-        cairo_stroke (cr);
+	gdk_cairo_set_source_color (cr, &mts->grid_color);
+	cairo_set_line_width (cr, 1.0);
+	cairo_move_to (cr, -1,  5);
+	cairo_line_to (cr,  9, -5);
+	cairo_move_to (cr, -1, 13);
+	cairo_line_to (cr,  9,  3);
+	cairo_stroke (cr);
 
-        cairo_destroy (cr);
+	cairo_destroy (cr);
 
-        pattern = cairo_pattern_create_for_surface (surface);
-        cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
+	pattern = cairo_pattern_create_for_surface (surface);
+	cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
 
-        cairo_surface_destroy (surface);
+	cairo_surface_destroy (surface);
 
-        return pattern;
+	return pattern;
 }
 
 static void
@@ -1075,7 +1075,7 @@ e_meeting_time_selector_realize (GtkWidget *widget)
 	mts = E_MEETING_TIME_SELECTOR (widget);
 
 	window = gtk_widget_get_window (widget);
-        mts->no_info_pattern = e_meeting_time_selector_create_no_info_pattern (mts);
+	mts->no_info_pattern = e_meeting_time_selector_create_no_info_pattern (mts);
 }
 
 static void
@@ -1085,8 +1085,8 @@ e_meeting_time_selector_unrealize (GtkWidget *widget)
 
 	mts = E_MEETING_TIME_SELECTOR (widget);
 
-        cairo_pattern_destroy (mts->no_info_pattern);
-        mts->no_info_pattern = NULL;
+	cairo_pattern_destroy (mts->no_info_pattern);
+	mts->no_info_pattern = NULL;
 
 	if (GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->unrealize)
 		(*GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->unrealize)(widget);
diff --git a/calendar/gui/e-select-names-renderer.c b/calendar/gui/e-select-names-renderer.c
index 6f16d7b2e4..632ff89c91 100644
--- a/calendar/gui/e-select-names-renderer.c
+++ b/calendar/gui/e-select-names-renderer.c
@@ -126,7 +126,7 @@ e_select_names_renderer_start_editing (GtkCellRenderer *cell, GdkEvent *event, G
 	g_signal_connect (editable, "editing_done", G_CALLBACK (e_select_names_renderer_editing_done), sn_cell);
 
 	/* Removed focus-out-event. focus out event already listen by base class.
-           We don't need to listen for the focus out event any more */
+	   We don't need to listen for the focus out event any more */
 
 	sn_cell->priv->editable = g_object_ref (editable);
 	sn_cell->priv->path = g_strdup (path);
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index 57f859b7df..84615760c3 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -301,7 +301,7 @@ week_view_draw_time (EWeekView *week_view,
 	PangoLayout *layout;
 	PangoFontDescription *small_font_desc;
 
-        cairo_save (cr);
+	cairo_save (cr);
 
 	model = e_calendar_view_get_model (E_CALENDAR_VIEW (week_view));
 
@@ -326,16 +326,16 @@ week_view_draw_time (EWeekView *week_view,
 		/* Draw the hour. */
 		if (hour_to_display < 10) {
 			pango_layout_set_text (layout, buffer + 1, 1);
-                        cairo_move_to (cr,
-                                       time_x + week_view->digit_width,
-                                       time_y_normal_font);
-                        pango_cairo_show_layout (cr, layout);
+			cairo_move_to (cr,
+				       time_x + week_view->digit_width,
+				       time_y_normal_font);
+			pango_cairo_show_layout (cr, layout);
 		} else {
 			pango_layout_set_text (layout, buffer, 2);
-                        cairo_move_to (cr,
-                                       time_x,
-                                       time_y_normal_font);
-                        pango_cairo_show_layout (cr, layout);
+			cairo_move_to (cr,
+				       time_x,
+				       time_y_normal_font);
+			pango_cairo_show_layout (cr, layout);
 		}
 
 		time_x += week_view->digit_width * 2;
@@ -343,10 +343,10 @@ week_view_draw_time (EWeekView *week_view,
 		/* Draw the start minute, in the small font. */
 		pango_layout_set_font_description (layout, week_view->small_font_desc);
 		pango_layout_set_text (layout, buffer + 3, 2);
-                cairo_move_to (cr,
-                               time_x,
-                               time_y_small_font);
-                pango_cairo_show_layout (cr, layout);
+		cairo_move_to (cr,
+			       time_x,
+			       time_y_small_font);
+		pango_cairo_show_layout (cr, layout);
 
 		pango_layout_set_font_description (layout, style->font_desc);
 
@@ -356,10 +356,10 @@ week_view_draw_time (EWeekView *week_view,
 		if (!e_cal_model_get_use_24_hour_format (model)) {
 			pango_layout_set_text (layout, suffix, -1);
 
-                        cairo_move_to (cr,
-                                       time_x,
-                                       time_y_normal_font);
-                        pango_cairo_show_layout (cr, layout);
+			cairo_move_to (cr,
+				       time_x,
+				       time_y_normal_font);
+			pango_cairo_show_layout (cr, layout);
 		}
 	} else {
 		/* Draw the start time in one go. */
@@ -367,22 +367,22 @@ week_view_draw_time (EWeekView *week_view,
 			    hour_to_display, minute, suffix);
 		if (hour_to_display < 10) {
 			pango_layout_set_text (layout, buffer + 1, -1);
-                        cairo_move_to (cr,
-                                       time_x + week_view->digit_width,
-                                       time_y_normal_font);
-                        pango_cairo_show_layout (cr, layout);
+			cairo_move_to (cr,
+				       time_x + week_view->digit_width,
+				       time_y_normal_font);
+			pango_cairo_show_layout (cr, layout);
 		} else {
 			pango_layout_set_text (layout, buffer, -1);
-                        cairo_move_to (cr,
-                                       time_x,
-                                       time_y_normal_font);
-                        pango_cairo_show_layout (cr, layout);
+			cairo_move_to (cr,
+				       time_x,
+				       time_y_normal_font);
+			pango_cairo_show_layout (cr, layout);
 		}
 
 	}
 	g_object_unref (layout);
 
-        cairo_restore (cr);
+	cairo_restore (cr);
 }
 
 static void
@@ -1017,20 +1017,20 @@ week_view_event_item_draw (GnomeCanvasItem *canvas_item,
 				+ E_WEEK_VIEW_EVENT_BORDER_WIDTH
 				+ E_WEEK_VIEW_EVENT_EDGE_X_PAD;
 
-                        cairo_save (cr);
+			cairo_save (cr);
 
-                        cairo_rectangle (cr,
-                                         x1, y1,
+			cairo_rectangle (cr,
+					 x1, y1,
 					 x2 - x1 - E_WEEK_VIEW_EVENT_R_PAD
 					  - E_WEEK_VIEW_EVENT_BORDER_WIDTH + 1,
 					 y2 - y1 + 1);
-                        cairo_clip (cr);
+			cairo_clip (cr);
 
 			week_view_draw_time (
 				week_view, cr, time_x,
 				time_y, start_hour, start_minute);
 
-                        cairo_restore (cr);
+			cairo_restore (cr);
 
 			/* We don't want the end time to be drawn over the
 			   start time, so we increase the minimum position. */
diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c
index 7ea7b1ffdc..fab2007954 100644
--- a/calendar/gui/e-week-view-titles-item.c
+++ b/calendar/gui/e-week-view-titles-item.c
@@ -136,7 +136,7 @@ week_view_titles_item_draw (GnomeCanvasItem *canvas_item,
 	g_return_if_fail (week_view != NULL);
 
 	cairo_save (cr);
-        cairo_set_line_width (cr, 1.0);
+	cairo_set_line_width (cr, 1.0);
 
 	gtk_widget_get_allocation (
 		GTK_WIDGET (canvas_item->canvas), &allocation);
@@ -145,16 +145,16 @@ week_view_titles_item_draw (GnomeCanvasItem *canvas_item,
 	layout = gtk_widget_create_pango_layout (GTK_WIDGET (week_view), NULL);
 
 	/* Draw the shadow around the dates. */
-        gdk_cairo_set_source_color (cr, &style->light[GTK_STATE_NORMAL]);
-        cairo_move_to (cr, 1.5 - x, 1.5 - y);
-        cairo_rel_line_to (cr, allocation.width - 1, 0);
-        cairo_move_to (cr, 1.5 - x, 2.5 - y);
-        cairo_rel_line_to (cr, 0, allocation.height - 1);
-        cairo_stroke (cr);
+	gdk_cairo_set_source_color (cr, &style->light[GTK_STATE_NORMAL]);
+	cairo_move_to (cr, 1.5 - x, 1.5 - y);
+	cairo_rel_line_to (cr, allocation.width - 1, 0);
+	cairo_move_to (cr, 1.5 - x, 2.5 - y);
+	cairo_rel_line_to (cr, 0, allocation.height - 1);
+	cairo_stroke (cr);
 
-        gdk_cairo_set_source_color (cr, &style->dark[GTK_STATE_NORMAL]);
-        cairo_rectangle (cr, 0.5 - x, 0.5 - y, allocation.width - 1, allocation.height);
-        cairo_stroke (cr);
+	gdk_cairo_set_source_color (cr, &style->dark[GTK_STATE_NORMAL]);
+	cairo_rectangle (cr, 0.5 - x, 0.5 - y, allocation.width - 1, allocation.height);
+	cairo_stroke (cr);
 
 	/* Determine the format to use. */
 	col_width = allocation.width / week_view->columns;
@@ -178,12 +178,12 @@ week_view_titles_item_draw (GnomeCanvasItem *canvas_item,
 				buffer, sizeof (buffer), "%s",
 				e_get_weekday_name (weekday + 1, abbreviated));
 
-                cairo_save (cr);
+		cairo_save (cr);
 
-                cairo_rectangle (cr,
-                                 week_view->col_offsets[col] - x, 2 - y,
-                                 week_view->col_widths[col], allocation.height - 2);
-                cairo_clip (cr);
+		cairo_rectangle (cr,
+				 week_view->col_offsets[col] - x, 2 - y,
+				 week_view->col_widths[col], allocation.height - 2);
+		cairo_clip (cr);
 
 		if (weekday == 5 && week_view->compress_weekend)
 			date_width = week_view->abbr_day_widths[5]
@@ -199,29 +199,29 @@ week_view_titles_item_draw (GnomeCanvasItem *canvas_item,
 		date_x = MAX (date_x, week_view->col_offsets[col]);
 
 		pango_layout_set_text (layout, buffer, -1);
-                cairo_move_to (cr, date_x - x, 3 - y);
+		cairo_move_to (cr, date_x - x, 3 - y);
 		pango_cairo_show_layout (cr, layout);
 
-                cairo_restore (cr);
+		cairo_restore (cr);
 
 		/* Draw the lines down the left and right of the date cols. */
 		if (col != 0) {
-                        gdk_cairo_set_source_color (cr, &style->light[GTK_STATE_NORMAL]);
-                        cairo_move_to (cr, week_view->col_offsets[col] - x + 0.5, 4.5 - y);
-                        cairo_rel_line_to (cr, 0, allocation.height - 8);
-                        cairo_stroke (cr);
-
-                        gdk_cairo_set_source_color (cr, &style->dark[GTK_STATE_NORMAL]);
-                        cairo_move_to (cr, week_view->col_offsets[col] - x - 0.5, 4.5 - y);
-                        cairo_rel_line_to (cr, 0, allocation.height - 8);
-                        cairo_stroke (cr);
+			gdk_cairo_set_source_color (cr, &style->light[GTK_STATE_NORMAL]);
+			cairo_move_to (cr, week_view->col_offsets[col] - x + 0.5, 4.5 - y);
+			cairo_rel_line_to (cr, 0, allocation.height - 8);
+			cairo_stroke (cr);
+
+			gdk_cairo_set_source_color (cr, &style->dark[GTK_STATE_NORMAL]);
+			cairo_move_to (cr, week_view->col_offsets[col] - x - 0.5, 4.5 - y);
+			cairo_rel_line_to (cr, 0, allocation.height - 8);
+			cairo_stroke (cr);
 		}
 
 		/* Draw the lines between each column. */
 		if (col != 0) {
-                        cairo_set_source_rgb (cr, 0, 0, 0);
-                        cairo_rectangle (cr, week_view->col_offsets[col] - x, allocation.height - y, 1, 1);
-                        cairo_fill (cr);
+			cairo_set_source_rgb (cr, 0, 0, 0);
+			cairo_rectangle (cr, week_view->col_offsets[col] - x, allocation.height - y, 1, 1);
+			cairo_fill (cr);
 		}
 
 		if (weekday == 5 && week_view->compress_weekend)
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 6497ec7694..560ed09343 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -4429,18 +4429,18 @@ static gint
 e_week_view_get_adjust_days_for_move_up (EWeekView *week_view,gint current_day)
 {
        if (week_view->multi_week_view)
-               return -7;
+	       return -7;
        else
-               return 0;
+	       return 0;
 }
 
 static gint
 e_week_view_get_adjust_days_for_move_down (EWeekView *week_view,gint current_day)
 {
        if (week_view->multi_week_view)
-               return 7;
+	       return 7;
        else
-               return 0;
+	       return 0;
 }
 
 static gint
diff --git a/calendar/gui/ea-cal-view-event.c b/calendar/gui/ea-cal-view-event.c
index 229d3822d5..b3d35c90a6 100644
--- a/calendar/gui/ea-cal-view-event.c
+++ b/calendar/gui/ea-cal-view-event.c
@@ -96,11 +96,11 @@ ea_cal_view_event_get_type (void)
 			NULL
 		};
 
-                static const GInterfaceInfo atk_action_info = {
-                        (GInterfaceInitFunc) atk_action_interface_init,
-                        (GInterfaceFinalizeFunc) NULL,
-                        NULL
-                };
+		static const GInterfaceInfo atk_action_info = {
+			(GInterfaceInitFunc) atk_action_interface_init,
+			(GInterfaceFinalizeFunc) NULL,
+			NULL
+		};
 
 		/*
 		 * Figure out the size of the class and instance
@@ -120,8 +120,8 @@ ea_cal_view_event_get_type (void)
 					       "EaCalViewEvent", &tinfo, 0);
 		g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
 					     &atk_component_info);
-                g_type_add_interface_static (type, ATK_TYPE_ACTION,
-                                             &atk_action_info);
+		g_type_add_interface_static (type, ATK_TYPE_ACTION,
+					     &atk_action_info);
 
 	}
 
@@ -152,13 +152,13 @@ ea_cal_view_event_class_init (EaCalViewEventClass *klass)
 static void
 ea_cal_view_event_init (EaCalViewEvent *a11y)
 {
-        a11y->state_set = atk_state_set_new ();
-        atk_state_set_add_state (a11y->state_set, ATK_STATE_TRANSIENT);
-        atk_state_set_add_state (a11y->state_set, ATK_STATE_ENABLED);
-        atk_state_set_add_state (a11y->state_set, ATK_STATE_SENSITIVE);
-        atk_state_set_add_state (a11y->state_set, ATK_STATE_SELECTABLE);
-        atk_state_set_add_state (a11y->state_set, ATK_STATE_SHOWING);
-        atk_state_set_add_state (a11y->state_set, ATK_STATE_FOCUSABLE);
+	a11y->state_set = atk_state_set_new ();
+	atk_state_set_add_state (a11y->state_set, ATK_STATE_TRANSIENT);
+	atk_state_set_add_state (a11y->state_set, ATK_STATE_ENABLED);
+	atk_state_set_add_state (a11y->state_set, ATK_STATE_SENSITIVE);
+	atk_state_set_add_state (a11y->state_set, ATK_STATE_SELECTABLE);
+	atk_state_set_add_state (a11y->state_set, ATK_STATE_SHOWING);
+	atk_state_set_add_state (a11y->state_set, ATK_STATE_FOCUSABLE);
 }
 
 #ifdef ACC_DEBUG
@@ -246,15 +246,15 @@ ea_cal_view_event_new (GObject *obj)
 static void
 ea_cal_view_event_dispose (GObject *object)
 {
-        EaCalViewEvent *a11y = EA_CAL_VIEW_EVENT (object);
+	EaCalViewEvent *a11y = EA_CAL_VIEW_EVENT (object);
 
-        if (a11y->state_set) {
-                g_object_unref (a11y->state_set);
-                a11y->state_set = NULL;
-        }
+	if (a11y->state_set) {
+		g_object_unref (a11y->state_set);
+		a11y->state_set = NULL;
+	}
 
-        if (G_OBJECT_CLASS (parent_class)->dispose)
-                G_OBJECT_CLASS (parent_class)->dispose (object);
+	if (G_OBJECT_CLASS (parent_class)->dispose)
+		G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static G_CONST_RETURN gchar *
@@ -268,7 +268,7 @@ ea_cal_view_event_get_name (AtkObject *accessible)
 	const gchar *recur_string;
 	const gchar *meeting_string;
 	gchar *summary_string;
-        const gchar *summary;
+	const gchar *summary;
 
 	g_return_val_if_fail (EA_IS_CAL_VIEW_EVENT (accessible), NULL);
 
@@ -421,13 +421,13 @@ ea_cal_view_event_get_index_in_parent (AtkObject *accessible)
 static AtkStateSet *
 ea_cal_view_event_ref_state_set (AtkObject *accessible)
 {
-        EaCalViewEvent *atk_event = EA_CAL_VIEW_EVENT (accessible);
+	EaCalViewEvent *atk_event = EA_CAL_VIEW_EVENT (accessible);
 
-        g_return_val_if_fail (atk_event->state_set, NULL);
+	g_return_val_if_fail (atk_event->state_set, NULL);
 
-        g_object_ref (atk_event->state_set);
+	g_object_ref (atk_event->state_set);
 
-        return atk_event->state_set;
+	return atk_event->state_set;
 }
 
 /* Atk Component Interface */
@@ -554,41 +554,41 @@ static const gchar * action_name[CAL_VIEW_EVENT_ACTION_NUM] = {
 static void
 atk_action_interface_init (AtkActionIface *iface)
 {
-        g_return_if_fail (iface != NULL);
+	g_return_if_fail (iface != NULL);
 
-        iface->do_action = ea_cal_view_event_do_action;
-        iface->get_n_actions = ea_cal_view_event_get_n_actions;
-        iface->get_name = ea_cal_view_event_action_get_name;
+	iface->do_action = ea_cal_view_event_do_action;
+	iface->get_n_actions = ea_cal_view_event_get_n_actions;
+	iface->get_name = ea_cal_view_event_action_get_name;
 }
 
 static gboolean
 ea_cal_view_event_do_action (AtkAction *action, gint i)
 {
-        AtkGObjectAccessible *atk_gobj;
-        AtkComponent *atk_comp;
+	AtkGObjectAccessible *atk_gobj;
+	AtkComponent *atk_comp;
 
-        atk_gobj = ATK_GOBJECT_ACCESSIBLE (action);
+	atk_gobj = ATK_GOBJECT_ACCESSIBLE (action);
 
-        if (i == 0) {
-                atk_comp = (AtkComponent *)atk_gobj;
-                return atk_component_grab_focus (atk_comp);
-        }
+	if (i == 0) {
+		atk_comp = (AtkComponent *)atk_gobj;
+		return atk_component_grab_focus (atk_comp);
+	}
 
-        return FALSE;
+	return FALSE;
 
 }
 
 static gint
 ea_cal_view_event_get_n_actions (AtkAction *action)
 {
-        return CAL_VIEW_EVENT_ACTION_NUM;
+	return CAL_VIEW_EVENT_ACTION_NUM;
 }
 
 static G_CONST_RETURN gchar *
 ea_cal_view_event_action_get_name (AtkAction *action, gint i)
 {
-        if (i >= 0 && i < CAL_VIEW_EVENT_ACTION_NUM)
-                return action_name[i];
-        return NULL;
+	if (i >= 0 && i < CAL_VIEW_EVENT_ACTION_NUM)
+		return action_name[i];
+	return NULL;
 }
 
diff --git a/calendar/gui/ea-cal-view.c b/calendar/gui/ea-cal-view.c
index 1be3b3dd77..71b1c52be0 100644
--- a/calendar/gui/ea-cal-view.c
+++ b/calendar/gui/ea-cal-view.c
@@ -142,7 +142,7 @@ ea_cal_view_real_initialize (AtkObject *accessible, gpointer data)
 	g_return_if_fail (EA_IS_CAL_VIEW (accessible));
 	g_return_if_fail (E_IS_CALENDAR_VIEW (data));
 
-        ATK_OBJECT_CLASS (parent_class)->initialize (accessible, data);
+	ATK_OBJECT_CLASS (parent_class)->initialize (accessible, data);
 	if (role == ATK_ROLE_INVALID)
 		role = atk_role_register ("Calendar View");
 	accessible->role = role;
diff --git a/calendar/gui/ea-calendar-helpers.c b/calendar/gui/ea-calendar-helpers.c
index be8565414a..b9c6c2415f 100644
--- a/calendar/gui/ea-calendar-helpers.c
+++ b/calendar/gui/ea-calendar-helpers.c
@@ -52,15 +52,15 @@ ea_calendar_helpers_get_accessible_for (GnomeCanvasItem *canvas_item)
 	 */
 	atk_obj = g_object_get_data (g_obj, "accessible-object");
 	if (!atk_obj) {
-                if (E_IS_TEXT (canvas_item)) {
+		if (E_IS_TEXT (canvas_item)) {
 		atk_obj = ea_cal_view_event_new (g_obj);
-                }
-                else if (GNOME_IS_CANVAS_PIXBUF (canvas_item)) {
-                        atk_obj = ea_jump_button_new (g_obj);
-                }
-                else
-                        return NULL;
-        }
+		}
+		else if (GNOME_IS_CANVAS_PIXBUF (canvas_item)) {
+			atk_obj = ea_jump_button_new (g_obj);
+		}
+		else
+			return NULL;
+	}
 	return atk_obj;
 }
 
diff --git a/calendar/gui/ea-calendar.c b/calendar/gui/ea-calendar.c
index 59158b3275..44b63a9c0b 100644
--- a/calendar/gui/ea-calendar.c
+++ b/calendar/gui/ea-calendar.c
@@ -73,8 +73,8 @@ gnome_calendar_a11y_init (void)
 					    0, ea_calendar_focus_watcher,
 					    NULL, (GDestroyNotify) NULL);
 		g_signal_add_emission_hook (g_signal_lookup ("event", GNOME_TYPE_CANVAS_PIXBUF),
-                                            0, ea_calendar_focus_watcher,
-                                            NULL, (GDestroyNotify) NULL);
+					    0, ea_calendar_focus_watcher,
+					    NULL, (GDestroyNotify) NULL);
 		g_signal_add_emission_hook (g_signal_lookup ("event-after",
 							     e_day_view_get_type ()),
 					    0, ea_calendar_focus_watcher,
@@ -133,7 +133,7 @@ ea_calendar_focus_watcher (GSignalInvocationHint *ihint,
 {
 	GObject *object;
 	GdkEvent *event;
-        AtkObject *ea_event = NULL;
+	AtkObject *ea_event = NULL;
 
 	object = g_value_get_object (param_values + 0);
 	event = g_value_get_boxed (param_values + 1);
diff --git a/calendar/gui/ea-day-view-cell.c b/calendar/gui/ea-day-view-cell.c
index 84f0c4d115..6a8489f47d 100644
--- a/calendar/gui/ea-day-view-cell.c
+++ b/calendar/gui/ea-day-view-cell.c
@@ -363,35 +363,35 @@ component_interface_get_extents (AtkComponent *component,
 static gboolean
 component_interface_grab_focus (AtkComponent *comp)
 {
-        GObject *g_obj;
-        EDayViewCell *cell;
-        EDayView *day_view;
-        GtkWidget *toplevel;
+	GObject *g_obj;
+	EDayViewCell *cell;
+	EDayView *day_view;
+	GtkWidget *toplevel;
 
-        g_return_val_if_fail (EA_IS_DAY_VIEW_CELL (comp), FALSE);
+	g_return_val_if_fail (EA_IS_DAY_VIEW_CELL (comp), FALSE);
 
-        g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (comp));
-        if (!g_obj)
-                return FALSE;
+	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (comp));
+	if (!g_obj)
+		return FALSE;
 
-        cell = E_DAY_VIEW_CELL (g_obj);
-        day_view = cell->day_view;
+	cell = E_DAY_VIEW_CELL (g_obj);
+	day_view = cell->day_view;
 
-        day_view->selection_start_day = cell->column;
-        day_view->selection_end_day = cell->column;
-        day_view->selection_start_row = cell->row;
-        day_view->selection_end_row = cell->row;
+	day_view->selection_start_day = cell->column;
+	day_view->selection_end_day = cell->column;
+	day_view->selection_start_row = cell->row;
+	day_view->selection_end_row = cell->row;
 
-        e_day_view_ensure_rows_visible (day_view,
-                        day_view->selection_start_row,
-                        day_view->selection_end_row);
-        e_day_view_update_calendar_selection_time (day_view);
-        gtk_widget_queue_draw (day_view->main_canvas);
+	e_day_view_ensure_rows_visible (day_view,
+			day_view->selection_start_row,
+			day_view->selection_end_row);
+	e_day_view_update_calendar_selection_time (day_view);
+	gtk_widget_queue_draw (day_view->main_canvas);
 
-        toplevel = gtk_widget_get_toplevel (GTK_WIDGET (day_view));
-        if (gtk_widget_is_toplevel (toplevel))
-                gtk_window_present (GTK_WINDOW (toplevel));
+	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (day_view));
+	if (gtk_widget_is_toplevel (toplevel))
+		gtk_window_present (GTK_WINDOW (toplevel));
 
-        return TRUE;
+	return TRUE;
 }
 
diff --git a/calendar/gui/ea-day-view-main-item.c b/calendar/gui/ea-day-view-main-item.c
index 7d95e8f4b3..4d36044b5e 100644
--- a/calendar/gui/ea-day-view-main-item.c
+++ b/calendar/gui/ea-day-view-main-item.c
@@ -460,8 +460,8 @@ ea_day_view_main_item_time_change_cb (EDayView *day_view, gpointer data)
 			       item_cell);
 		g_signal_emit_by_name (data, "selection_changed");
 
-                atk_focus_tracker_notify (item_cell);
-                g_object_unref (item_cell);
+		atk_focus_tracker_notify (item_cell);
+		g_object_unref (item_cell);
 	}
 
 }
diff --git a/calendar/gui/ea-week-view-cell.c b/calendar/gui/ea-week-view-cell.c
index 32f5fb1f75..ff77e60f07 100644
--- a/calendar/gui/ea-week-view-cell.c
+++ b/calendar/gui/ea-week-view-cell.c
@@ -188,7 +188,7 @@ ea_week_view_cell_new (GObject *obj)
 #ifdef ACC_DEBUG
 static void ea_week_view_cell_finalize (GObject *object)
 {
-        G_OBJECT_CLASS (parent_class)->finalize (object);
+	G_OBJECT_CLASS (parent_class)->finalize (object);
 
 	++n_ea_week_view_cell_destroyed;
 	printf ("ACC_DEBUG: n_ea_week_view_cell_destroyed = %d\n",
@@ -210,8 +210,8 @@ ea_week_view_cell_get_name (AtkObject *accessible)
 		GnomeCanvasItem *main_item;
 		gchar *new_name;
 		const gchar *row_label, *column_label;
-                gint new_column, new_row;
-                gint start_day;
+		gint new_column, new_row;
+		gint start_day;
 
 		atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
 		g_obj = atk_gobject_accessible_get_object (atk_gobj);
@@ -222,14 +222,14 @@ ea_week_view_cell_get_name (AtkObject *accessible)
 		main_item = cell->week_view->main_canvas_item;
 		ea_main_item = atk_gobject_accessible_for_object (G_OBJECT (main_item));
 
-                start_day = cell->week_view->display_start_day;
-                if (cell->column + start_day >= 7) {
-                        new_column = cell->column + start_day - 7;
-                        new_row = cell->row + 1;
-                } else {
-                        new_column = cell->column + start_day;
-                        new_row = cell->row;
-                }
+		start_day = cell->week_view->display_start_day;
+		if (cell->column + start_day >= 7) {
+			new_column = cell->column + start_day - 7;
+			new_row = cell->row + 1;
+		} else {
+			new_column = cell->column + start_day;
+			new_row = cell->row;
+		}
 
 		column_label = atk_table_get_column_description (ATK_TABLE (ea_main_item),
 								 new_column);
@@ -327,7 +327,7 @@ atk_component_interface_init (AtkComponentIface *iface)
 	g_return_if_fail (iface != NULL);
 
 	iface->get_extents = component_interface_get_extents;
-        iface->grab_focus = component_interface_grab_focus;
+	iface->grab_focus = component_interface_grab_focus;
 }
 
 static void
@@ -342,7 +342,7 @@ component_interface_get_extents (AtkComponent *component,
 	GtkWidget *main_canvas;
 	gint week_view_width, week_view_height;
 	gint scroll_x, scroll_y;
-        gint start_day;
+	gint start_day;
 
 	*x = *y = *width = *height = 0;
 
@@ -364,114 +364,114 @@ component_interface_get_extents (AtkComponent *component,
 				   coord_type);
 	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (week_view->main_canvas),
 					 &scroll_x, &scroll_y);
-        start_day = week_view->display_start_day;
-        if (week_view->multi_week_view) {
-                if (week_view->compress_weekend && (cell->column == (5 - start_day))) {
+	start_day = week_view->display_start_day;
+	if (week_view->multi_week_view) {
+		if (week_view->compress_weekend && (cell->column == (5 - start_day))) {
                         *height = week_view->row_heights[cell->row*2];
 			*width = week_view->col_widths[cell->column];
 			*x += week_view->col_offsets[cell->column] - scroll_x;
 			*y += week_view->row_offsets[cell->row*2]- scroll_y;
-                } else if (week_view->compress_weekend && (cell->column == (6 - start_day))) {
+		} else if (week_view->compress_weekend && (cell->column == (6 - start_day))) {
                         *height = week_view->row_heights[cell->row*2];
                         *width = week_view->col_widths[cell->column - 1];
                         *x += week_view->col_offsets[cell->column - 1]- scroll_x;
                         *y += week_view->row_offsets[cell->row*2 + 1]- scroll_y;
-                } else if (week_view->compress_weekend && (cell->column > (6 - start_day))) {
+		} else if (week_view->compress_weekend && (cell->column > (6 - start_day))) {
                         *height = week_view->row_heights[cell->row*2]*2;
                         *width = week_view->col_widths[cell->column - 1];
                         *x += week_view->col_offsets[cell->column - 1] - scroll_x;
                         *y += week_view->row_offsets[cell->row*2]- scroll_y;
-                } else {
+		} else {
 			*height = week_view->row_heights[cell->row*2]*2;
                         *width = week_view->col_widths[cell->column];
 			*x += week_view->col_offsets[cell->column] - scroll_x;
 			*y += week_view->row_offsets[cell->row*2]- scroll_y;
-                }
-        } else {
-                if (start_day < 3) {
-                        if (cell->column < 3) {
+		}
+	} else {
+		if (start_day < 3) {
+			if (cell->column < 3) {
                                 *height = week_view->row_heights[cell->column*2]*2;
                                 *width = week_view->col_widths[0];
                                 *x += week_view->col_offsets[0] - scroll_x;
                                 *y += week_view->row_offsets[cell->column*2]- scroll_y;
-                        } else {
-                                if (cell->column == 5 - start_day) {
+			} else {
+				if (cell->column == 5 - start_day) {
                                         *height = week_view->row_heights[(cell->column - 3)*2];
                                         *width = week_view->col_widths[1];
                                         *x += week_view->col_offsets[1] - scroll_x;
                                         *y += week_view->row_offsets[(cell->column - 3)*2]- scroll_y;
-                                } else if (cell->column == 6 - start_day) {
+				} else if (cell->column == 6 - start_day) {
                                         *height = week_view->row_heights[(cell->column - 4)*2];
                                         *width = week_view->col_widths[1];
                                         *x += week_view->col_offsets[1] - scroll_x;
                                         *y += week_view->row_offsets[(cell->column - 3)*2 - 1]- scroll_y;
-                                } else if (cell->column > 6 - start_day) {
+				} else if (cell->column > 6 - start_day) {
                                         *height = week_view->row_heights[(cell->column - 4)*2]*2;
                                         *width = week_view->col_widths[1];
                                         *x += week_view->col_offsets[1] - scroll_x;
                                         *y += week_view->row_offsets[(cell->column - 4)*2]- scroll_y;
-                                } else {
+				} else {
                                         *height = week_view->row_heights[(cell->column - 3)*2]*2;
                                         *width = week_view->col_widths[1];
                                         *x += week_view->col_offsets[1] - scroll_x;
                                         *y += week_view->row_offsets[(cell->column - 3)*2]- scroll_y;
-                                }
-                        }
-                } else if (cell->column < 4) {
-                        if (cell->column == 5 - start_day) {
+				}
+			}
+		} else if (cell->column < 4) {
+			if (cell->column == 5 - start_day) {
                                 *height = week_view->row_heights[cell->column*2];
                                 *width = week_view->col_widths[0];
                                 *x += week_view->col_offsets[0] - scroll_x;
                                 *y += week_view->row_offsets[cell->column*2]- scroll_y;
-                        } else if (cell->column == 6 - start_day) {
+			} else if (cell->column == 6 - start_day) {
                                 *height = week_view->row_heights[(cell->column - 1)*2];
                                 *width = week_view->col_widths[0];
                                 *x += week_view->col_offsets[0] - scroll_x;
                                 *y += week_view->row_offsets[cell->column*2 - 1]- scroll_y;
-                        } else if (cell->column > 6 - start_day) {
+			} else if (cell->column > 6 - start_day) {
                                 *height = week_view->row_heights[(cell->column - 1)*2]*2;
                                 *width = week_view->col_widths[0];
                                 *x += week_view->col_offsets[0] - scroll_x;
                                 *y += week_view->row_offsets[(cell->column - 1)*2]- scroll_y;
-                        } else {
+			} else {
                                 *height = week_view->row_heights[(cell->column)*2]*2;
                                 *width = week_view->col_widths[0];
                                 *x += week_view->col_offsets[0] - scroll_x;
                                 *y += week_view->row_offsets[cell->column*2]- scroll_y;
-                        }
-                } else {
+			}
+		} else {
                         *height = week_view->row_heights[(cell->column - 4)*2]*2;
                         *width = week_view->col_widths[1];
                         *x += week_view->col_offsets[1] - scroll_x;
                         *y += week_view->row_offsets[(cell->column - 4)*2]- scroll_y;
-                }
-        }
+		}
+	}
 }
 
 static gboolean
 component_interface_grab_focus (AtkComponent *comp)
 {
-        GObject *g_obj;
-        EWeekViewCell *cell;
-        EWeekView *week_view;
-        GtkWidget *toplevel;
+	GObject *g_obj;
+	EWeekViewCell *cell;
+	EWeekView *week_view;
+	GtkWidget *toplevel;
 
-        g_return_val_if_fail (EA_IS_WEEK_VIEW_CELL (comp), FALSE);
+	g_return_val_if_fail (EA_IS_WEEK_VIEW_CELL (comp), FALSE);
 
-        g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (comp));
-        if (!g_obj)
-                return FALSE;
+	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (comp));
+	if (!g_obj)
+		return FALSE;
 
-        cell = E_WEEK_VIEW_CELL (g_obj);
-        week_view = cell->week_view;
+	cell = E_WEEK_VIEW_CELL (g_obj);
+	week_view = cell->week_view;
 
-        week_view->selection_start_day = cell->row * 7 + cell->column;
-        week_view->selection_end_day = cell->row * 7 + cell->column;
-        gtk_widget_queue_draw (week_view->main_canvas);
+	week_view->selection_start_day = cell->row * 7 + cell->column;
+	week_view->selection_end_day = cell->row * 7 + cell->column;
+	gtk_widget_queue_draw (week_view->main_canvas);
 
-        toplevel = gtk_widget_get_toplevel (GTK_WIDGET (week_view));
-        if (gtk_widget_is_toplevel (toplevel))
-                gtk_window_present (GTK_WINDOW (toplevel));
+	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (week_view));
+	if (gtk_widget_is_toplevel (toplevel))
+		gtk_window_present (GTK_WINDOW (toplevel));
 
-        return TRUE;
+	return TRUE;
 }
diff --git a/calendar/gui/ea-week-view-main-item.c b/calendar/gui/ea-week-view-main-item.c
index 84a4ea1191..433d1aa30d 100644
--- a/calendar/gui/ea-week-view-main-item.c
+++ b/calendar/gui/ea-week-view-main-item.c
@@ -278,7 +278,7 @@ ea_week_view_main_item_new (GObject *obj)
 					       NULL));
 
 	atk_object_initialize (accessible, obj);
-        accessible->role = ATK_ROLE_TABLE;
+	accessible->role = ATK_ROLE_TABLE;
 
 #ifdef ACC_DEBUG
 	++n_ea_week_view_main_item_created;
@@ -494,8 +494,8 @@ ea_week_view_main_item_time_change_cb (EWeekView *week_view, gpointer data)
 			       "active-descendant-changed",
 			       item_cell);
 		g_signal_emit_by_name (data, "selection_changed");
-                atk_focus_tracker_notify (item_cell);
-                g_object_unref (item_cell);
+		atk_focus_tracker_notify (item_cell);
+		g_object_unref (item_cell);
 	}
 }
 
diff --git a/calendar/gui/ea-week-view.c b/calendar/gui/ea-week-view.c
index f922985819..456327bd39 100644
--- a/calendar/gui/ea-week-view.c
+++ b/calendar/gui/ea-week-view.c
@@ -218,8 +218,8 @@ ea_week_view_get_n_children (AtkObject *accessible)
 		EWeekViewEventSpan *span;
 
                 /* If week_view->spans == NULL, there is no visible events. */
-                if (!week_view->spans)
-                        break;
+		if (!week_view->spans)
+			break;
 
 		event = &g_array_index (week_view->events,
 					EWeekViewEvent, event_index);
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 7b50de9cf1..0981b1c164 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -803,23 +803,23 @@ comp_description (ECalComponent *comp,
                   gboolean use_24_hour_format)
 {
 	gchar *description;
-        ECalComponentDateTime dt;
-        gchar *start = NULL, *end = NULL;
+	ECalComponentDateTime dt;
+	gchar *start = NULL, *end = NULL;
 
-        switch (e_cal_component_get_vtype (comp)) {
-        case E_CAL_COMPONENT_EVENT:
+	switch (e_cal_component_get_vtype (comp)) {
+	case E_CAL_COMPONENT_EVENT:
                 description = g_strdup (_("Event information"));
 		break;
-        case E_CAL_COMPONENT_TODO:
+	case E_CAL_COMPONENT_TODO:
                 description = g_strdup (_("Task information"));
 		break;
-        case E_CAL_COMPONENT_JOURNAL:
+	case E_CAL_COMPONENT_JOURNAL:
                 description = g_strdup (_("Memo information"));
 		break;
-        case E_CAL_COMPONENT_FREEBUSY:
-                e_cal_component_get_dtstart (comp, &dt);
-                if (dt.value)
-                        start = get_label (dt.value, use_24_hour_format);
+	case E_CAL_COMPONENT_FREEBUSY:
+		e_cal_component_get_dtstart (comp, &dt);
+		if (dt.value)
+			start = get_label (dt.value, use_24_hour_format);
 		e_cal_component_free_datetime (&dt);
 
 		e_cal_component_get_dtend (comp, &dt);
@@ -827,19 +827,19 @@ comp_description (ECalComponent *comp,
 			end = get_label (dt.value, use_24_hour_format);
 		e_cal_component_free_datetime (&dt);
 
-                if (start != NULL && end != NULL)
+		if (start != NULL && end != NULL)
 			description = g_strdup_printf (
 				_("Free/Busy information (%s to %s)"),
 				start, end);
-                else
+		else
 			description = g_strdup (_("Free/Busy information"));
-                g_free (start);
-                g_free (end);
+		g_free (start);
+		g_free (end);
 		break;
-        default:
+	default:
                 description = g_strdup (_("iCalendar information"));
 		break;
-        }
+	}
 
 	return description;
 }
diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c
index 36490c5463..29de491df8 100644
--- a/calendar/gui/misc.c
+++ b/calendar/gui/misc.c
@@ -108,7 +108,7 @@ calculate_time (time_t start, time_t end)
 	gchar *joined;
 	gint   i;
 
-        i = 0;
+	i = 0;
 	if (difference >= 3600) {
 		hours = difference / 3600;
 		difference %= 3600;
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 804330cac0..631e026cd7 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -2285,7 +2285,7 @@ print_day_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 
 		print_text_size_bold (context, buf, PANGO_ALIGN_LEFT,
 				      4, todo, 4,
-                                      4 + 24);
+				      4 + 24);
 
 		/* Print the day, e.g. 'Tuesday'. */
 		format_date (&tm, DATE_DAYNAME, buf, 100);
@@ -2788,7 +2788,7 @@ print_week_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 
 	/* Print the border around the header area. */
 	print_border (context, 0.0, width,
-                      0.0, HEADER_HEIGHT + 2.0 + 20, 1.0, 0.9);
+		      0.0, HEADER_HEIGHT + 2.0 + 20, 1.0, 0.9);
 
 	/* Print the 2 mini calendar-months. */
 	l = width - SMALL_MONTH_PAD - (small_month_width + week_numbers_inc) * 2
@@ -2866,7 +2866,7 @@ print_month_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 	format_date (&tm, DATE_MONTH | DATE_YEAR, buf, 100);
 	print_text_size_bold (context, buf, PANGO_ALIGN_CENTER,
 			      3, width - 3,
-                              3, 3 + 24);
+			      3, 3 + 24);
 
 }
 
@@ -3110,7 +3110,7 @@ print_calendar (GnomeCalendar *gcal,
 	operation = e_print_operation_new ();
 	gtk_print_operation_set_n_pages (operation, 1);
 
-        g_signal_connect (
+	g_signal_connect (
 		operation, "draw_page",
 		G_CALLBACK (print_calendar_draw_page), &pcali);