Whitespace cleanup.

21 files changed, 64 insertions, 64 deletions

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);
 
 	}