Whitespace cleanup.

60 files changed, 257 insertions, 257 deletions

diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c
index 33b7eeb68d..e55938978c 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.c
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.c
@@ -101,9 +101,9 @@ static void	set_map_timezone		(ETimezoneDialog *etd,
 static void	on_combo_changed		(GtkComboBox	*combo,
 						 ETimezoneDialog *etd);
 
-static void timezone_combo_get_active_text 	(GtkComboBox *combo,
+static void timezone_combo_get_active_text	(GtkComboBox *combo,
 						 const gchar **zone_name);
-static gboolean timezone_combo_set_active_text 	(GtkComboBox *combo,
+static gboolean timezone_combo_set_active_text	(GtkComboBox *combo,
 						 const gchar *zone_name);
 
 static void	map_destroy_cb			(gpointer data,
@@ -479,10 +479,10 @@ on_map_timeout (gpointer data)
 
         if (e_map_point_get_color_rgba (priv->point_selected)
 	    == E_TIMEZONE_DIALOG_MAP_POINT_SELECTED_1_RGBA)
-	        e_map_point_set_color_rgba (priv->map, priv->point_selected,
+		e_map_point_set_color_rgba (priv->map, priv->point_selected,
 					    E_TIMEZONE_DIALOG_MAP_POINT_SELECTED_2_RGBA);
 	else
-	        e_map_point_set_color_rgba (priv->map, priv->point_selected,
+		e_map_point_set_color_rgba (priv->map, priv->point_selected,
 					    E_TIMEZONE_DIALOG_MAP_POINT_SELECTED_1_RGBA);
 
 	return TRUE;
@@ -505,14 +505,14 @@ on_map_motion (GtkWidget *widget, GdkEventMotion *event, gpointer data)
 			       &longitude, &latitude);
 
 	if (priv->point_hover && priv->point_hover != priv->point_selected)
-	        e_map_point_set_color_rgba (priv->map, priv->point_hover,
+		e_map_point_set_color_rgba (priv->map, priv->point_hover,
 					    E_TIMEZONE_DIALOG_MAP_POINT_NORMAL_RGBA);
 
 	priv->point_hover = e_map_get_closest_point (priv->map, longitude,
 						     latitude, TRUE);
 
 	if (priv->point_hover != priv->point_selected)
-	        e_map_point_set_color_rgba (priv->map, priv->point_hover,
+		e_map_point_set_color_rgba (priv->map, priv->point_hover,
 					    E_TIMEZONE_DIALOG_MAP_POINT_HOVER_RGBA);
 
 	new_zone = get_zone_from_point (etd, priv->point_hover);
@@ -542,7 +542,7 @@ on_map_leave (GtkWidget *widget, GdkEventCrossing *event, gpointer data)
 		return FALSE;
 
 	if (priv->point_hover && priv->point_hover != priv->point_selected)
-	        e_map_point_set_color_rgba (priv->map, priv->point_hover,
+		e_map_point_set_color_rgba (priv->map, priv->point_hover,
 					    E_TIMEZONE_DIALOG_MAP_POINT_NORMAL_RGBA);
 
 	timezone_combo_set_active_text (GTK_COMBO_BOX (priv->timezone_combo),
@@ -596,14 +596,14 @@ on_map_button_pressed (GtkWidget *w, GdkEventButton *event, gpointer data)
 			       &longitude, &latitude);
 
 	if (event->button != 1) {
-	        e_map_zoom_out (priv->map);
+		e_map_zoom_out (priv->map);
 	} else {
 		if (e_map_get_magnification (priv->map) <= 1.0)
-		        e_map_zoom_to_location (priv->map, longitude,
+			e_map_zoom_to_location (priv->map, longitude,
 						latitude);
 
 		if (priv->point_selected)
-		        e_map_point_set_color_rgba (priv->map,
+			e_map_point_set_color_rgba (priv->map,
 						    priv->point_selected,
 						    E_TIMEZONE_DIALOG_MAP_POINT_NORMAL_RGBA);
 		priv->point_selected = priv->point_hover;
@@ -694,7 +694,7 @@ e_timezone_dialog_set_timezone (ETimezoneDialog *etd,
 
 	g_return_if_fail (E_IS_TIMEZONE_DIALOG (etd));
 
- 	if (!zone) {
+	if (!zone) {
 		zone = (icaltimezone *)get_local_timezone();
 		if (!zone)
 			zone = icaltimezone_get_utc_timezone();
diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c
index 8ecbcba061..3670218456 100644
--- a/widgets/menus/gal-define-views-dialog.c
+++ b/widgets/menus/gal-define-views-dialog.c
@@ -167,7 +167,7 @@ gdvd_button_delete_callback(GtkWidget *widget, GalDefineViewsDialog *dialog)
 
 				if (gtk_tree_path_prev (path)) {
 					gtk_tree_model_get_iter (dialog->model, &iter, path);
-			 	} else {
+				} else {
 					gtk_tree_model_get_iter_first (dialog->model, &iter);
 				}
 
diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c
index 3cdd94984a..003e326b69 100644
--- a/widgets/misc/e-activity-handler.c
+++ b/widgets/misc/e-activity-handler.c
@@ -290,7 +290,7 @@ e_activity_handler_init (EActivityHandler *activity_handler)
 	priv->next_activity_id = 1;
 	priv->activity_infos   = NULL;
 	priv->task_bars        = NULL;
-	priv->logger 	       = NULL;
+	priv->logger	       = NULL;
 	priv->error_timer      = 0;
 	priv->error_flush_interval = 0;
 	activity_handler->priv = priv;
@@ -405,8 +405,8 @@ cancel_wrapper (gpointer pdata)
 /* CORBA methods.  */
 guint  e_activity_handler_cancelable_operation_started  (EActivityHandler *activity_handler,
 						      const gchar       *component_id,
-					      	      const gchar       *information,
-					      	      gboolean          cancellable,
+						      const gchar       *information,
+						      gboolean          cancellable,
 						      void (*cancel_func)(gpointer),
 						      gpointer user_data)
 {
diff --git a/widgets/misc/e-activity-handler.h b/widgets/misc/e-activity-handler.h
index a458bf0f31..65bd1ded97 100644
--- a/widgets/misc/e-activity-handler.h
+++ b/widgets/misc/e-activity-handler.h
@@ -65,7 +65,7 @@ void  e_activity_handler_attach_task_bar  (EActivityHandler *activity_hanlder,
 					   ETaskBar         *task_bar);
 
 void  e_activity_handler_set_message   (EActivityHandler *activity_handler,
-				        const gchar       *message);
+					const gchar       *message);
 
 void  e_activity_handler_unset_message (EActivityHandler *activity_handler);
 
@@ -75,8 +75,8 @@ guint  e_activity_handler_operation_started  (EActivityHandler *activity_handler
 					      gboolean          cancellable);
 guint  e_activity_handler_cancelable_operation_started  (EActivityHandler *activity_handler,
 						      const gchar       *component_id,
-					      	      const gchar       *information,
-					      	      gboolean          cancellable,
+						      const gchar       *information,
+						      gboolean          cancellable,
 						      void (*cancel_func)(gpointer),
 						      gpointer user_data);
 
diff --git a/widgets/misc/e-attachment-dialog.c b/widgets/misc/e-attachment-dialog.c
index e1037ae175..45c2103e3d 100644
--- a/widgets/misc/e-attachment-dialog.c
+++ b/widgets/misc/e-attachment-dialog.c
@@ -407,7 +407,7 @@ e_attachment_dialog_new (GtkWindow *parent,
                          EAttachment *attachment)
 {
 	if (parent != NULL)
-	 	g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL);
+		g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL);
 	if (attachment != NULL)
 		g_return_val_if_fail (E_IS_ATTACHMENT (attachment), NULL);
 
diff --git a/widgets/misc/e-calendar.c b/widgets/misc/e-calendar.c
index 88e59b87db..a0adf46cf5 100644
--- a/widgets/misc/e-calendar.c
+++ b/widgets/misc/e-calendar.c
@@ -83,7 +83,7 @@ static void e_calendar_drag_leave	(GtkWidget      *widget,
 					 guint           time);
 static gboolean e_calendar_button_has_focus (ECalendar	*cal);
 static gboolean e_calendar_focus (GtkWidget *widget,
- 				  GtkDirectionType direction);
+				  GtkDirectionType direction);
 
 static void e_calendar_on_prev_pressed	(ECalendar	*cal);
 static void e_calendar_on_prev_released	(ECalendar	*cal);
@@ -113,11 +113,11 @@ e_calendar_class_init (ECalendarClass *class)
 
 	widget_class->realize		   = e_calendar_realize;
 	widget_class->style_set		   = e_calendar_style_set;
- 	widget_class->size_request	   = e_calendar_size_request;
- 	widget_class->size_allocate	   = e_calendar_size_allocate;
+	widget_class->size_request	   = e_calendar_size_request;
+	widget_class->size_allocate	   = e_calendar_size_allocate;
 	widget_class->drag_motion	   = e_calendar_drag_motion;
 	widget_class->drag_leave	   = e_calendar_drag_leave;
- 	widget_class->focus                = e_calendar_focus;
+	widget_class->focus                = e_calendar_focus;
 }
 
 
@@ -351,7 +351,7 @@ e_calendar_size_allocate	(GtkWidget	*widget,
 	gnome_canvas_item_set (cal->prev_item,
 			       "x", (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
 			       ? new_x2 + 1 - xthickness * 2 - E_CALENDAR_ARROW_BUTTON_X_PAD
-			         - arrow_button_size
+				 - arrow_button_size
 			       : xthickness * 2 + E_CALENDAR_ARROW_BUTTON_X_PAD,
 			       "y", ythickness * 2
 			       + E_CALENDAR_ARROW_BUTTON_Y_PAD,
@@ -363,7 +363,7 @@ e_calendar_size_allocate	(GtkWidget	*widget,
 			       "x", (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
 			       ? xthickness * 2 + E_CALENDAR_ARROW_BUTTON_X_PAD
 			       : new_x2 + 1 - xthickness * 2 - E_CALENDAR_ARROW_BUTTON_X_PAD
-			         - arrow_button_size,
+				 - arrow_button_size,
 			       "y", ythickness * 2
 			       + E_CALENDAR_ARROW_BUTTON_Y_PAD,
 			       "width", arrow_button_size,
diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h
index e23d29f057..5f60fc4046 100644
--- a/widgets/misc/e-canvas.h
+++ b/widgets/misc/e-canvas.h
@@ -42,7 +42,7 @@ extern "C" {
 #define E_IS_CANVAS_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_CANVAS_TYPE))
 
 typedef void		(*ECanvasItemReflowFunc)		(GnomeCanvasItem *item,
-								 gint   	  flags);
+								 gint	  flags);
 
 typedef void            (*ECanvasItemSelectionFunc)             (GnomeCanvasItem *item,
 								 gint             flags,
diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c
index ddf8bf60ee..18723b5f61 100644
--- a/widgets/misc/e-cell-date-edit.c
+++ b/widgets/misc/e-cell-date-edit.c
@@ -284,7 +284,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde)
 	gtk_container_set_focus_vadjustment (GTK_CONTAINER (tree_view),
 					     gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled_window)));
 	gtk_container_set_focus_hadjustment (GTK_CONTAINER (tree_view),
- 					     gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (scrolled_window)));
+					     gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (scrolled_window)));
 	gtk_widget_show (tree_view);
 	ecde->time_tree_view = tree_view;
 	g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)), "changed",
diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c
index 94133cc204..53beaa9c11 100644
--- a/widgets/misc/e-charset-picker.c
+++ b/widgets/misc/e-charset-picker.c
@@ -259,7 +259,7 @@ activate_other (GtkWidget *item, gpointer menu)
 	if (gtk_dialog_run (dialog) == GTK_RESPONSE_OK) {
 		new_charset = (gchar *)gtk_entry_get_text (GTK_ENTRY (entry));
 
-	       	if (*new_charset) {
+		if (*new_charset) {
 			if (add_other_charset (menu, item, new_charset)) {
 				gtk_widget_destroy (GTK_WIDGET (dialog));
 				g_object_unref (dialog);
diff --git a/widgets/misc/e-combo-button.c b/widgets/misc/e-combo-button.c
index b40cf70635..a6fb3b517f 100644
--- a/widgets/misc/e-combo-button.c
+++ b/widgets/misc/e-combo-button.c
@@ -495,7 +495,7 @@ e_combo_button_pack_vbox (EComboButton *combo_button)
 	gtk_container_add (GTK_CONTAINER (combo_button), priv->hbox);
 	gtk_widget_show (priv->hbox);
 
-   	priv->vbox = gtk_vbox_new (FALSE, 0);
+	priv->vbox = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (priv->vbox);
 
 	priv->icon_image = gtk_image_new_from_stock (
diff --git a/widgets/misc/e-cursors.h b/widgets/misc/e-cursors.h
index 7df3404092..23ac7c0899 100644
--- a/widgets/misc/e-cursors.h
+++ b/widgets/misc/e-cursors.h
@@ -51,7 +51,7 @@ void    e_cursors_shutdown  (void);
 
 #define e_cursor_set(win, c)					   \
 G_STMT_START {							   \
-     if (win) 							   \
+     if (win)							   \
          gdk_window_set_cursor (win, e_cursor_get (c)); \
 } G_STMT_END
 
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index e8034eb487..b9ae1ad901 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -1247,7 +1247,7 @@ position_date_popup		(EDateEdit	*dedit)
 	x += win_x;
 	y += win_y;
 
-      	screen_width = gdk_screen_width ();
+	screen_width = gdk_screen_width ();
 	screen_height = gdk_screen_height ();
 
 	x = CLAMP (x, 0, MAX (0, screen_width - cal_req.width));
@@ -1326,7 +1326,7 @@ on_date_popup_key_press			(GtkWidget	*widget,
 					 EDateEdit	*dedit)
 {
 	if (event->keyval != GDK_Escape) {
-    	gdk_keyboard_grab (dedit->priv->cal_popup->window, TRUE, GDK_CURRENT_TIME);
+	gdk_keyboard_grab (dedit->priv->cal_popup->window, TRUE, GDK_CURRENT_TIME);
 		return FALSE;
 	}
 
diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
index b699190568..9fdb45b0b6 100644
--- a/widgets/misc/e-filter-bar.c
+++ b/widgets/misc/e-filter-bar.c
@@ -962,7 +962,7 @@ e_filter_bar_new (RuleContext *context,
 	bar = g_object_new (e_filter_bar_get_type (), NULL);
 	((ESearchBar *)bar)->lite = FALSE;
 
- 	e_filter_bar_new_construct (context, systemrules, userrules, config, data, bar);
+	e_filter_bar_new_construct (context, systemrules, userrules, config, data, bar);
 
 	return bar;
 }
@@ -978,7 +978,7 @@ e_filter_bar_lite_new (RuleContext *context,
 
 	bar = g_object_new (e_filter_bar_get_type (), NULL);
 	((ESearchBar *)bar)->lite = TRUE;
- 	e_filter_bar_new_construct (context, systemrules, userrules, config, data, bar);
+	e_filter_bar_new_construct (context, systemrules, userrules, config, data, bar);
 
 	return bar;
 }
@@ -1003,7 +1003,7 @@ e_filter_bar_new_construct (RuleContext *context,
 
 	bar->all_account_search_vf = NULL;
 	bar->account_search_vf = NULL;
- 	bar->account_search_cancel = NULL;
+	bar->account_search_cancel = NULL;
 
 	e_search_bar_construct ((ESearchBar *)bar, &item, &item);
 
diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h
index d5381319c9..3e22182021 100644
--- a/widgets/misc/e-filter-bar.h
+++ b/widgets/misc/e-filter-bar.h
@@ -131,7 +131,7 @@ EFilterBar *e_filter_bar_lite_new (RuleContext *context,
 				   gpointer data);
 
 void
-e_filter_bar_new_construct 	  (RuleContext *context,
+e_filter_bar_new_construct	  (RuleContext *context,
 				   const gchar *systemrules,
 				   const gchar *userrules,
 				   EFilterBarConfigRule config,
diff --git a/widgets/misc/e-image-chooser.h b/widgets/misc/e-image-chooser.h
index a3972bd26d..be2d427291 100644
--- a/widgets/misc/e-image-chooser.h
+++ b/widgets/misc/e-image-chooser.h
@@ -28,10 +28,10 @@
 
 G_BEGIN_DECLS
 
-#define E_TYPE_IMAGE_CHOOSER	        (e_image_chooser_get_type ())
-#define E_IMAGE_CHOOSER(obj)	        (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_IMAGE_CHOOSER, EImageChooser))
+#define E_TYPE_IMAGE_CHOOSER		(e_image_chooser_get_type ())
+#define E_IMAGE_CHOOSER(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_IMAGE_CHOOSER, EImageChooser))
 #define E_IMAGE_CHOOSER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_IMAGE_CHOOSER, EImageChooserClass))
-#define E_IS_IMAGE_CHOOSER(obj)	        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_IMAGE_CHOOSER))
+#define E_IS_IMAGE_CHOOSER(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_IMAGE_CHOOSER))
 #define E_IS_IMAGE_CHOOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_IMAGE_CHOOSER))
 
 typedef struct _EImageChooser        EImageChooser;
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c
index c44e75886b..f35335f37d 100644
--- a/widgets/misc/e-map.c
+++ b/widgets/misc/e-map.c
@@ -345,7 +345,7 @@ e_map_unrealize (GtkWidget *widget)
 	g_return_if_fail (IS_E_MAP (widget));
 
 	if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-	        (*GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+		(*GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
 }
 
 
@@ -882,7 +882,7 @@ e_map_point_is_in_view (EMap *map, EMapPoint *point)
 
 	if (x >= 0 && x < GTK_WIDGET (map)->allocation.width &&
 	    y >= 0 && y < GTK_WIDGET (map)->allocation.height)
-	        return TRUE;
+		return TRUE;
 
 	return FALSE;
 }
@@ -1011,8 +1011,8 @@ update_render_pixbuf (EMap *map, GdkInterpType interp, gboolean render_overlays)
 	if (width > 1 && height > 1)
 	{
 		gdk_pixbuf_scale (priv->map_pixbuf, priv->map_render_pixbuf, 0, 0,  /* Dest (x, y) */
-				  width, height, 0, 0,	                            /* Offset (x, y) */
-				  zoom, zoom,	                                    /* Scale (x, y) */
+				  width, height, 0, 0,				    /* Offset (x, y) */
+				  zoom, zoom,					    /* Scale (x, y) */
 				  interp);
 	}
 
diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c
index 9b193565d4..ba1a5b011e 100644
--- a/widgets/misc/e-multi-config-dialog.c
+++ b/widgets/misc/e-multi-config-dialog.c
@@ -60,11 +60,11 @@ static const gchar *list_e_table_spec =
         "                     horizontal-resize=\"true\""
         ">"
 	"  <ETableColumn model_col=\"0\""
-	"	         expansion=\"1.0\""
+	"		 expansion=\"1.0\""
 	"                cell=\"vbox\""
- 	"                minimum_width=\"32\""
+	"                minimum_width=\"32\""
 	"                resizable=\"true\""
-	"	         _title=\"Category\""
+	"		 _title=\"Category\""
 	"                compare=\"string\"/>"
 	"  <ETableState>"
 	"    <column source=\"0\"/>"
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
index 0465c38792..2adad1991b 100644
--- a/widgets/misc/e-reflow.c
+++ b/widgets/misc/e-reflow.c
@@ -1278,7 +1278,7 @@ e_reflow_point (GnomeCanvasItem *item,
 	return 0;
 #if 0
 	if (y >= E_REFLOW_BORDER_WIDTH && y <= reflow->height - E_REFLOW_BORDER_WIDTH) {
-	        float n_x;
+		float n_x;
 		n_x = x;
 		n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
 		n_x = fmod(n_x, (reflow->column_width + E_REFLOW_FULL_GUTTER));
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index c6b26412f1..652123f2ce 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -664,8 +664,8 @@ set_menu (ESearchBar *esb,
 		ESearchBarItem *new_item;
 
 		new_item = g_new (ESearchBarItem, 1);
-		new_item->text 	   = items[i].text ? g_strdup (_(items[i].text)) : NULL;
-		new_item->id   	   = items[i].id;
+		new_item->text	   = items[i].text ? g_strdup (_(items[i].text)) : NULL;
+		new_item->id	   = items[i].id;
 		new_item->type     = items[i].type;
 
 		esb->menu_items = g_slist_append (esb->menu_items, new_item);
@@ -681,13 +681,13 @@ set_menu (ESearchBar *esb,
 /* static gpointer /
 /* option_item_destroy_cb (GtkObject *object, gpointer data) */
 /* { */
-/* /\* 	ESearchBarSubitem *subitems; *\/ */
+/* /\*	ESearchBarSubitem *subitems; *\/ */
 
-/* /\* 	subitems = data; *\/ */
+/* /\*	subitems = data; *\/ */
 
-/* /\* 	g_assert (subitems != NULL); *\/ */
-/* /\* 	free_subitems (subitems); *\/ */
-/* /\* 	g_object_set_data (G_OBJECT (object), "EsbChoiceSubitems", NULL); *\/ */
+/* /\*	g_assert (subitems != NULL); *\/ */
+/* /\*	free_subitems (subitems); *\/ */
+/* /\*	g_object_set_data (G_OBJECT (object), "EsbChoiceSubitems", NULL); *\/ */
 /* } */
 
 static void
@@ -745,7 +745,7 @@ set_option (ESearchBar *esb, ESearchBarItem *items)
 
 	gtk_widget_show_all (menu);
 	g_object_set_data (G_OBJECT(esb->option_menu), "group", group);
- 	entry_focus_out_cb (esb->entry, NULL, esb);
+	entry_focus_out_cb (esb->entry, NULL, esb);
 }
 
 static int
@@ -828,10 +828,10 @@ impl_dispose (GObject *object)
 		bonobo_object_unref (BONOBO_OBJECT (esb->ui_component));
 		esb->ui_component = NULL;
 	}
-/* 	if (esb->entry) { */
-/* 		g_object_unref (esb->entry); */
-/* 		esb->entry = NULL; */
-/* 	} */
+/*	if (esb->entry) { */
+/*		g_object_unref (esb->entry); */
+/*		esb->entry = NULL; */
+/*	} */
 	if (esb->suboption) {
 		g_object_unref (esb->suboption);
 		esb->suboption = NULL;
@@ -1050,7 +1050,7 @@ e_search_bar_construct (ESearchBar *search_bar,
 		gtk_box_pack_start (GTK_BOX(search_bar->scopeoption_box), label, FALSE, FALSE, 0);
 
 		search_bar->scopeoption = gtk_option_menu_new ();
-	/* 	g_signal_connect (GTK_OPTION_MENU (search_bar->scopeoption), "changed", scopeoption_changed_cb, search_bar); */
+	/*	g_signal_connect (GTK_OPTION_MENU (search_bar->scopeoption), "changed", scopeoption_changed_cb, search_bar); */
 		gtk_box_pack_start (GTK_BOX(search_bar->scopeoption_box), search_bar->scopeoption, FALSE, FALSE, 0);
 		gtk_widget_show_all (search_bar->scopeoption_box);
 		gtk_widget_hide (hbox);
diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c
index b42630ebae..fa84e86cc8 100644
--- a/widgets/misc/e-send-options.c
+++ b/widgets/misc/e-send-options.c
@@ -397,7 +397,7 @@ init_widgets (ESendOptionsDialog *sod)
 	g_signal_connect (priv->delay_until, "changed", G_CALLBACK (delay_until_date_changed_cb), sod);
 
 	if (priv->global)
-	 	g_signal_connect (priv->notebook, "switch-page", G_CALLBACK (page_changed_cb), sod);
+		g_signal_connect (priv->notebook, "switch-page", G_CALLBACK (page_changed_cb), sod);
 
 
 }
@@ -502,7 +502,7 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type)
 	gtk_label_set_mnemonic_widget (GTK_LABEL (priv->until_label), priv->delay_until);
 
 	if (priv->global) {
-	        GtkWidget *widget = gtk_label_new ("Calendar");
+		GtkWidget *widget = gtk_label_new ("Calendar");
 		gtk_label_set_text (GTK_LABEL (priv->sopts_label), "Mail");
 		gtk_notebook_append_page (priv->notebook, priv->status, widget);
 		gtk_widget_show (widget);
@@ -514,7 +514,7 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type)
 
 	switch (type) {
 		case E_ITEM_MAIL:
-		        priv->help_section = g_strdup ("usage-mail");
+			priv->help_section = g_strdup ("usage-mail");
 			gtk_widget_hide (priv->accepted_label);
 			gtk_widget_hide (priv->when_accepted);
 			gtk_widget_hide (priv->completed_label);
@@ -522,11 +522,11 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type)
 			gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->declined_label), (_("When de_leted:")));
 			break;
 		case E_ITEM_CALENDAR:
-         	        priv->help_section = g_strdup ("usage-calendar");
+			priv->help_section = g_strdup ("usage-calendar");
 			gtk_widget_hide (priv->completed_label);
 			gtk_widget_hide (priv->when_completed);
 		case E_ITEM_TASK:
-		        priv->help_section = g_strdup ("usage-calendar-todo");
+			priv->help_section = g_strdup ("usage-calendar-todo");
 			gtk_widget_hide (priv->security_label);
 			gtk_widget_hide (priv->security);
 			gtk_widget_set_sensitive (priv->autodelete, FALSE);
@@ -606,7 +606,7 @@ static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data
 			e_display_help (
 				GTK_WINDOW (priv->main),
 				priv->help_section);
-    			break;
+			break;
 	}
 
 	g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state);
@@ -821,7 +821,7 @@ GType e_sendoptions_dialog_get_type (void)
       sizeof (ESendOptionsDialog),
      0,      /* n_preallocs */
      (GInstanceInitFunc) e_sendoptions_dialog_init,
- 	NULL    /* instance_init */
+	NULL    /* instance_init */
     };
     type = g_type_register_static (G_TYPE_OBJECT,
                                    "ESendOptionsDialogType",
diff --git a/widgets/misc/e-spinner.c b/widgets/misc/e-spinner.c
index 87e53dce8f..78303cc9ec 100644
--- a/widgets/misc/e-spinner.c
+++ b/widgets/misc/e-spinner.c
@@ -66,7 +66,7 @@ struct _ESpinnerClass
 
 #define E_TYPE_SPINNER_CACHE			(e_spinner_cache_get_type())
 #define E_SPINNER_CACHE(object)		(G_TYPE_CHECK_INSTANCE_CAST((object), E_TYPE_SPINNER_CACHE, ESpinnerCache))
-#define E_SPINNER_CACHE_CLASS(klass) 	(G_TYPE_CHECK_CLASS_CAST((klass), E_TYPE_SPINNER_CACHE, ESpinnerCacheClass))
+#define E_SPINNER_CACHE_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST((klass), E_TYPE_SPINNER_CACHE, ESpinnerCacheClass))
 #define E_IS_SPINNER_CACHE(object)		(G_TYPE_CHECK_INSTANCE_TYPE((object), E_TYPE_SPINNER_CACHE))
 #define E_IS_SPINNER_CACHE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE((klass), E_TYPE_SPINNER_CACHE))
 #define E_SPINNER_CACHE_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), E_TYPE_SPINNER_CACHE, ESpinnerCacheClass))
@@ -275,7 +275,7 @@ e_spinner_images_load (GdkScreen *screen,
 	/* Load the animation. The 'rest icon' is the 0th frame */
 	icon_info = gtk_icon_theme_lookup_icon (icon_theme,
 						SPINNER_ICON_NAME,
-					        requested_size, 0);
+						requested_size, 0);
 	if (icon_info == NULL)
 	{
 		g_warning ("Throbber animation not found");
@@ -741,10 +741,10 @@ e_spinner_start (ESpinner *spinner)
 
 		details->timer_task =
 			g_timeout_add_full (G_PRIORITY_LOW,
-			                    details->timeout,
-				            (GSourceFunc) bump_spinner_frame_cb,
-				            spinner,
-				            NULL);
+					    details->timeout,
+					    (GSourceFunc) bump_spinner_frame_cb,
+					    spinner,
+					    NULL);
 	}
 }
 
@@ -843,7 +843,7 @@ e_spinner_size_request (GtkWidget *widget,
 		gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (widget),
 						   details->size,
 						   &requisition->width,
-					           &requisition->height);
+						   &requisition->height);
 		return;
 	}
 
diff --git a/widgets/misc/e-task-bar.h b/widgets/misc/e-task-bar.h
index 33d0e2312f..f208603b63 100644
--- a/widgets/misc/e-task-bar.h
+++ b/widgets/misc/e-task-bar.h
@@ -69,7 +69,7 @@ void         e_task_bar_remove_task      (ETaskBar    *task_bar,
 ETaskWidget * e_task_bar_get_task_widget_from_id (ETaskBar *task_bar,
 						  guint id);
 
-void 	    e_task_bar_remove_task_from_id (ETaskBar *task_bar,
+void	    e_task_bar_remove_task_from_id (ETaskBar *task_bar,
 					    guint id);
 ETaskWidget *e_task_bar_get_task_widget  (ETaskBar    *task_bar,
 					  gint          n);
diff --git a/widgets/misc/e-task-widget.c b/widgets/misc/e-task-widget.c
index de5b782f85..59909f6542 100644
--- a/widgets/misc/e-task-widget.c
+++ b/widgets/misc/e-task-widget.c
@@ -172,7 +172,7 @@ e_task_widget_construct (ETaskWidget *task_widget,
 		priv->cancel_func = cancel_func;
 		priv->data = data;
 		g_signal_connect (tool, "clicked",  G_CALLBACK (button_press_event_cb), task_widget);
- 		g_signal_connect (task_widget, "button-press-event", G_CALLBACK (prepare_popup), task_widget);
+		g_signal_connect (task_widget, "button-press-event", G_CALLBACK (prepare_popup), task_widget);
 
 	}
 
diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c
index 273343aaa1..59a8cd3e0d 100644
--- a/widgets/table/e-cell-hbox.c
+++ b/widgets/table/e-cell-hbox.c
@@ -277,7 +277,7 @@ e_cell_hbox_class_init (ECellHboxClass *klass)
 
 	ecc->max_width        = ecv_max_width;
 
-/* 	gal_a11y_e_cell_registry_add_cell_type (NULL, E_CELL_HBOX_TYPE, gal_a11y_e_cell_hbox_new); */
+/*	gal_a11y_e_cell_registry_add_cell_type (NULL, E_CELL_HBOX_TYPE, gal_a11y_e_cell_hbox_new); */
 }
 
 static void
diff --git a/widgets/table/e-cell-hbox.h b/widgets/table/e-cell-hbox.h
index 366d01fffe..def14d81ed 100644
--- a/widgets/table/e-cell-hbox.h
+++ b/widgets/table/e-cell-hbox.h
@@ -61,7 +61,7 @@ ECell   *e_cell_hbox_new       (void);
 void     e_cell_hbox_append    (ECellHbox *vbox,
 				ECell     *subcell,
 				gint model_col,
-	                        gint size);
+				gint size);
 
 
 G_END_DECLS
diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
index 5fcd13fce4..64d7d69182 100644
--- a/widgets/table/e-cell-popup.c
+++ b/widgets/table/e-cell-popup.c
@@ -76,7 +76,7 @@ static int	ecp_height		(ECellView	*ecv,
 					 int		 model_col,
 					 int		 view_col,
 					 int		 row);
-static gpointer 	ecp_enter_edit		(ECellView	*ecv,
+static gpointer	ecp_enter_edit		(ECellView	*ecv,
 					 int		 model_col,
 					 int		 view_col,
 					 int		 row);
diff --git a/widgets/table/e-cell-popup.h b/widgets/table/e-cell-popup.h
index b1e40a9845..a8ce08f44f 100644
--- a/widgets/table/e-cell-popup.h
+++ b/widgets/table/e-cell-popup.h
@@ -71,7 +71,7 @@ typedef struct {
 	ECellClass parent_class;
 
 	/* Virtual function for subclasses to override. */
-	gint   	   (*popup)        (ECellPopup *ecp, GdkEvent *event, gint row, gint view_col);
+	gint	   (*popup)        (ECellPopup *ecp, GdkEvent *event, gint row, gint view_col);
 } ECellPopupClass;
 
 
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 409f933dae..ff3dd357e8 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -609,7 +609,7 @@ build_layout (ECellTextView *text_view, gint row, const gchar *text, gint width)
 			pango_font_description_set_size (desc, fixed_size);
 		else
 			pango_font_description_set_absolute_size (desc, fixed_size);
-/*  		pango_font_description_set_style (desc, PANGO_STYLE_OBLIQUE); */
+/*		pango_font_description_set_style (desc, PANGO_STYLE_OBLIQUE); */
 		pango_layout_set_font_description (layout, desc);
 		pango_font_description_free (desc);
 		pango_font_description_free (fixed_desc);
@@ -870,7 +870,7 @@ ect_get_bg_color(ECellView *ecell_view, gint row)
 		return NULL;
 
 	color_spec = e_table_model_value_at (ecell_view->e_table_model,
-	                                     ect->bg_color_column, row);
+					     ect->bg_color_column, row);
 
 	return color_spec;
 }
@@ -985,7 +985,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 			if (preedit_len && flags & E_CELL_PREEDIT)
 				return 0;
 			else
-		 		return 1;
+				return 1;
 		}
 
 		if (event->key.keyval == GDK_Escape){
@@ -1362,7 +1362,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
 
 	pango_context = gtk_widget_get_pango_context (canvas);
 	font_metrics = pango_context_get_metrics (pango_context,
-	               canvas->style->font_desc, pango_context_get_language(pango_context));
+		       canvas->style->font_desc, pango_context_get_language(pango_context));
 	ty =  (double)(text_height
 		       - pango_font_metrics_get_ascent (font_metrics)
 		       - pango_font_metrics_get_descent (font_metrics)) / 2.0 /(double)PANGO_SCALE;
@@ -1402,7 +1402,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
 		}
 			cairo_set_line_width (cr,(double)pango_font_metrics_get_strikethrough_thickness (font_metrics)/(double)PANGO_SCALE);
 
-		        cairo_stroke (cr);
+			cairo_stroke (cr);
 	}
 
 	cairo_move_to(cr, 2, text_height- 5);
@@ -1592,7 +1592,7 @@ ect_show_tooltip (ECellView *ecell_view,
 					      "clip_height", (double) height,
 					      "clip", TRUE,
 					      "line_wrap", FALSE,
-  					      "justification", E_CELL_TEXT (text_view->cell_view.ecell)->justify,
+					      "justification", E_CELL_TEXT (text_view->cell_view.ecell)->justify,
 					      "draw_background", FALSE,
 					      NULL);
 
@@ -1755,7 +1755,7 @@ e_cell_text_class_init (ECellTextClass *klass)
 	ecc->enter_edit = ect_enter_edit;
 	ecc->leave_edit = ect_leave_edit;
 	ecc->save_state = ect_save_state;
- 	ecc->load_state = ect_load_state;
+	ecc->load_state = ect_load_state;
 	ecc->free_state = ect_free_state;
 	ecc->print      = ect_print;
 	ecc->print_height = ect_print_height;
@@ -1978,7 +1978,7 @@ e_cell_text_delete_surrounding_cb   (GtkIMContext *context,
 
 	text_len = g_utf8_strlen (edit->text, -1);
 	begin_pos = g_utf8_pointer_to_offset (edit->text,
-			                      edit->text + MIN (edit->selection_start, edit->selection_end));
+					      edit->text + MIN (edit->selection_start, edit->selection_end));
 	begin_pos += offset;
 	end_pos = begin_pos + n_chars;
 	if(begin_pos < 0 || text_len < begin_pos)
@@ -1986,9 +1986,9 @@ e_cell_text_delete_surrounding_cb   (GtkIMContext *context,
 	if(end_pos > text_len)
 		end_pos = text_len;
 	edit->selection_start = g_utf8_offset_to_pointer (edit->text, begin_pos)
-		                - edit->text;
+				- edit->text;
 	edit->selection_end = g_utf8_offset_to_pointer (edit->text, end_pos)
-		              - edit->text;
+			      - edit->text;
 
 	_delete_selection (tv);
 
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index 4248666ce6..1acbf7af61 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -329,7 +329,7 @@ e_cell_toggle_class_init (ECellToggleClass *klass)
 	ecc->max_width  = etog_max_width;
 
 	gal_a11y_e_cell_registry_add_cell_type (NULL,
-					         E_CELL_TOGGLE_TYPE,
+						 E_CELL_TOGGLE_TYPE,
                                                 gal_a11y_e_cell_toggle_new);
 }
 
diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c
index cfd9ddde72..9bac6ad9c6 100644
--- a/widgets/table/e-cell-vbox.c
+++ b/widgets/table/e-cell-vbox.c
@@ -79,7 +79,7 @@ ecv_kill_view (ECellView *ecv)
 	gint i;
 
         if (vbox_view->cell_view.kill_view_cb)
-        	(vbox_view->cell_view.kill_view_cb)(ecv, vbox_view->cell_view.kill_view_cb_data);
+		(vbox_view->cell_view.kill_view_cb)(ecv, vbox_view->cell_view.kill_view_cb_data);
 
         if (vbox_view->cell_view.kill_view_cb_data)
             g_list_free(vbox_view->cell_view.kill_view_cb_data);
diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c
index 1152a42e1a..be674e6374 100644
--- a/widgets/table/e-cell.c
+++ b/widgets/table/e-cell.c
@@ -16,7 +16,7 @@
  *
  * Authors:
  *		Miguel de Icaza <miguel@ximian.com>
- * 		Chris Lahey <clahey@ximian.com>
+ *		Chris Lahey <clahey@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h
index 614e1ebe0e..79adb5c5b4 100644
--- a/widgets/table/e-cell.h
+++ b/widgets/table/e-cell.h
@@ -93,13 +93,13 @@ typedef struct {
 	void       (*realize)          (ECellView *ecell_view);
 	void       (*unrealize)        (ECellView *ecell_view);
 
-	void   	   (*draw)             (ECellView *ecell_view, GdkDrawable *drawable,
-	       			       	gint model_col, gint view_col, gint row,
-				       	ECellFlags flags, gint x1, gint y1, gint x2, gint y2);
-	gint   	   (*event)            (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions);
-	void   	   (*focus)            (ECellView *ecell_view, gint model_col, gint view_col,
-				       	gint row, gint x1, gint y1, gint x2, gint y2);
-	void   	   (*unfocus)          (ECellView *ecell_view);
+	void	   (*draw)             (ECellView *ecell_view, GdkDrawable *drawable,
+					gint model_col, gint view_col, gint row,
+					ECellFlags flags, gint x1, gint y1, gint x2, gint y2);
+	gint	   (*event)            (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions);
+	void	   (*focus)            (ECellView *ecell_view, gint model_col, gint view_col,
+					gint row, gint x1, gint y1, gint x2, gint y2);
+	void	   (*unfocus)          (ECellView *ecell_view);
 	gint        (*height)           (ECellView *ecell_view, gint model_col, gint view_col, gint row);
 
 	void      *(*enter_edit)       (ECellView *ecell_view, gint model_col, gint view_col, gint row);
@@ -108,10 +108,10 @@ typedef struct {
 	void       (*load_state)       (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer context, gpointer save_state);
 	void       (*free_state)       (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer save_state);
 	void       (*print)            (ECellView *ecell_view, GtkPrintContext *context,
-				       	gint model_col, gint view_col, gint row,
-				       	gdouble width, gdouble height);
+					gint model_col, gint view_col, gint row,
+					gdouble width, gdouble height);
 	gdouble    (*print_height)     (ECellView *ecell_view,GtkPrintContext *context,
-				       	gint model_col, gint view_col, gint row, gdouble width);
+					gint model_col, gint view_col, gint row, gdouble width);
 	gint        (*max_width)        (ECellView *ecell_view, gint model_col, gint view_col);
 	gint        (*max_width_by_row) (ECellView *ecell_view, gint model_col, gint view_col, gint row);
 	void       (*show_tooltip)     (ECellView *ecell_view, gint model_col, gint view_col, gint row, gint col_width, ETableTooltip *tooltip);
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index 10a0ba8223..9b2efc49ee 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -575,7 +575,7 @@ etcta_init (ETableClickToAdd *etcta)
 
 	/* create its a11y object at this time if accessibility is enabled*/
 	if (atk_get_root () != NULL) {
-        	a11y = atk_gobject_accessible_for_object (G_OBJECT (etcta));
+		a11y = atk_gobject_accessible_for_object (G_OBJECT (etcta));
 		atk_object_set_name (a11y, _("click to add"));
 	}
 }
diff --git a/widgets/table/e-table-example-1.c b/widgets/table/e-table-example-1.c
index b870967099..7772a2851b 100644
--- a/widgets/table/e-table-example-1.c
+++ b/widgets/table/e-table-example-1.c
@@ -88,14 +88,14 @@
  * (sorting is specified by the "column" argument to the leaf elemnt.
  */
 
-#define INITIAL_SPEC "<ETableSpecification>                    	       \
-	<columns-shown>                  			       \
-		<column> 0 </column>     			       \
-		<column> 4 </column>     			       \
-		<column> 1 </column>     			       \
-		<column> 2 </column>     			       \
-		<column> 3 </column>     			       \
-	</columns-shown>                 			       \
+#define INITIAL_SPEC "<ETableSpecification>			       \
+	<columns-shown>					       \
+		<column> 0 </column>			       \
+		<column> 4 </column>			       \
+		<column> 1 </column>			       \
+		<column> 2 </column>			       \
+		<column> 3 </column>			       \
+	</columns-shown>					       \
 	<grouping> <leaf column=\"1\" ascending=\"true\"/> </grouping>    \
 </ETableSpecification>"
 
diff --git a/widgets/table/e-table-example-2.c b/widgets/table/e-table-example-2.c
index ca4128590c..295820da23 100644
--- a/widgets/table/e-table-example-2.c
+++ b/widgets/table/e-table-example-2.c
@@ -89,14 +89,14 @@ The headers will be hard coded, as will be the example data.
    front.  It also sorts by the "Full Name" column (ascending.)
    Sorting and grouping take the model column as their arguments
    (sorting is specified by the "column" argument to the leaf elemnt. */
-#define INITIAL_SPEC "<ETableSpecification>                    	       \
-	<columns-shown>                  			       \
-		<column> 0 </column>     			       \
-		<column> 4 </column>     			       \
-		<column> 1 </column>     			       \
-		<column> 2 </column>     			       \
-		<column> 3 </column>     			       \
-	</columns-shown>                 			       \
+#define INITIAL_SPEC "<ETableSpecification>			       \
+	<columns-shown>					       \
+		<column> 0 </column>			       \
+		<column> 4 </column>			       \
+		<column> 1 </column>			       \
+		<column> 2 </column>			       \
+		<column> 3 </column>			       \
+	</columns-shown>					       \
 	<grouping> <leaf column=\"1\" ascending=\"true\"/> </grouping> \
 </ETableSpecification>"
 
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index d569e8dd9e..909c00ddf7 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -888,7 +888,7 @@ ethi_realize (GnomeCanvasItem *item)
 	gtk_drag_dest_set (GTK_WIDGET (item->canvas), 0,
 			   ethi_drop_types, ELEMENTS (ethi_drop_types),
 			   GDK_ACTION_MOVE);
-  	g_free(ethi_drop_types[0].target);
+	g_free(ethi_drop_types[0].target);
 
 	/* Drop signals */
 	ethi->drag_motion_id = g_signal_connect (item->canvas, "drag_motion",
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index 8044b73bfc..81adbf15e9 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -241,7 +241,7 @@ e_table_draw_elided_string (GdkDrawable *drawable, GdkGC *gc, GtkWidget *widget,
 			    gint x, gint y, PangoLayout *layout, gchar *str,
 			    gint max_width, gboolean center)
 {
- 	gint width;
+	gint width;
 	gint height;
 	gint index;
 	GSList *lines;
diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
index b931f48e20..37a1e3c332 100644
--- a/widgets/table/e-table-header.c
+++ b/widgets/table/e-table-header.c
@@ -154,7 +154,7 @@ eth_finalize (GObject *object)
 	if (eth->sort_info) {
 		if (eth->sort_info_group_change_id)
 			g_signal_handler_disconnect(G_OBJECT(eth->sort_info),
-					            eth->sort_info_group_change_id);
+						    eth->sort_info_group_change_id);
 		g_object_unref(eth->sort_info);
 		eth->sort_info = NULL;
 	}
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 987b9610b3..ec54f3dcfc 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -245,7 +245,7 @@ eti_editing (ETableItem *eti)
 inline static GdkColor *
 eti_get_cell_background_color (ETableItem *eti, gint row, gint col, gboolean selected, gboolean *allocatedp)
 {
-  	ECellView *ecell_view = eti->cell_views [col];
+	ECellView *ecell_view = eti->cell_views [col];
 	GtkWidget *canvas = GTK_WIDGET(GNOME_CANVAS_ITEM(eti)->canvas);
 	GdkColor *background, bg;
 	gchar *color_spec = NULL;
@@ -584,11 +584,11 @@ eti_remove_header_model (ETableItem *eti)
 		return;
 
 	g_signal_handler_disconnect (G_OBJECT (eti->header),
-			       	     eti->header_structure_change_id);
+				     eti->header_structure_change_id);
 	g_signal_handler_disconnect (G_OBJECT (eti->header),
-			       	     eti->header_dim_change_id);
+				     eti->header_dim_change_id);
 	g_signal_handler_disconnect (G_OBJECT (eti->header),
-			       	     eti->header_request_width_id);
+				     eti->header_request_width_id);
 
 	if (eti->cell_views){
 		eti_unrealize_cell_views (eti);
@@ -1102,7 +1102,7 @@ eti_table_model_no_change (ETableModel *table_model, ETableItem *eti)
 static void
 eti_table_model_changed (ETableModel *table_model, ETableItem *eti)
 {
- 	if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) {
+	if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) {
 		eti_unfreeze (eti);
 		return;
 	}
@@ -1124,7 +1124,7 @@ eti_table_model_changed (ETableModel *table_model, ETableItem *eti)
 static void
 eti_table_model_row_changed (ETableModel *table_model, gint row, ETableItem *eti)
 {
- 	if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) {
+	if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) {
 		eti_unfreeze (eti);
 		return;
 	}
@@ -1142,7 +1142,7 @@ eti_table_model_row_changed (ETableModel *table_model, gint row, ETableItem *eti
 static void
 eti_table_model_cell_changed (ETableModel *table_model, gint col, gint row, ETableItem *eti)
 {
- 	if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) {
+	if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) {
 		eti_unfreeze (eti);
 		return;
 	}
@@ -1160,7 +1160,7 @@ eti_table_model_cell_changed (ETableModel *table_model, gint col, gint row, ETab
 static void
 eti_table_model_rows_inserted (ETableModel *table_model, gint row, gint count, ETableItem *eti)
 {
- 	if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) {
+	if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) {
 		eti_unfreeze (eti);
 		return;
 	}
@@ -1187,7 +1187,7 @@ eti_table_model_rows_inserted (ETableModel *table_model, gint row, gint count, E
 static void
 eti_table_model_rows_deleted (ETableModel *table_model, gint row, gint count, ETableItem *eti)
 {
- 	if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) {
+	if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED)) {
 		eti_unfreeze (eti);
 		return;
 	}
@@ -1578,8 +1578,8 @@ eti_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *psp
 static void
 eti_init (ETableItem *eti)
 {
-	eti->motion_row 	       = -1;
-	eti->motion_col 	       = -1;
+	eti->motion_row	       = -1;
+	eti->motion_col	       = -1;
 	eti->editing_col               = -1;
 	eti->editing_row               = -1;
 	eti->height                    = 0;
@@ -1637,7 +1637,7 @@ eti_init (ETableItem *eti)
 	eti->grabbed_row               = -1;
 
 	eti->cursor_on_screen          = FALSE;
- 	eti->cursor_x1                 = -1;
+	eti->cursor_x1                 = -1;
 	eti->cursor_y1                 = -1;
 	eti->cursor_x2                 = -1;
 	eti->cursor_y2                 = -1;
@@ -2626,7 +2626,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 			cross->crossing.time = e->motion.time;
 			return_val = eti_e_cell_event (eti, eti->cell_views [eti->motion_col],
 						       cross, cross->crossing.time,
-					               view_to_model_col(eti, eti->motion_col),
+						       view_to_model_col(eti, eti->motion_col),
 						       eti->motion_col, eti->motion_row, 0);
 		}
 
@@ -2910,7 +2910,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 		if (eti->motion_row != -1 && eti->motion_col != -1)
 			return_val = eti_e_cell_event (eti, eti->cell_views [eti->motion_col],
 						       e, e->crossing.time,
-					               view_to_model_col(eti, eti->motion_col),
+						       view_to_model_col(eti, eti->motion_col),
 						       eti->motion_col, eti->motion_row, 0);
 		eti->motion_row = -1;
 		eti->motion_col = -1;
@@ -2952,7 +2952,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 static void
 eti_style_set (ETableItem *eti, GtkStyle *previous_style)
 {
- 	if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED))
+	if (!(GTK_OBJECT_FLAGS(eti) & GNOME_CANVAS_ITEM_REALIZED))
 		return;
 
 	if (eti->cell_views_realized) {
diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h
index 0536367c99..f149656fac 100644
--- a/widgets/table/e-table-item.h
+++ b/widgets/table/e-table-item.h
@@ -91,15 +91,15 @@ typedef struct {
 	GdkBitmap       *stipple;
 
 	guint		 alternating_row_colors:1;
-	guint 		 horizontal_draw_grid:1;
-	guint 		 vertical_draw_grid:1;
-	guint 		 draw_focus:1;
-	guint 		 uniform_row_height:1;
-	guint 		 cell_views_realized:1;
+	guint		 horizontal_draw_grid:1;
+	guint		 vertical_draw_grid:1;
+	guint		 draw_focus:1;
+	guint		 uniform_row_height:1;
+	guint		 cell_views_realized:1;
 
-	guint 		 needs_redraw : 1;
-	guint 		 needs_compute_height : 1;
-	guint 		 needs_compute_width : 1;
+	guint		 needs_redraw : 1;
+	guint		 needs_compute_height : 1;
+	guint		 needs_compute_width : 1;
 
 	guint            uses_source_model : 1;
 
@@ -124,10 +124,10 @@ typedef struct {
 	gint              cursor_x2;
 	gint              cursor_y2;
 
-	gint    		 drag_col;
-	gint    		 drag_row;
-	gint    		 drag_x;
-	gint    		 drag_y;
+	gint		 drag_col;
+	gint		 drag_row;
+	gint		 drag_x;
+	gint		 drag_y;
 	guint            drag_state;
 
 	/*
diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c
index 82b2d5b37d..c4d5574dbc 100644
--- a/widgets/table/e-table-sorted-variable.c
+++ b/widgets/table/e-table-sorted-variable.c
@@ -53,7 +53,7 @@ etsv_dispose (GObject *object)
 
 	if (etsv->sort_info_changed_id)
 		g_signal_handler_disconnect (G_OBJECT (etsv->sort_info),
-				             etsv->sort_info_changed_id);
+					     etsv->sort_info_changed_id);
 	etsv->sort_info_changed_id = 0;
 
 	if (etsv->sort_idle_id) {
diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c
index 7eceeb875f..ae9bbbd3eb 100644
--- a/widgets/table/e-table-sorted.c
+++ b/widgets/table/e-table-sorted.c
@@ -64,7 +64,7 @@ ets_dispose (GObject *object)
 
 	if (ets->sort_info) {
 		g_signal_handler_disconnect (G_OBJECT (ets->sort_info),
-				             ets->sort_info_changed_id);
+					     ets->sort_info_changed_id);
 		g_object_unref(ets->sort_info);
 		ets->sort_info = NULL;
 	}
@@ -199,7 +199,7 @@ ets_proxy_model_cell_changed (ETableSubset *subset, ETableModel *source, gint co
 static void
 ets_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *source, gint row, gint count)
 {
- 	ETableModel *etm = E_TABLE_MODEL(etss);
+	ETableModel *etm = E_TABLE_MODEL(etss);
 	ETableSorted *ets = E_TABLE_SORTED(etss);
 	gint i;
 	gboolean full_change = FALSE;
diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c
index 8851f31209..4d3148a902 100644
--- a/widgets/table/e-table-sorter.c
+++ b/widgets/table/e-table-sorter.c
@@ -44,20 +44,20 @@ G_DEFINE_TYPE (ETableSorter, ets, E_SORTER_TYPE)
 
 #define INCREMENT_AMOUNT 100
 
-static void    	ets_model_changed      (ETableModel *etm, ETableSorter *ets);
-static void    	ets_model_row_changed  (ETableModel *etm, gint row, ETableSorter *ets);
-static void    	ets_model_cell_changed (ETableModel *etm, gint col, gint row, ETableSorter *ets);
-static void    	ets_model_rows_inserted (ETableModel *etm, gint row, gint count, ETableSorter *ets);
-static void    	ets_model_rows_deleted (ETableModel *etm, gint row, gint count, ETableSorter *ets);
-static void    	ets_sort_info_changed  (ETableSortInfo *info, ETableSorter *ets);
-static void    	ets_clean              (ETableSorter *ets);
-static void    	ets_sort               (ETableSorter *ets);
-static void    	ets_backsort           (ETableSorter *ets);
-
-static gint    	ets_model_to_sorted           (ESorter *sorter, gint row);
-static gint    	ets_sorted_to_model           (ESorter *sorter, gint row);
-static void    	ets_get_model_to_sorted_array (ESorter *sorter, gint **array, gint *count);
-static void    	ets_get_sorted_to_model_array (ESorter *sorter, gint **array, gint *count);
+static void	ets_model_changed      (ETableModel *etm, ETableSorter *ets);
+static void	ets_model_row_changed  (ETableModel *etm, gint row, ETableSorter *ets);
+static void	ets_model_cell_changed (ETableModel *etm, gint col, gint row, ETableSorter *ets);
+static void	ets_model_rows_inserted (ETableModel *etm, gint row, gint count, ETableSorter *ets);
+static void	ets_model_rows_deleted (ETableModel *etm, gint row, gint count, ETableSorter *ets);
+static void	ets_sort_info_changed  (ETableSortInfo *info, ETableSorter *ets);
+static void	ets_clean              (ETableSorter *ets);
+static void	ets_sort               (ETableSorter *ets);
+static void	ets_backsort           (ETableSorter *ets);
+
+static gint	ets_model_to_sorted           (ESorter *sorter, gint row);
+static gint	ets_sorted_to_model           (ESorter *sorter, gint row);
+static void	ets_get_model_to_sorted_array (ESorter *sorter, gint **array, gint *count);
+static void	ets_get_sorted_to_model_array (ESorter *sorter, gint **array, gint *count);
 static gboolean ets_needs_sorting             (ESorter *ets);
 
 static void
@@ -210,7 +210,7 @@ e_table_sorter_new (ETableModel *source, ETableHeader *full_header, ETableSortIn
 	ets->table_model_row_changed_id = g_signal_connect (source, "model_row_changed",
 							G_CALLBACK (ets_model_row_changed), ets);
 	ets->table_model_cell_changed_id = g_signal_connect (source, "model_cell_changed",
-						        G_CALLBACK (ets_model_cell_changed), ets);
+							G_CALLBACK (ets_model_cell_changed), ets);
 	ets->table_model_rows_inserted_id = g_signal_connect (source, "model_rows_inserted",
 							G_CALLBACK (ets_model_rows_inserted), ets);
 	ets->table_model_rows_deleted_id = g_signal_connect (source, "model_rows_deleted",
diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c
index fd57f5b130..e7acd90f34 100644
--- a/widgets/table/e-table-specification.c
+++ b/widgets/table/e-table-specification.c
@@ -217,7 +217,7 @@ e_table_specification_load_from_node (ETableSpecification *specification,
 	temp = e_xml_get_string_prop_by_name (node, (const guchar *)"cursor-mode");
 	if (temp && !g_ascii_strcasecmp (temp, "line")) {
 		specification->cursor_mode = E_CURSOR_LINE;
-	} else 	if (temp && !g_ascii_strcasecmp (temp, "spreadsheet")) {
+	} else	if (temp && !g_ascii_strcasecmp (temp, "spreadsheet")) {
 		specification->cursor_mode = E_CURSOR_SPREADSHEET;
 	}
 	g_free (temp);
diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c
index 6b856274a4..fc7cb101ec 100644
--- a/widgets/table/e-table-without.c
+++ b/widgets/table/e-table-without.c
@@ -262,9 +262,9 @@ e_table_without_construct (ETableWithout                 *etw,
 	E_TABLE_SUBSET(etw)->n_map = 0;
 
 	etw->priv->hash_func                = hash_func;
-	etw->priv->compare_func 	    = compare_func;
-	etw->priv->get_key_func 	    = get_key_func;
-	etw->priv->duplicate_key_func 	    = duplicate_key_func;
+	etw->priv->compare_func	    = compare_func;
+	etw->priv->get_key_func	    = get_key_func;
+	etw->priv->duplicate_key_func	    = duplicate_key_func;
 	etw->priv->free_gotten_key_func     = free_gotten_key_func;
 	etw->priv->free_duplicated_key_func = free_duplicated_key_func;
 	etw->priv->closure                  = closure;
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 1c86a4415c..29eb9ac481 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -168,19 +168,19 @@ et_disconnect_model (ETable *et)
 
 	if (et->table_model_change_id != 0)
 		g_signal_handler_disconnect (G_OBJECT (et->model),
-				             et->table_model_change_id);
+					     et->table_model_change_id);
 	if (et->table_row_change_id != 0)
 		g_signal_handler_disconnect (G_OBJECT (et->model),
-				             et->table_row_change_id);
+					     et->table_row_change_id);
 	if (et->table_cell_change_id != 0)
 		g_signal_handler_disconnect (G_OBJECT (et->model),
-				             et->table_cell_change_id);
+					     et->table_cell_change_id);
 	if (et->table_rows_inserted_id != 0)
 		g_signal_handler_disconnect (G_OBJECT (et->model),
-				             et->table_rows_inserted_id);
+					     et->table_rows_inserted_id);
 	if (et->table_rows_deleted_id != 0)
 		g_signal_handler_disconnect (G_OBJECT (et->model),
-				             et->table_rows_deleted_id);
+					     et->table_rows_deleted_id);
 
 	et->table_model_change_id = 0;
 	et->table_row_change_id = 0;
@@ -307,23 +307,23 @@ et_dispose (GObject *object)
 	if (et->search) {
 		if (et->search_search_id)
 			g_signal_handler_disconnect (G_OBJECT (et->search),
-					             et->search_search_id);
+						     et->search_search_id);
 		if (et->search_accept_id)
 			g_signal_handler_disconnect (G_OBJECT (et->search),
-					             et->search_accept_id);
+						     et->search_accept_id);
 		g_object_unref (et->search);
 		et->search = NULL;
 	}
 
 	if (et->group_info_change_id) {
 		g_signal_handler_disconnect (G_OBJECT (et->sort_info),
-				             et->group_info_change_id);
+					     et->group_info_change_id);
 		et->group_info_change_id = 0;
 	}
 
 	if (et->sort_info_change_id) {
 		g_signal_handler_disconnect (G_OBJECT (et->sort_info),
-				             et->sort_info_change_id);
+					     et->sort_info_change_id);
 		et->sort_info_change_id = 0;
 	}
 
@@ -1115,7 +1115,7 @@ table_canvas_focus_event_cb (GtkWidget *widget, GdkEventFocus *event, gpointer d
 		gnome_canvas_item_grab_focus (etable->canvas_vbox);
 		gnome_canvas_item_grab_focus (etable->click_to_add);
 	} else if (!canvas->focused_item && etable->group) {
-        	focus_first_etable_item (etable->group);
+		focus_first_etable_item (etable->group);
 	} else if (canvas->focused_item) {
 		ESelectionModel *selection = (ESelectionModel *)etable->selection;
 
@@ -2454,7 +2454,7 @@ struct _ETableDragSourceSite
 	GdkModifierType    start_button_mask;
 	GtkTargetList     *target_list;        /* Targets for drag data */
 	GdkDragAction      actions;            /* Possible actions */
-	GdkColormap       *colormap;	         /* Colormap for drag icon */
+	GdkColormap       *colormap;		 /* Colormap for drag icon */
 	GdkPixmap         *pixmap;             /* Icon for drag data */
 	GdkBitmap         *mask;
 
@@ -2795,8 +2795,8 @@ e_table_drag_source_unset (ETable *table)
  **/
 GdkDragContext *
 e_table_drag_begin (ETable            *table,
-		    gint     	       row,
-		    gint     	       col,
+		    gint	       row,
+		    gint	       col,
 		    GtkTargetList     *targets,
 		    GdkDragAction      actions,
 		    gint               button,
diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h
index 7d3d0ff8cb..bb82ef1613 100644
--- a/widgets/table/e-table.h
+++ b/widgets/table/e-table.h
@@ -77,8 +77,8 @@ typedef struct {
 
 	ETableCol        *current_search_col;
 
-	guint   	  search_search_id;
-	guint   	  search_accept_id;
+	guint	  search_search_id;
+	guint	  search_accept_id;
 
 	gint table_model_change_id;
 	gint table_row_change_id;
@@ -174,11 +174,11 @@ typedef struct {
 					   GtkAdjustment *vadjustment);
 
 	/* Source side drag signals */
-	void (* table_drag_begin)	           (ETable	       *table,
+	void (* table_drag_begin)		   (ETable	       *table,
 						    gint                 row,
 						    gint                 col,
 						    GdkDragContext     *context);
-	void (* table_drag_end)	           (ETable	       *table,
+	void (* table_drag_end)		   (ETable	       *table,
 					    gint                 row,
 					    gint                 col,
 					    GdkDragContext     *context);
@@ -195,7 +195,7 @@ typedef struct {
 						  GdkDragContext     *context);
 
 	/* Target side drag signals */
-	void (* table_drag_leave)	           (ETable	       *table,
+	void (* table_drag_leave)		   (ETable	       *table,
 						    gint                 row,
 						    gint                 col,
 						    GdkDragContext     *context,
diff --git a/widgets/table/e-tree-memory-callbacks.c b/widgets/table/e-tree-memory-callbacks.c
index 25175c9797..562a47386c 100644
--- a/widgets/table/e-tree-memory-callbacks.c
+++ b/widgets/table/e-tree-memory-callbacks.c
@@ -277,7 +277,7 @@ e_tree_memory_callbacks_new  (ETreeMemoryCallbacksIconAtFn icon_at,
 	etmc->has_get_node_by_id = has_get_node_by_id;
 	etmc->get_node_by_id     = get_node_by_id;
 
-	etmc->sort_value_at 	 = sort_value_at;
+	etmc->sort_value_at	 = sort_value_at;
 	etmc->value_at           = value_at;
 	etmc->set_value_at       = set_value_at;
 	etmc->is_editable        = is_editable;
diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c
index 728392f7b0..54bd7b77f5 100644
--- a/widgets/table/e-tree-memory.c
+++ b/widgets/table/e-tree-memory.c
@@ -274,7 +274,7 @@ etmm_get_prev (ETreeModel *etm, ETreePath node)
 static gboolean
 etmm_is_root (ETreeModel *etm, ETreePath node)
 {
- 	ETreeMemoryPath *path = node;
+	ETreeMemoryPath *path = node;
 	return e_tree_memory_path_depth (path) == 0;
 }
 
diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c
index 9482fe9789..143ad61629 100644
--- a/widgets/table/e-tree-model.c
+++ b/widgets/table/e-tree-model.c
@@ -180,7 +180,7 @@ e_tree_model_class_init (ETreeModelClass *klass)
 
 	klass->has_change_pending    = NULL;
 
-	klass->sort_value_at 	  = NULL;
+	klass->sort_value_at	  = NULL;
 	klass->value_at              = NULL;
 	klass->set_value_at          = NULL;
 	klass->is_editable           = NULL;
@@ -193,7 +193,7 @@ e_tree_model_class_init (ETreeModelClass *klass)
 
 	klass->pre_change            = NULL;
 	klass->no_change             = NULL;
-	klass->rebuilt	             = NULL;
+	klass->rebuilt		     = NULL;
 	klass->node_changed          = NULL;
 	klass->node_data_changed     = NULL;
 	klass->node_col_changed      = NULL;
diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c
index 68316f72bb..3bb4375b4d 100644
--- a/widgets/table/e-tree-selection-model.c
+++ b/widgets/table/e-tree-selection-model.c
@@ -241,21 +241,21 @@ drop_model(ETreeSelectionModel *etsm)
 		return;
 
 	g_signal_handler_disconnect (G_OBJECT (priv->model),
-			             priv->tree_model_pre_change_id);
+				     priv->tree_model_pre_change_id);
 	g_signal_handler_disconnect (G_OBJECT (priv->model),
-			             priv->tree_model_no_change_id);
+				     priv->tree_model_no_change_id);
 	g_signal_handler_disconnect (G_OBJECT (priv->model),
-			             priv->tree_model_node_changed_id);
+				     priv->tree_model_node_changed_id);
 	g_signal_handler_disconnect (G_OBJECT (priv->model),
-			             priv->tree_model_node_data_changed_id);
+				     priv->tree_model_node_data_changed_id);
 	g_signal_handler_disconnect (G_OBJECT (priv->model),
-			             priv->tree_model_node_col_changed_id);
+				     priv->tree_model_node_col_changed_id);
 	g_signal_handler_disconnect (G_OBJECT (priv->model),
-			             priv->tree_model_node_inserted_id);
+				     priv->tree_model_node_inserted_id);
 	g_signal_handler_disconnect (G_OBJECT (priv->model),
-			             priv->tree_model_node_removed_id);
+				     priv->tree_model_node_removed_id);
 	g_signal_handler_disconnect (G_OBJECT (priv->model),
-			             priv->tree_model_node_deleted_id);
+				     priv->tree_model_node_deleted_id);
 
 	g_object_unref (priv->model);
 	priv->model = NULL;
diff --git a/widgets/table/e-tree-simple.c b/widgets/table/e-tree-simple.c
index 2704b7ea24..b71f108a7d 100644
--- a/widgets/table/e-tree-simple.c
+++ b/widgets/table/e-tree-simple.c
@@ -182,12 +182,12 @@ e_tree_simple_new  (ETableSimpleColumnCountFn     col_count,
 		    ETableSimpleValueIsEmptyFn    value_is_empty,
 		    ETableSimpleValueToStringFn   value_to_string,
 
-		    ETreeSimpleIconAtFn      	  icon_at,
-		    ETreeSimpleValueAtFn     	  value_at,
-		    ETreeSimpleSetValueAtFn  	  set_value_at,
-		    ETreeSimpleIsEditableFn  	  is_editable,
+		    ETreeSimpleIconAtFn	  icon_at,
+		    ETreeSimpleValueAtFn	  value_at,
+		    ETreeSimpleSetValueAtFn	  set_value_at,
+		    ETreeSimpleIsEditableFn	  is_editable,
 
-		    gpointer                 	  model_data)
+		    gpointer			  model_data)
 {
 	ETreeSimple *etg = g_object_new (E_TREE_SIMPLE_TYPE, NULL);
 
diff --git a/widgets/table/e-tree-sorted-variable.c b/widgets/table/e-tree-sorted-variable.c
index 0bc82506e8..d9901e611b 100644
--- a/widgets/table/e-tree-sorted-variable.c
+++ b/widgets/table/e-tree-sorted-variable.c
@@ -63,7 +63,7 @@ etsv_dispose (GObject *object)
 
 	if (etsv->table_model_changed_id)
 		g_signal_handler_disconnect (G_OBJECT (etss->source),
-				             etsv->table_model_changed_id);
+					     etsv->table_model_changed_id);
 	etsv->table_model_changed_id = 0;
 
 #if 0
@@ -77,7 +77,7 @@ etsv_dispose (GObject *object)
 #endif
 	if (etsv->sort_info_changed_id)
 		g_signal_handler_disconnect (etsv->sort_info,
-				             etsv->sort_info_changed_id);
+					     etsv->sort_info_changed_id);
 	etsv->sort_info_changed_id = 0;
 
 	if (etsv->sort_idle_id)
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c
index 3ec12c8360..c72c269471 100644
--- a/widgets/table/e-tree-sorted.c
+++ b/widgets/table/e-tree-sorted.c
@@ -593,23 +593,23 @@ ets_dispose (GObject *object)
 
 	if (priv->source) {
 		g_signal_handler_disconnect (G_OBJECT (priv->source),
-				             priv->tree_model_pre_change_id);
+					     priv->tree_model_pre_change_id);
 		g_signal_handler_disconnect (G_OBJECT (priv->source),
-				             priv->tree_model_no_change_id);
+					     priv->tree_model_no_change_id);
 		g_signal_handler_disconnect (G_OBJECT (priv->source),
-				             priv->tree_model_node_changed_id);
+					     priv->tree_model_node_changed_id);
 		g_signal_handler_disconnect (G_OBJECT (priv->source),
-				             priv->tree_model_node_data_changed_id);
+					     priv->tree_model_node_data_changed_id);
 		g_signal_handler_disconnect (G_OBJECT (priv->source),
-				             priv->tree_model_node_col_changed_id);
+					     priv->tree_model_node_col_changed_id);
 		g_signal_handler_disconnect (G_OBJECT (priv->source),
-				             priv->tree_model_node_inserted_id);
+					     priv->tree_model_node_inserted_id);
 		g_signal_handler_disconnect (G_OBJECT (priv->source),
-				             priv->tree_model_node_removed_id);
+					     priv->tree_model_node_removed_id);
 		g_signal_handler_disconnect (G_OBJECT (priv->source),
-				             priv->tree_model_node_deleted_id);
+					     priv->tree_model_node_deleted_id);
 		g_signal_handler_disconnect (G_OBJECT (priv->source),
-				             priv->tree_model_node_request_collapse_id);
+					     priv->tree_model_node_request_collapse_id);
 
 		g_object_unref (priv->source);
 		priv->source = NULL;
@@ -627,7 +627,7 @@ ets_dispose (GObject *object)
 
 	if (priv->sort_info) {
 		g_signal_handler_disconnect (G_OBJECT (priv->sort_info),
-				             priv->sort_info_changed_id);
+					     priv->sort_info_changed_id);
 		priv->sort_info_changed_id = 0;
 
 		g_object_unref (priv->sort_info);
@@ -746,7 +746,7 @@ ets_get_prev (ETreeModel *etm, ETreePath node)
 static gboolean
 ets_is_root (ETreeModel *etm, ETreePath node)
 {
- 	ETreeSortedPath *path = node;
+	ETreeSortedPath *path = node;
 	ETreeSorted *ets = E_TREE_SORTED(etm);
 
 	return e_tree_model_node_is_root (ets->priv->source, path->corresponding);
@@ -755,7 +755,7 @@ ets_is_root (ETreeModel *etm, ETreePath node)
 static gboolean
 ets_is_expandable (ETreeModel *etm, ETreePath node)
 {
- 	ETreeSortedPath *path = node;
+	ETreeSortedPath *path = node;
 	ETreeSorted *ets = E_TREE_SORTED(etm);
 	gboolean expandable = e_tree_model_node_is_expandable (ets->priv->source, path->corresponding);
 
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index 2018ea59bb..cac1260681 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -60,8 +60,8 @@ struct ETreeTableAdapterPriv {
 	ETableSortInfo *sort_info;
 	ETableHeader   *header;
 
-	gint    	     n_map;
-	gint    	     n_vals_allocated;
+	gint	     n_map;
+	gint	     n_vals_allocated;
 	node_t     **map_table;
 	GHashTable  *nodes;
 	GNode       *root;
@@ -864,7 +864,7 @@ e_tree_table_adapter_construct (ETreeTableAdapter *etta, ETreeModel *source, ETa
 	if (sort_info) {
 		g_object_ref(sort_info);
 		etta->priv->sort_info_changed_id = g_signal_connect (G_OBJECT (sort_info), "sort_info_changed",
-				                                     G_CALLBACK (etta_sort_info_changed), etta);
+								     G_CALLBACK (etta_sort_info_changed), etta);
 	}
 
 	etta->priv->header = header;
@@ -1247,7 +1247,7 @@ e_tree_table_adapter_set_sort_info (ETreeTableAdapter *etta, ETableSortInfo *sor
 {
 	if (etta->priv->sort_info) {
 		g_signal_handler_disconnect(G_OBJECT(etta->priv->sort_info),
-				            etta->priv->sort_info_changed_id);
+					    etta->priv->sort_info_changed_id);
 		g_object_unref(etta->priv->sort_info);
 	}
 
@@ -1255,7 +1255,7 @@ e_tree_table_adapter_set_sort_info (ETreeTableAdapter *etta, ETableSortInfo *sor
 	if (sort_info) {
 		g_object_ref(sort_info);
 		etta->priv->sort_info_changed_id = g_signal_connect(G_OBJECT(sort_info), "sort_info_changed",
-				                                    G_CALLBACK(etta_sort_info_changed), etta);
+								    G_CALLBACK(etta_sort_info_changed), etta);
 	}
 
 	if (!etta->priv->root)
diff --git a/widgets/table/e-tree-table-adapter.h b/widgets/table/e-tree-table-adapter.h
index 6a0f67bca8..596a3def1f 100644
--- a/widgets/table/e-tree-table-adapter.h
+++ b/widgets/table/e-tree-table-adapter.h
@@ -58,7 +58,7 @@ ETableModel *e_tree_table_adapter_new                        (ETreeModel
 							      ETableHeader	*header);
 ETableModel *e_tree_table_adapter_construct                  (ETreeTableAdapter *ets,
 							      ETreeModel        *source,
-		      					      ETableSortInfo    *sort_info,
+							      ETableSortInfo    *sort_info,
 							      ETableHeader	*header);
 
 ETreePath    e_tree_table_adapter_node_get_next              (ETreeTableAdapter *etta,
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 725654b90e..6e9b2f8d90 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -127,8 +127,8 @@ struct ETreePriv {
 
 	ETableCol        *current_search_col;
 
-	guint   	  search_search_id;
-	guint   	  search_accept_id;
+	guint	  search_search_id;
+	guint	  search_accept_id;
 
 	gint reflow_idle_id;
 	gint scroll_idle_id;
@@ -251,16 +251,16 @@ et_disconnect_from_etta (ETree *et)
 {
 	if (et->priv->table_model_change_id != 0)
 		g_signal_handler_disconnect (G_OBJECT (et->priv->etta),
-				             et->priv->table_model_change_id);
+					     et->priv->table_model_change_id);
 	if (et->priv->table_row_change_id != 0)
 		g_signal_handler_disconnect (G_OBJECT (et->priv->etta),
-				             et->priv->table_row_change_id);
+					     et->priv->table_row_change_id);
 	if (et->priv->table_cell_change_id != 0)
 		g_signal_handler_disconnect (G_OBJECT (et->priv->etta),
-				             et->priv->table_cell_change_id);
+					     et->priv->table_cell_change_id);
 	if (et->priv->table_rows_delete_id != 0)
 		g_signal_handler_disconnect (G_OBJECT (et->priv->etta),
-				             et->priv->table_rows_delete_id);
+					     et->priv->table_rows_delete_id);
 
 	et->priv->table_model_change_id = 0;
 	et->priv->table_row_change_id = 0;
@@ -316,17 +316,17 @@ disconnect_header (ETree *e_tree)
 
 	if (e_tree->priv->structure_change_id)
 		g_signal_handler_disconnect (G_OBJECT (e_tree->priv->header),
-				       	     e_tree->priv->structure_change_id);
+					     e_tree->priv->structure_change_id);
 	if (e_tree->priv->expansion_change_id)
 		g_signal_handler_disconnect (G_OBJECT (e_tree->priv->header),
-				       	     e_tree->priv->expansion_change_id);
+					     e_tree->priv->expansion_change_id);
 	if (e_tree->priv->sort_info) {
 		if (e_tree->priv->sort_info_change_id)
 			g_signal_handler_disconnect (G_OBJECT (e_tree->priv->sort_info),
-					             e_tree->priv->sort_info_change_id);
+						     e_tree->priv->sort_info_change_id);
 		if (e_tree->priv->group_info_change_id)
 			g_signal_handler_disconnect (G_OBJECT (e_tree->priv->sort_info),
-					             e_tree->priv->group_info_change_id);
+						     e_tree->priv->group_info_change_id);
 
 		g_object_unref(e_tree->priv->sort_info);
 	}
@@ -793,7 +793,7 @@ tree_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc,
 							&row, &col, &x, &y, &w, &h);
 	}
 
- 	if (y < adj->value || y + h > adj->value + adj->page_size)
+	if (y < adj->value || y + h > adj->value + adj->page_size)
 		gtk_adjustment_set_value(adj, CLAMP(y - adj->page_size / 2, adj->lower, adj->upper - adj->page_size));
 }
 
@@ -2254,7 +2254,7 @@ struct _ETreeDragSourceSite
 	GdkModifierType    start_button_mask;
 	GtkTargetList     *target_list;        /* Targets for drag data */
 	GdkDragAction      actions;            /* Possible actions */
-	GdkColormap       *colormap;	         /* Colormap for drag icon */
+	GdkColormap       *colormap;		 /* Colormap for drag icon */
 	GdkPixmap         *pixmap;             /* Icon for drag data */
 	GdkBitmap         *mask;
 
@@ -2545,8 +2545,8 @@ e_tree_drag_source_unset (ETree *tree)
 
 GdkDragContext *
 e_tree_drag_begin (ETree            *tree,
-		   gint     	       row,
-		   gint     	       col,
+		   gint	       row,
+		   gint	       col,
 		   GtkTargetList     *targets,
 		   GdkDragAction      actions,
 		   gint               button,
@@ -2900,7 +2900,7 @@ static void
 context_connect (ETree *et, GdkDragContext *context)
 {
 	if (context == et->priv->last_drop_context)
-       		return;
+		return;
 
 	if (et->priv->last_drop_context)
 		g_object_weak_unref (G_OBJECT(et->priv->last_drop_context), context_destroyed, et);
diff --git a/widgets/table/e-tree.h b/widgets/table/e-tree.h
index 6bcc21706e..b74615662f 100644
--- a/widgets/table/e-tree.h
+++ b/widgets/table/e-tree.h
@@ -76,12 +76,12 @@ typedef struct {
 					   GtkAdjustment *vadjustment);
 
 	/* Source side drag signals */
-	void (* tree_drag_begin)	           (ETree	       *tree,
+	void (* tree_drag_begin)		   (ETree	       *tree,
 						    gint                 row,
 						    ETreePath           path,
 						    gint                 col,
 						    GdkDragContext     *context);
-	void (* tree_drag_end)	           (ETree	       *tree,
+	void (* tree_drag_end)		   (ETree	       *tree,
 					    gint                 row,
 					    ETreePath           path,
 					    gint                 col,
@@ -101,7 +101,7 @@ typedef struct {
 						 GdkDragContext     *context);
 
 	/* Target side drag signals */
-	void (* tree_drag_leave)	           (ETree	       *tree,
+	void (* tree_drag_leave)		   (ETree	       *tree,
 						    gint                 row,
 						    ETreePath           path,
 						    gint                 col,
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index c4d3dbef34..b63771500a 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -436,8 +436,8 @@ reset_layout (EText *text)
 			pango_font_description_get_family ((GTK_WIDGET (item->canvas))->style->font_desc));
 		pango_layout_set_font_description (text->layout, text->font_desc);
 
- 		pango_layout_set_text (text->layout, text->text, -1);
- 		reset_layout_attrs (text);
+		pango_layout_set_text (text->layout, text->text, -1);
+		reset_layout_attrs (text);
 	}
 
 	if (!text->button_down) {
@@ -2226,7 +2226,7 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event)
 				 * Here when a new text widget comes into focus we can disconnect the
 				 * old one.Shouldn't hurt much, as in worst case, save_text which should
 				 * be disconnected will be overwritten and we will have signal
-			   	 * handlers connect to  multiple e-texts but with subsequent commit these
+				 * handlers connect to  multiple e-texts but with subsequent commit these
 				 * should go away.
 				 */
 
@@ -2753,7 +2753,7 @@ popup_targets_received (GtkClipboard     *clipboard,
 
       /* If invoked by S-F10 key binding, button will be 0. */
       if (button->button == 0){
-      	      gtk_menu_popup (GTK_MENU (popup_menu), NULL, NULL,
+	      gtk_menu_popup (GTK_MENU (popup_menu), NULL, NULL,
 			      popup_menu_placement_cb, (gpointer)text,
 			      button->button, GDK_CURRENT_TIME);
       } else {
@@ -3911,15 +3911,15 @@ e_text_preedit_changed_cb (GtkIMContext *context,
 			   EText        *etext)
 {
 	gchar *preedit_string = NULL;
- 	gint cursor_pos;
+	gint cursor_pos;
 
 	gtk_im_context_get_preedit_string (context, &preedit_string,
 					   NULL, &cursor_pos);
 
- 	cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1));
+	cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1));
 	etext->preedit_len = strlen (preedit_string);
- 	etext->preedit_pos = g_utf8_offset_to_pointer (preedit_string, cursor_pos) - preedit_string;
- 	g_free (preedit_string);
+	etext->preedit_pos = g_utf8_offset_to_pointer (preedit_string, cursor_pos) - preedit_string;
+	g_free (preedit_string);
 
 	g_signal_emit (etext, e_text_signals[E_TEXT_KEYPRESS], 0, 0, 0);
 }
@@ -3943,7 +3943,7 @@ e_text_delete_surrounding_cb   (GtkIMContext *context,
 				EText        *text)
 {
 	e_text_model_delete (text->model,
-		             MIN (text->selection_start, text->selection_end) + offset,
+			     MIN (text->selection_start, text->selection_end) + offset,
 			     n_chars);
 
 	return TRUE;
diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h
index f9b838aae3..5f6904b14a 100644
--- a/widgets/text/e-text.h
+++ b/widgets/text/e-text.h
@@ -109,8 +109,8 @@ struct _EText {
 	gint model_repos_signal_id;
 
 	const gchar *text;              /* Text to display --- from the ETextModel */
-	gint preedit_len;      		/* preedit length to display */
-	gint preedit_pos;      		/* preedit cursor position */
+	gint preedit_len;		/* preedit length to display */
+	gint preedit_pos;		/* preedit cursor position */
 	PangoLayout *layout;
 	gint num_lines;			/* Number of lines of text */
 
@@ -124,7 +124,7 @@ struct _EText {
 
 	double xofs, yofs;		/* Text offset distance from anchor position */
 
-	GdkColor color; 		/* Fill color */
+	GdkColor color;		/* Fill color */
 	GdkBitmap *stipple;		/* Stipple for text */
 	GdkGC *gc;			/* GC for drawing text */