Whitespace cleanup.

43 files changed, 167 insertions, 167 deletions

diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c
index 41744fc641..c6a7b94db1 100644
--- a/plugins/audio-inline/audio-inline.c
+++ b/plugins/audio-inline/audio-inline.c
@@ -135,7 +135,7 @@ org_gnome_audio_inline_set_audiosink (GstElement *playbin)
 	}
 
 	if (audiosink) {
-        	g_object_set (playbin, "audio-sink", audiosink, NULL);
+		g_object_set (playbin, "audio-sink", audiosink, NULL);
 	}
 }
 
@@ -174,7 +174,7 @@ org_gnome_audio_inline_gst_callback (GstBus * bus, GstMessage * message, gpointe
 			      if (po->pause_button)
 					gtk_widget_set_sensitive (po->pause_button, new_state > GST_STATE_PAUSED);
 			      if (po->stop_button)
-				      	gtk_widget_set_sensitive (po->stop_button, new_state >= GST_STATE_PAUSED);
+					gtk_widget_set_sensitive (po->stop_button, new_state >= GST_STATE_PAUSED);
 			}
 
 			break;
diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c
index 92d36e71d8..e550851762 100644
--- a/plugins/backup-restore/backup-restore.c
+++ b/plugins/backup-restore/backup-restore.c
@@ -138,10 +138,10 @@ org_gnome_backup_restore_backup (EPlugin *ep, ESMenuTargetShell *target)
 
 	dlg = e_file_get_save_filesel(target->target.widget, _("Select name of the Evolution backup file"), NULL, GTK_FILE_CHOOSER_ACTION_SAVE);
 
-/* 	dlg = gtk_file_chooser_dialog_new (_("Select name of the Evolution backup file"), GTK_WINDOW (target->target.widget),  */
-/* 					   GTK_FILE_CHOOSER_ACTION_SAVE,  */
-/* 					   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,  */
-/* 					   GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL); */
+/*	dlg = gtk_file_chooser_dialog_new (_("Select name of the Evolution backup file"), GTK_WINDOW (target->target.widget),  */
+/*					   GTK_FILE_CHOOSER_ACTION_SAVE,  */
+/*					   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,  */
+/*					   GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL); */
 
 	gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dlg), "evolution-backup.tar.gz");
 
@@ -190,10 +190,10 @@ org_gnome_backup_restore_restore (EPlugin *ep, ESMenuTargetShell *target)
 
 	dlg = e_file_get_save_filesel(target->target.widget, _("Select name of the Evolution backup file to restore"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN);
 
-/* 	dlg = gtk_file_chooser_dialog_new (_("Select Evolution backup file to restore"), GTK_WINDOW (target->target.widget),  */
-/* 					   GTK_FILE_CHOOSER_ACTION_OPEN,  */
-/* 					   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,  */
-/* 					   GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); */
+/*	dlg = gtk_file_chooser_dialog_new (_("Select Evolution backup file to restore"), GTK_WINDOW (target->target.widget),  */
+/*					   GTK_FILE_CHOOSER_ACTION_OPEN,  */
+/*					   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,  */
+/*					   GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); */
 
 	vbox = gtk_vbox_new (FALSE, 6);
 	gtk_widget_show (vbox);
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index 67dea3e6a3..92adb2d7a4 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -408,12 +408,12 @@ main (gint argc, gchar **argv)
 		gtk_window_set_default_icon_name ("evolution");
 
 		/* Backup / Restore only can have GUI. We should restrict the rest */
-	 	progress_dialog = gtk_dialog_new_with_buttons (backup_op ? _("Evolution Backup"): _("Evolution Restore"),
-        	                                          NULL,
-                	                                  GTK_DIALOG_MODAL,
-                        	                          GTK_STOCK_CANCEL,
-                                	                  GTK_RESPONSE_REJECT,
-                                        	          NULL);
+		progress_dialog = gtk_dialog_new_with_buttons (backup_op ? _("Evolution Backup"): _("Evolution Restore"),
+							  NULL,
+							  GTK_DIALOG_MODAL,
+							  GTK_STOCK_CANCEL,
+							  GTK_RESPONSE_REJECT,
+							  NULL);
 
 		gtk_dialog_set_has_separator (GTK_DIALOG (progress_dialog), FALSE);
 		gtk_container_set_border_width (GTK_CONTAINER (progress_dialog), 12);
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index 8cd8535a73..bb11ab9c6d 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -108,7 +108,7 @@ find_esource_by_uri (ESourceList *source_list, const gchar *target_uri)
 gint
 e_plugin_lib_enable (EPluginLib *ep, gint enable)
 {
- 	/* Start up the plugin. */
+	/* Start up the plugin. */
 	if (enable) {
 		d(fprintf (stderr, "BBDB spinning up...\n"));
 
@@ -236,7 +236,7 @@ walk_destinations_and_free (EDestination **dests)
 		return;
 
 	for (i = 0; dests[i] != NULL; i++) {
-		const char *name, *addr;
+		const gchar *name, *addr;
 
 		name = e_destination_get_name (dests[i]);
 		addr = e_destination_get_email (dests[i]);
@@ -465,7 +465,7 @@ enable_toggled_cb (GtkWidget *widget, gpointer data)
 	/* Save the new setting to gconf */
 	gconf_client_set_bool (stuff->target->gconf, GCONF_KEY_ENABLE, active, NULL);
 
-       	gtk_widget_set_sensitive (stuff->option_menu, active);
+	gtk_widget_set_sensitive (stuff->option_menu, active);
 
 	addressbook = gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, NULL);
 
diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index f50498fc48..98eb3d05e4 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -142,7 +142,7 @@ bbdb_sync_buddy_list (void)
 			   name, just give up; we're not smart enough for
 			   this. */
 			if (contacts->next != NULL)
- 				continue;
+				continue;
 
 			c = E_CONTACT (contacts->data);
 
diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c
index 105d97e245..7da5584db4 100644
--- a/plugins/bogo-junk-plugin/bf-junk-filter.c
+++ b/plugins/bogo-junk-plugin/bf-junk-filter.c
@@ -142,21 +142,21 @@ retry:
 	}
 
 	if (!g_spawn_async_with_pipes (NULL,
-	                               (gchar **) argv,
-	                               NULL,
-	                               G_SPAWN_DO_NOT_REAP_CHILD |
-	                                   G_SPAWN_STDOUT_TO_DEV_NULL,
-	                               NULL,
-	                               NULL,
-	                               &child_pid,
-	                               &bf_in,
-	                               NULL,
-	                               NULL,
-	                               &err))
+				       (gchar **) argv,
+				       NULL,
+				       G_SPAWN_DO_NOT_REAP_CHILD |
+					   G_SPAWN_STDOUT_TO_DEV_NULL,
+				       NULL,
+				       NULL,
+				       &child_pid,
+				       &bf_in,
+				       NULL,
+				       NULL,
+				       &err))
 	{
 		g_warning ("error occurred while spawning %s: %s",
-		           argv[0],
-		           err->message);
+			   argv[0],
+			   err->message);
 		/* For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself. */
 		g_set_error (error, EM_JUNK_ERROR, err->code, _("Error occurred while spawning %s: %s."), argv[0], err->message);
 
@@ -333,12 +333,12 @@ e_plugin_lib_enable (EPluginLib *ep, gint enable)
 	gconf = gconf_client_get_default();
 
 	gconf_client_add_dir (gconf,
-	                      em_junk_bf_gconf_dir,
-	                      GCONF_CLIENT_PRELOAD_ONELEVEL,
-	                      NULL);
+			      em_junk_bf_gconf_dir,
+			      GCONF_CLIENT_PRELOAD_ONELEVEL,
+			      NULL);
 
 	gconf_client_notify_add (gconf,
-	                         em_junk_bf_gconf_dir,
+				 em_junk_bf_gconf_dir,
 				 em_junk_bf_setting_notify,
 				 NULL, NULL, NULL);
 
@@ -357,7 +357,7 @@ convert_unicode_cb (GtkWidget *widget, gpointer data)
 	gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
 	GConfClient *gconf = gconf_client_get_default();
 
-   	gconf_client_set_bool (gconf, data, active, NULL);
+	gconf_client_set_bool (gconf, data, active, NULL);
 
 	g_object_unref (gconf);
 }
@@ -365,7 +365,7 @@ convert_unicode_cb (GtkWidget *widget, gpointer data)
 GtkWidget *
 org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data)
 {
-   	GtkWidget *check;
+	GtkWidget *check;
 	guint i = ((GtkTable *)data->parent)->nrows;
 
 	if (data->old)
diff --git a/plugins/calendar-http/calendar-http.c b/plugins/calendar-http/calendar-http.c
index e6d4aee6a2..86f96404e2 100644
--- a/plugins/calendar-http/calendar-http.c
+++ b/plugins/calendar-http/calendar-http.c
@@ -80,7 +80,7 @@ url_changed (GtkEntry *entry, ESource *source)
 		gpointer secure_checkbox;
 
 		secure_checkbox = g_object_get_data (G_OBJECT (gtk_widget_get_parent (GTK_WIDGET (entry))),
-		                                     "secure_checkbox");
+						     "secure_checkbox");
 
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (secure_checkbox), TRUE);
 	}
diff --git a/plugins/calendar-weather/calendar-weather.c b/plugins/calendar-weather/calendar-weather.c
index 694effccaa..cacc7e00fa 100644
--- a/plugins/calendar-weather/calendar-weather.c
+++ b/plugins/calendar-weather/calendar-weather.c
@@ -58,14 +58,14 @@ e_plugin_lib_enable (EPluginLib *epl, gint enable)
 		const gchar *description;
 		const gchar *icon_name;
 	} categories[] = {
-		{ N_("Weather: Fog"), 		"weather-fog" },
-		{ N_("Weather: Cloudy"), 	"weather-few-clouds" },
+		{ N_("Weather: Fog"),		"weather-fog" },
+		{ N_("Weather: Cloudy"),	"weather-few-clouds" },
 		{ N_("Weather: Cloudy Night"),	"weather-few-clouds-night" },
 		{ N_("Weather: Overcast"),	"weather-overcast" },
-		{ N_("Weather: Showers"), 	"weather-showers" },
-		{ N_("Weather: Snow"), 		"weather-snow" },
-		{ N_("Weather: Sunny"), 	"weather-clear" },
-		{ N_("Weather: Clear Night"), 	"weather-clear-night" },
+		{ N_("Weather: Showers"),	"weather-showers" },
+		{ N_("Weather: Snow"),		"weather-snow" },
+		{ N_("Weather: Sunny"),	"weather-clear" },
+		{ N_("Weather: Clear Night"),	"weather-clear-night" },
 		{ N_("Weather: Thunderstorms"), "weather-storm" },
 		{ NULL,				NULL }
 	};
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index 10d812368d..026a4dc5e1 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -153,7 +153,7 @@ epech_fill_widgets_with_data (CustomHeaderOptionsDialog *mch)
 			gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box,0);
 		} else {
 			gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box,
-                        	g_array_index(priv->header_index_type, gint, set_index_column));
+				g_array_index(priv->header_index_type, gint, set_index_column));
 		}
 	}
 }
@@ -355,7 +355,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 		temp_header_ptr = &g_array_index(priv->email_custom_header_details, EmailCustomHeaderDetails,header_section_id);
                 str = (temp_header_ptr->header_type_value)->str;
                 if (strcmp (str, security_field) == 0) {
-                	str = _(security_field);
+			str = _(security_field);
                 }
 		gtk_label_set_markup (GTK_LABEL (priv->header_type_name_label), str);
 
@@ -384,8 +384,8 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 			str = (temp_header_value_ptr->sub_header_string_value)->str;
 			for (i = 0; security_values[i].value != NULL; i++) {
 				if (strcmp (str, security_values[i].value) == 0) {
-                			str = _(security_values[i].str);
-                			break;
+					str = _(security_values[i].str);
+					break;
 				}
 			}
 			gtk_combo_box_append_text (GTK_COMBO_BOX (sub_combo_box_ptr->header_value_combo_box),
diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c
index 53af222142..46f4101bb9 100644
--- a/plugins/exchange-operations/exchange-account-setup.c
+++ b/plugins/exchange-operations/exchange-account-setup.c
@@ -120,7 +120,7 @@ btn_chpass_clicked (GtkButton *button, gpointer data)
 {
 	ExchangeAccount *account;
 	gchar *old_password, *new_password;
- 	ExchangeAccountResult result;
+	ExchangeAccountResult result;
 
 	account = exchange_operations_get_exchange_account ();
 	if (!account)
@@ -137,7 +137,7 @@ btn_chpass_clicked (GtkButton *button, gpointer data)
 		return;
 	}
 	/* g_print ("Current password is \"%s\"\n", old_password); */
- 	result = exchange_account_set_password (account, old_password, new_password);
+	result = exchange_account_set_password (account, old_password, new_password);
 	if (result != EXCHANGE_ACCOUNT_CONNECT_SUCCESS)
 		exchange_operations_report_error (account, result);
 
@@ -738,8 +738,8 @@ org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data)
 
 			/* url has hostname but not owa_url.
 			 * Account has been created using x-c-s or evo is upgraded to 2.2
-		 	 * When invoked from druid, hostname will get set after validation,
-		 	 * so this condition will never be true during account creation.
+			 * When invoked from druid, hostname will get set after validation,
+			 * so this condition will never be true during account creation.
 			 */
 			owa_url = construct_owa_url (url);
 			camel_url_set_param (url, "owa_url", owa_url);
diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c
index 35d06d527d..c898f1b4c5 100644
--- a/plugins/exchange-operations/exchange-config-listener.c
+++ b/plugins/exchange-operations/exchange-config-listener.c
@@ -237,12 +237,12 @@ add_defaults_for_account (ExchangeConfigListener *config_listener,
 	eaccount = config_listener->priv->configured_account;
 	if (!e_account_get_string (eaccount, E_ACCOUNT_DRAFTS_FOLDER_URI)) {
 		set_special_mail_folder (account, "drafts",
-				 	 &eaccount->drafts_folder_uri);
+					 &eaccount->drafts_folder_uri);
 		save = TRUE;
 	}
 	if (!e_account_get_string (eaccount, E_ACCOUNT_SENT_FOLDER_URI)) {
 		set_special_mail_folder (account, "sentitems",
-				 	 &eaccount->sent_folder_uri);
+					 &eaccount->sent_folder_uri);
 		save = TRUE;
 	}
 	if (save) {
@@ -302,9 +302,9 @@ add_account_esources (ExchangeAccount *account,
 	cal_source_group = e_source_group_new (account->account_name,
 					       EXCHANGE_URI_PREFIX);
 	tasks_source_group = e_source_group_new (account->account_name,
-					   	 EXCHANGE_URI_PREFIX);
+						 EXCHANGE_URI_PREFIX);
 	contacts_source_group = e_source_group_new (account->account_name,
-					   	    EXCHANGE_URI_PREFIX);
+						    EXCHANGE_URI_PREFIX);
 
 	if (!e_source_list_add_group (contacts_source_list, contacts_source_group, -1) ||
 	    !e_source_list_add_group (cal_source_list, cal_source_group, -1) ||
@@ -481,15 +481,15 @@ add_sources (ExchangeAccount *account)
 				folders = g_slist_append (folders, folder_info);
 			}
 			else if (!(strcmp (folder_type, "tasks")) ||
-			    	 !(strcmp (folder_type, "tasks/public"))) {
+				 !(strcmp (folder_type, "tasks/public"))) {
 				folder_info->name = e_folder_get_name (folder);
 				folder_info->uri = e_folder_get_physical_uri (folder);
 				folder_info->type = EXCHANGE_TASKS_FOLDER;
 				folders = g_slist_append (folders, folder_info);
 			}
 			else if (!(strcmp (folder_type, "contacts")) ||
-			    	 !(strcmp (folder_type, "contacts/public")) ||
-			    	 !(strcmp (folder_type, "contacts/ldap"))) {
+				 !(strcmp (folder_type, "contacts/public")) ||
+				 !(strcmp (folder_type, "contacts/ldap"))) {
 				folder_info->name = e_folder_get_name (folder);
 				folder_info->uri = e_folder_get_physical_uri (folder);
 				folder_info->type = EXCHANGE_CONTACTS_FOLDER;
@@ -508,7 +508,7 @@ add_sources (ExchangeAccount *account)
 
 static void
 remove_account_esource (ExchangeAccount *account,
-		        FolderType folder_type)
+			FolderType folder_type)
 {
 	ESourceGroup *group;
 	ESource *source = NULL;
@@ -732,7 +732,7 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
 		exchange_account_set_save_password (account, FALSE);
 	}
 
- 	exchange_account_connect (account, password, &result);
+	exchange_account_connect (account, password, &result);
 
 	g_free (password);
 	g_free (key);
@@ -743,7 +743,7 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
 		new_password = get_new_exchange_password (account);
 		if (new_password) {
 			/* try connecting with new password */
- 			exchange_account_connect (account, new_password, &result);
+			exchange_account_connect (account, new_password, &result);
 			g_free (new_password);
 		}
 #endif
@@ -872,7 +872,7 @@ account_added (EAccountList *account_list, EAccount *account)
 
 	g_signal_emit (config_listener, signals[EXCHANGE_ACCOUNT_CREATED], 0,
 		       exchange_account);
-/*  	add_sources (exchange_account); */
+/*	add_sources (exchange_account); */
 
 	exchange_config_listener_get_offline_status (config_listener, &is_offline);
 
@@ -925,7 +925,7 @@ requires_relogin (gchar *current_url, gchar *new_url)
 
 	if (current_uri->authmech || new_uri->authmech) {
 		if (current_uri->authmech && new_uri->authmech) {
-	    		if (strcmp (current_uri->authmech, new_uri->authmech)) {
+			if (strcmp (current_uri->authmech, new_uri->authmech)) {
 				/* Auth mechanism has changed */
 				relogin = TRUE;
 				goto end;
@@ -1031,7 +1031,7 @@ account_changed (EAccountList *account_list, EAccount *account)
 		remove_account_esources (priv->exchange_account);
 		exchange_account_forget_password (priv->exchange_account);
 	} else if (strcmp (config_listener->priv->configured_name, account->name)) {
-/* 		remove_account_esources (priv->exchange_account); */
+/*		remove_account_esources (priv->exchange_account); */
 		exchange_config_listener_modify_esource_group_name (config_listener,
 								    config_listener->priv->configured_name,
 								    account->name);
diff --git a/plugins/exchange-operations/exchange-config-listener.h b/plugins/exchange-operations/exchange-config-listener.h
index 3ec2d5c62f..c079b7eac7 100644
--- a/plugins/exchange-operations/exchange-config-listener.h
+++ b/plugins/exchange-operations/exchange-config-listener.h
@@ -71,8 +71,8 @@ ExchangeConfigListener *exchange_config_listener_new      (void);
 
 GSList                 *exchange_config_listener_get_accounts (ExchangeConfigListener *config_listener);
 
-void 			add_folder_esource (ExchangeAccount *account, FolderType folder_type, const gchar *folder_name, const gchar *physical_uri);
-void 			remove_folder_esource (ExchangeAccount *account, FolderType folder_type, const gchar *physical_uri);
+void			add_folder_esource (ExchangeAccount *account, FolderType folder_type, const gchar *folder_name, const gchar *physical_uri);
+void			remove_folder_esource (ExchangeAccount *account, FolderType folder_type, const gchar *physical_uri);
 ExchangeConfigListenerStatus exchange_config_listener_get_offline_status (ExchangeConfigListener *excl, gint *mode);
 
 void exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl,
diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c
index 437aeec51f..085bce398b 100644
--- a/plugins/exchange-operations/exchange-delegates-user.c
+++ b/plugins/exchange-operations/exchange-delegates-user.c
@@ -328,7 +328,7 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			   summarizing the permissions assigned to him.
 			*/
 			msg_part1 = _("This message was sent automatically by Evolution to inform you that you have been "
-				    	"designated as a delegate. You can now send messages on my behalf.");
+					"designated as a delegate. You can now send messages on my behalf.");
 
 			/* To translators: Another chunk of the same message.
 			*/
@@ -488,7 +488,7 @@ exchange_delegates_user_new (const gchar *display_name)
 ExchangeDelegatesUser *
 exchange_delegates_user_new_from_gc (E2kGlobalCatalog *gc,
 				    const gchar *email,
-		                    GByteArray *creator_entryid)
+				    GByteArray *creator_entryid)
 {
 	E2kGlobalCatalogStatus status;
 	E2kGlobalCatalogEntry *entry;
diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c
index f5e8891b77..b4ef8c43ad 100644
--- a/plugins/exchange-operations/exchange-delegates.c
+++ b/plugins/exchange-operations/exchange-delegates.c
@@ -949,7 +949,7 @@ exchange_delegates (ExchangeAccount *account, GtkWidget *parent)
 
 	/* Set up the table */
 	delegates->model = gtk_list_store_new (1, G_TYPE_STRING);
- 	delegates->table = glade_xml_get_widget (delegates->xml, "delegates_table");
+	delegates->table = glade_xml_get_widget (delegates->xml, "delegates_table");
 	column = gtk_tree_view_column_new_with_attributes (
 		_("Name"), gtk_cell_renderer_text_new (), "text", 0, NULL);
 	gtk_tree_view_append_column (GTK_TREE_VIEW (delegates->table),
diff --git a/plugins/exchange-operations/exchange-folder-subscription.c b/plugins/exchange-operations/exchange-folder-subscription.c
index 6b5d2375bc..f8772373cb 100644
--- a/plugins/exchange-operations/exchange-folder-subscription.c
+++ b/plugins/exchange-operations/exchange-folder-subscription.c
@@ -219,8 +219,8 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
 			}
 
 			/* It would be nice to insensitivize the OK button appropriately
-		   	instead of doing this, but unfortunately we can't do this for the
-		   	Bonobo control.  */
+			instead of doing this, but unfortunately we can't do this for the
+			Bonobo control.  */
 			e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":select-user", NULL);
 		}
 
diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c
index 39929eaa5b..9537f592a3 100644
--- a/plugins/exchange-operations/exchange-mail-send-options.c
+++ b/plugins/exchange-operations/exchange-mail-send-options.c
@@ -91,7 +91,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 		addr = camel_header_address_decode (dialog->options->delegate_address, NULL);
 		sender_addr = camel_header_address_decode (sender_id, NULL);
 
- 		if(dialog->options->send_as_del_enabled &&
+		if(dialog->options->send_as_del_enabled &&
 			dialog->options->delegate_address &&
 				g_ascii_strcasecmp(addr->v.addr, sender_addr->v.addr)) {
 
@@ -109,7 +109,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 			}
 
 			else
-		       		e_msg_composer_add_header (composer, "From",
+				e_msg_composer_add_header (composer, "From",
 							dialog->options->delegate_address);
 		}
 
@@ -183,7 +183,7 @@ org_gnome_exchange_send_options (EPlugin *ep, EMEventTargetComposer *target)
 		return;
 	}
 	e_msg_composer_set_send_options (composer, TRUE);
- 	/*disply the send options dialog*/
+	/*disply the send options dialog*/
 	if (!dialog) {
 		g_print ("New dialog\n\n") ;
 		dialog = exchange_sendoptions_dialog_new () ;
diff --git a/plugins/exchange-operations/exchange-operations.c b/plugins/exchange-operations/exchange-operations.c
index e9b8d3fd5d..d79948ccc4 100644
--- a/plugins/exchange-operations/exchange-operations.c
+++ b/plugins/exchange-operations/exchange-operations.c
@@ -102,7 +102,7 @@ exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *pare
 
 	exchange_operations_tokenize_string (&luri, nodename, '/', sizeof(nodename));
 
-       	if (!nodename[0]) {
+	if (!nodename[0]) {
 		return TRUE;
 	}
 
@@ -157,7 +157,7 @@ exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter
 		return;
 
 	exchange_operations_tokenize_string (&luri, nodename, '/', sizeof(nodename));
-       	if (!nodename[0]) {
+	if (!nodename[0]) {
 		return;
 	}
 
@@ -278,7 +278,7 @@ void exchange_operations_update_child_esources (ESource *source, const gchar *ol
 			/* This ESource points to one of the child folders */
 			gchar **tmpv, *truri;
 			/* A nasty search and replace */
-		  	tmpv = g_strsplit (ruri, old_path, -1);
+			tmpv = g_strsplit (ruri, old_path, -1);
 			truri = g_strjoinv (new_path, tmpv);
 			e_source_set_relative_uri (tsource->data, truri);
 			g_strfreev (tmpv);
diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c
index 783887cb24..e44056abb8 100644
--- a/plugins/exchange-operations/exchange-send-options.c
+++ b/plugins/exchange-operations/exchange-send-options.c
@@ -108,7 +108,7 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
 	if(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->delegate_enabled))) {
 
 		name_selector_entry = e_name_selector_peek_section_entry (priv->proxy_name_selector, "Add User");
-		destination_store = e_name_selector_entry_peek_destination_store (E_NAME_SELECTOR_ENTRY 				                                               (name_selector_entry));
+		destination_store = e_name_selector_entry_peek_destination_store (E_NAME_SELECTOR_ENTRY									       (name_selector_entry));
 		destinations = e_destination_store_list_destinations (destination_store);
 		tmp = destinations;
 
@@ -268,7 +268,7 @@ GType exchange_sendoptions_dialog_get_type (void)
       sizeof (ExchangeSendOptionsDialog),
      0,      /* n_preallocs */
      (GInstanceInitFunc) exchange_sendoptions_dialog_init,
- 	NULL    /* instance_init */
+	NULL    /* instance_init */
     };
     type = g_type_register_static (G_TYPE_OBJECT,
                                    "ExchangeSendOptionsDialogType",
@@ -279,8 +279,8 @@ GType exchange_sendoptions_dialog_get_type (void)
 
 static void exchange_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data)
 {
-   	ExchangeSendOptionsDialogPrivate *priv;
-   	ExchangeSendOptionsDialog *sod;
+	ExchangeSendOptionsDialogPrivate *priv;
+	ExchangeSendOptionsDialog *sod;
 
 	sod = func_data;
         priv = sod->priv;
@@ -290,15 +290,15 @@ static void exchange_send_options_cb (GtkDialog *dialog, gint state, gpointer fu
 		     if(exchange_send_options_get_widgets_data (sod) < 0)
 			return;
 		case GTK_RESPONSE_CANCEL:
-		    	gtk_widget_hide (priv->main);
-	    	    	gtk_widget_destroy (priv->main);
-	           	g_object_unref (priv->xml);
-	             	break;
+			gtk_widget_hide (priv->main);
+			gtk_widget_destroy (priv->main);
+			g_object_unref (priv->xml);
+			break;
 		case GTK_RESPONSE_HELP:
 			e_display_help (
 				GTK_WINDOW (priv->main),
 				priv->help_section);
-	    	    	break;
+			break;
 	}
 	g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state);
 
diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c
index cc18b0a3af..93b4ee9876 100644
--- a/plugins/google-account-setup/google-source.c
+++ b/plugins/google-account-setup/google-source.c
@@ -641,7 +641,7 @@ plugin_google  (EPlugin                    *epl,
 	gtk_widget_show (hbox);
 
 	spin = gtk_spin_button_new_with_range (1, 100, 1);
- 	gtk_label_set_mnemonic_widget (GTK_LABEL(label), spin);
+	gtk_label_set_mnemonic_widget (GTK_LABEL(label), spin);
 	gtk_widget_show (spin);
 	gtk_box_pack_start (GTK_BOX(hbox), spin, FALSE, TRUE, 0);
 
diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c
index 46beaac0b8..99679ebd18 100644
--- a/plugins/groupwise-account-setup/camel-gw-listener.c
+++ b/plugins/groupwise-account-setup/camel-gw-listener.c
@@ -36,7 +36,7 @@
 /*stores some info about all currently existing groupwise accounts
   list of GwAccountInfo structures */
 
-static 	GList *groupwise_accounts = NULL;
+static	GList *groupwise_accounts = NULL;
 
 struct _CamelGwListenerPrivate {
 	GConfClient *gconf_client;
@@ -192,7 +192,7 @@ add_esource (const gchar *conf_key, GwAccountInfo *info,  const gchar *source_na
 
 	soap_port = camel_url_get_param (url, "soap_port");
 
- 	if (!soap_port || strlen (soap_port) == 0)
+	if (!soap_port || strlen (soap_port) == 0)
 		soap_port = "7191";
 
 	use_ssl = camel_url_get_param (url, "use_ssl");
@@ -345,7 +345,7 @@ modify_esource (const gchar * conf_key, GwAccountInfo *old_account_info, EAccoun
 	gchar *old_relative_uri;
 	CamelURL *url;
 	gboolean found_group;
-      	GConfClient* client;
+	GConfClient* client;
 	const gchar *poa_address;
 	const gchar *new_poa_address;
 	const gchar * new_group_name = a->name;
@@ -464,7 +464,7 @@ remove_calendar_tasks_sources (GwAccountInfo *info)
 static GList*
 get_addressbook_names_from_server (gchar *source_url)
 {
-  	gchar *key;
+	gchar *key;
         EGwConnection *cnc;
 	gchar *password;
 	GList *book_list = NULL;
@@ -580,7 +580,7 @@ add_addressbook_sources (EAccount *account)
 	ESourceList *list;
         ESourceGroup *group;
         ESource *source;
-       	gchar *base_uri;
+	gchar *base_uri;
 	const gchar *soap_port;
 	GList *books_list, *temp_list;
 	GConfClient* client;
@@ -671,7 +671,7 @@ modify_addressbook_sources ( EAccount *account, GwAccountInfo *existing_account_
 	ESourceList *list;
         ESourceGroup *group;
 	GSList *groups;
-       	gboolean found_group;
+	gboolean found_group;
 	gboolean delete_group;
 	gchar *old_base_uri;
 	gchar *new_base_uri;
@@ -756,7 +756,7 @@ remove_addressbook_sources (GwAccountInfo *existing_account_info)
 	ESourceList *list;
         ESourceGroup *group;
 	GSList *groups;
-       	gboolean found_group;
+	gboolean found_group;
 	CamelURL *url;
 	gchar *base_uri;
 	const gchar *soap_port;
@@ -839,7 +839,7 @@ account_added (EAccountList *account_listener, EAccount *account)
 static void
 account_removed (EAccountList *account_listener, EAccount *account)
 {
-       	GwAccountInfo *info;
+	GwAccountInfo *info;
 
 	if (!is_groupwise_account (account))
 		return;
@@ -919,7 +919,7 @@ account_changed (EAccountList *account_listener, EAccount *account)
 		if ((old_poa_address && strcmp (old_poa_address, new_poa_address))
 		   ||  (old_soap_port && strcmp (old_soap_port, new_soap_port))
 		   ||  strcmp (old_url->user, new_url->user)
-	           || (!old_use_ssl)
+		   || (!old_use_ssl)
 		   || strcmp (old_use_ssl, new_use_ssl)) {
 
 			account_removed (account_listener, account);
@@ -998,7 +998,7 @@ camel_gw_listener_construct (CamelGwListener *config_listener)
 
 	prune_proxies ();
 
-       	config_listener->priv->account_list = e_account_list_new (config_listener->priv->gconf_client);
+	config_listener->priv->account_list = e_account_list_new (config_listener->priv->gconf_client);
 
 	for ( iter = e_list_get_iterator (E_LIST ( config_listener->priv->account_list) ) ; e_iterator_is_valid (iter); e_iterator_next (iter) ) {
 
@@ -1006,7 +1006,7 @@ camel_gw_listener_construct (CamelGwListener *config_listener)
 
 		if ( is_groupwise_account (account) && account->enabled) {
 
-		        info = g_new0 (GwAccountInfo, 1);
+			info = g_new0 (GwAccountInfo, 1);
 			info->uid = g_strdup (account->uid);
 			info->name = g_strdup (account->name);
 			info->source_url = g_strdup (account->source->url);
diff --git a/plugins/groupwise-account-setup/groupwise-account-setup.c b/plugins/groupwise-account-setup/groupwise-account-setup.c
index 71bb1ee31e..549c75da61 100644
--- a/plugins/groupwise-account-setup/groupwise-account-setup.c
+++ b/plugins/groupwise-account-setup/groupwise-account-setup.c
@@ -118,7 +118,7 @@ e_plugin_lib_enable (EPluginLib *ep, gint enable)
 {
 	if (!config_listener) {
 		config_listener = camel_gw_listener_new ();
-	 	g_atexit ( free_groupwise_listener );
+		g_atexit ( free_groupwise_listener );
 	}
 
 	return 0;
diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c
index c9d4ad54e4..67b1b5bdee 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.c
@@ -174,7 +174,7 @@ accept_clicked(GnomeDruidPage *page, GtkWidget *druid, CamelMimeMessage *msg)
 	camel_object_ref(msg);
 	accept_data->model = model;
 	g_object_set_data_full((GObject *)dialog, "accept-data", accept_data, accept_free);
- 	g_signal_connect (dialog, "response", G_CALLBACK (install_folder_response), accept_data);
+	g_signal_connect (dialog, "response", G_CALLBACK (install_folder_response), accept_data);
 	g_object_set_data_full((GObject *)dialog, "druid", druid, (GDestroyNotify)gtk_widget_destroy);
 	gtk_window_set_title (GTK_WINDOW (dialog), "Install Shared Folder");
 	gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c
index aa8c96368d..dc13fad256 100644
--- a/plugins/groupwise-features/junk-mail-settings.c
+++ b/plugins/groupwise-features/junk-mail-settings.c
@@ -48,7 +48,7 @@ org_gnome_junk_settings(EPlugin *ep, EMPopupTargetSelect *t);
 static void
 abort_changes (JunkSettings *js)
 {
-       	g_object_run_dispose ((GObject *)js);
+	g_object_run_dispose ((GObject *)js);
 }
 
 static void
diff --git a/plugins/groupwise-features/junk-settings.h b/plugins/groupwise-features/junk-settings.h
index 43322de018..13e8a25c9b 100644
--- a/plugins/groupwise-features/junk-settings.h
+++ b/plugins/groupwise-features/junk-settings.h
@@ -33,7 +33,7 @@ extern "C" {
 #include <camel/camel-store.h>
 #include <e-gw-connection.h>
 
-#define _JUNK_SETTINGS_TYPE    	      (junk_settings_get_type ())
+#define _JUNK_SETTINGS_TYPE	      (junk_settings_get_type ())
 #define JUNK_SETTINGS(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), JUNK_SETTINGS, JunkSettings))
 #define JUNK_SETTINGS_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), JUNK_SETTINGS_TYPE, JunkSettings))
 #define IS_JUNK_SETTINGS(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), JUNK_SETTINGS_TYPE))
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index 29c6545f01..8c8013f6fe 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -154,7 +154,7 @@ proxy_login_get_type (void)
       sizeof (proxyLogin),
      0,      /* n_preallocs */
      (GInstanceInitFunc) proxy_login_init,
- 	NULL    /* instance_init */
+	NULL    /* instance_init */
     };
     type = g_type_register_static (G_TYPE_OBJECT,
                                    "proxyLoginType",
@@ -291,7 +291,7 @@ proxy_login_cb (GtkDialog *dialog, gint state)
 		    g_object_unref (pld);
 		    break;
 	    case GTK_RESPONSE_CANCEL:
-    		    gtk_widget_destroy (priv->main);
+		    gtk_widget_destroy (priv->main);
 		    g_object_unref (pld);
 		    break;
 	    case GTK_RESPONSE_HELP:
@@ -435,7 +435,7 @@ proxy_login_setup_tree_view (void)
 static void
 proxy_login_update_tree (void)
 {
-    	GtkTreeIter iter;
+	GtkTreeIter iter;
 	gint i,n;
 	GdkPixbuf *broken_image = NULL;
 	GList *proxy_list = NULL;
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index 6a18348002..44c82610d6 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -15,7 +15,7 @@
  *
  * Authors:
  *		Shreyas Srinivasan <sshreyas@novell.com>
- *  	Sankar P <psankar@novell.com>
+ *	Sankar P <psankar@novell.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
@@ -230,7 +230,7 @@ proxy_dialog_get_type (void)
       sizeof (proxyDialog),
      0,      /* n_preallocs */
      (GInstanceInitFunc) proxy_dialog_init,
- 	NULL    /* instance_init */
+	NULL    /* instance_init */
     };
 
     type = g_type_register_static (G_TYPE_OBJECT,
@@ -551,7 +551,7 @@ proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data)
 		/* Handle case where the structure is new and deleted*/
 		if ( !((aclInstance->flags & E_GW_PROXY_NEW) && (aclInstance->flags & E_GW_PROXY_DELETED))) {
 
-			if ( !E_IS_GW_CONNECTION(prd->cnc)) 	/* Add check in case the connection request fails*/
+			if ( !E_IS_GW_CONNECTION(prd->cnc))	/* Add check in case the connection request fails*/
 				prd->cnc = proxy_get_cnc (account, GTK_WINDOW (gtk_widget_get_toplevel (button)));
 
 			if (aclInstance->flags & E_GW_PROXY_NEW )
@@ -599,7 +599,7 @@ static void
 proxy_update_tree_view (EAccount *account)
 {
 	proxyDialog *prd = NULL;
-    	GtkTreeIter iter;
+	GtkTreeIter iter;
 	GdkPixbuf *broken_image = NULL;
 	GList *list_iter;
 	proxyHandler *aclInstance;
@@ -614,7 +614,7 @@ proxy_update_tree_view (EAccount *account)
 	list_iter = priv->proxy_list;
 
 	for (;list_iter; list_iter = g_list_next(list_iter)) {
-	        aclInstance = (proxyHandler *) list_iter->data;
+		aclInstance = (proxyHandler *) list_iter->data;
 
 		if(! (aclInstance->flags & E_GW_PROXY_DELETED )) {
 			gtk_tree_store_append (priv->store, &iter, NULL);
@@ -622,7 +622,7 @@ proxy_update_tree_view (EAccount *account)
 		}
 	}
 
-   	g_free (file_name);
+	g_free (file_name);
 	if (broken_image)
 		g_object_unref (broken_image);
 
@@ -835,7 +835,7 @@ proxy_get_item_from_list (EAccount *account, gchar *account_name)
 	list_iter = priv->proxy_list;
 
 	for (;list_iter; list_iter = g_list_next(list_iter)) {
-	        iter = (proxyHandler *) list_iter->data;
+		iter = (proxyHandler *) list_iter->data;
 
 		if ( g_str_equal (iter->proxy_email,account_name))
 			return iter;
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index a739571b83..c3036d1da3 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -191,7 +191,7 @@ e_sendoptions_clicked_cb (GtkWidget *button, gpointer data)
 	if (n_cnc)
 		e_sendoptions_dialog_run (sod, parent ? parent : NULL, E_ITEM_NONE);
 	else
-	       	return;
+		return;
 }
 
 GtkWidget *
diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h
index fadf37bcfb..8ff4ec3521 100644
--- a/plugins/groupwise-features/share-folder.h
+++ b/plugins/groupwise-features/share-folder.h
@@ -34,7 +34,7 @@ extern "C" {
 #include <e-gw-connection.h>
 #include <libedataserverui/e-name-selector.h>
 
-#define _SHARE_FOLDER_TYPE    	      (share_folder_get_type ())
+#define _SHARE_FOLDER_TYPE	      (share_folder_get_type ())
 #define SHARE_FOLDER(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), SHARE_FOLDER, ShareFolder))
 #define SHARE_FOLDER_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), SHARE_FOLDER_TYPE, ShareFolder))
 #define IS_SHARE_FOLDER(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), SHARE_FOLDER_TYPE))
diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c
index 966abd114f..d5a17b7893 100644
--- a/plugins/hula-account-setup/camel-hula-listener.c
+++ b/plugins/hula-account-setup/camel-hula-listener.c
@@ -32,7 +32,7 @@
 #include "camel-hula-listener.h"
 
 
-static 	GList *hula_accounts = NULL;
+static	GList *hula_accounts = NULL;
 
 struct _CamelHulaListenerPrivate {
 	GConfClient *gconf_client;
@@ -312,7 +312,7 @@ modify_esource (const gchar * conf_key, HulaAccountInfo *old_account_info, const
 	gchar *old_relative_uri;
 	CamelURL *url;
 	gboolean found_group;
-      	GConfClient* client;
+	GConfClient* client;
 
 	url = camel_url_new (old_account_info->source_url, NULL);
 	if (!url->host || strlen (url->host) ==0)
@@ -440,7 +440,7 @@ account_added (EAccountList *account_listener, EAccount *account)
 static void
 account_removed (EAccountList *account_listener, EAccount *account)
 {
-       	HulaAccountInfo *info;
+	HulaAccountInfo *info;
 
 	if (!is_hula_account (account) || !is_hula_caldav_account (account))
 		return;
@@ -546,7 +546,7 @@ camel_hula_listener_construct (CamelHulaListener *config_listener)
 	EAccount *account;
 	HulaAccountInfo *info ;
 
-       	config_listener->priv->account_list = e_account_list_new (config_listener->priv->gconf_client);
+	config_listener->priv->account_list = e_account_list_new (config_listener->priv->gconf_client);
 
 	for ( iter = e_list_get_iterator (E_LIST ( config_listener->priv->account_list) ) ; e_iterator_is_valid (iter); e_iterator_next (iter) ) {
 
@@ -554,7 +554,7 @@ camel_hula_listener_construct (CamelHulaListener *config_listener)
 
 		if ( is_hula_account (account) && account->enabled) {
 
-		        info = g_new0 (HulaAccountInfo, 1);
+			info = g_new0 (HulaAccountInfo, 1);
 			info->uid = g_strdup (account->uid);
 			info->name = g_strdup (account->name);
 			info->source_url = g_strdup (account->source->url);
diff --git a/plugins/hula-account-setup/hula-account-setup.c b/plugins/hula-account-setup/hula-account-setup.c
index 29b334f115..c334019d71 100644
--- a/plugins/hula-account-setup/hula-account-setup.c
+++ b/plugins/hula-account-setup/hula-account-setup.c
@@ -41,7 +41,7 @@ e_plugin_lib_enable (EPluginLib *ep, gint enable)
 {
 	if (!config_listener) {
 		config_listener = camel_hula_listener_new ();
-	 	g_atexit ( free_hula_listener );
+		g_atexit ( free_hula_listener );
 	}
 
 	return 0;
diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c
index 64f64dc16a..ea969b2b3a 100644
--- a/plugins/imap-features/imap-headers.c
+++ b/plugins/imap-features/imap-headers.c
@@ -45,13 +45,13 @@ typedef struct _epif_data EPImapFeaturesData;
 struct _epif_data {
 	GtkWidget *all_headers;
 	GtkWidget *basic_headers;
- 	GtkWidget *mailing_list_headers;
+	GtkWidget *mailing_list_headers;
 	GtkWidget *custom_headers_box;
 
 	GtkEntry *entry_header;
 
 	GtkButton *add_header;
- 	GtkButton *remove_header;
+	GtkButton *remove_header;
 
 	GtkTreeView *custom_headers_tree;
 	GtkTreeStore *store;
@@ -174,7 +174,7 @@ epif_add_sensitivity (EPImapFeaturesData *ui)
 		if (g_ascii_strcasecmp (header_name, entry_contents) == 0) {
 			gtk_widget_set_sensitive (GTK_WIDGET (ui->add_header), FALSE);
 			return;
- 		}
+		}
 
 		valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (ui->store), &iter);
 	}
diff --git a/plugins/ipod-sync/ipod.c b/plugins/ipod-sync/ipod.c
index baef16e0d5..41267ae3e6 100644
--- a/plugins/ipod-sync/ipod.c
+++ b/plugins/ipod-sync/ipod.c
@@ -180,13 +180,13 @@ find_ipod_mount_point (LibHalContext *ctx)
 			if (!libhal_device_property_exists (ctx, udi2,
 								"volume.is_filesystem", NULL) ||
 				  !libhal_device_get_property_bool (ctx, udi2,
-				  				"volume.is_filesystem", NULL))
+								"volume.is_filesystem", NULL))
 			{
 				has_fs = 1;
 			}
 
 			fsusage = libhal_device_get_property_string (ctx, udi2,
-				 				"volume.fsusage", NULL);
+								"volume.fsusage", NULL);
 
 			if (fsusage == NULL)
 				continue;
@@ -208,7 +208,7 @@ find_ipod_mount_point (LibHalContext *ctx)
 			if (!libhal_device_property_exists (ctx, udi2,
 								"volume.is_mounted", NULL) ||
 				 !libhal_device_get_property_bool (ctx, udi2,
-				 				"volume.is_mounted", NULL))
+								"volume.is_mounted", NULL))
 			{
 				/* It isn't, so let's attempt to mount it */
 				if (device != NULL)
diff --git a/plugins/ipod-sync/sync.c b/plugins/ipod-sync/sync.c
index cc2febc5e3..5f518dece6 100644
--- a/plugins/ipod-sync/sync.c
+++ b/plugins/ipod-sync/sync.c
@@ -170,7 +170,7 @@ write_to_ipod (GString *str, gchar *path, gchar *filename)
 		if (mkdir (output_path, 0777) != 0)
 			critical_error (_("No output directory!"),
 								 _("The output directory was not found on "
-								 	"iPod! Please ensure that iPod has been correctly "
+									"iPod! Please ensure that iPod has been correctly "
 									"set up and try again."));
 	}
 
@@ -223,9 +223,9 @@ write_to_ipod (GString *str, gchar *path, gchar *filename)
 static GString *
 uri_list_to_vcard_string (GSList *uris)
 {
-	GString 		*str = NULL;
-	EBook 		*book = NULL;
-	EBookQuery 	*qry = NULL;
+	GString		*str = NULL;
+	EBook		*book = NULL;
+	EBookQuery	*qry = NULL;
 	GList			*contacts = NULL, *c = NULL;
 	GSList		*uri;
 
@@ -285,8 +285,8 @@ uri_list_to_vcard_string (GSList *uris)
 static GString *
 uri_list_to_vcal_string (GSList *uris, ECalSourceType type)
 {
-	GString 		*str = NULL;
-	ECal 			*cal = NULL;
+	GString		*str = NULL;
+	ECal			*cal = NULL;
 	icalcomponent *obj = NULL;
 	GList			*objects = NULL, *o = NULL;
 	GSList		*uri;
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 18aa1ea82a..ed406d9bd2 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -970,7 +970,7 @@ message_foreach_part (CamelMimePart *part, GSList **part_list)
 			message_foreach_part (part, part_list);
 		}
 	} else if (CAMEL_IS_MIME_MESSAGE (containee)) {
- 		message_foreach_part ((CamelMimePart *)containee, part_list);
+		message_foreach_part ((CamelMimePart *)containee, part_list);
 	}
 }
 
@@ -1305,7 +1305,7 @@ update_attendee_status (struct _itip_puri *pitip)
 						icalcomponent_add_property (icalcomp, icalproperty_new_clone (del_prop));
 						e_cal_component_rescan (comp);
 					} else if (response == GTK_RESPONSE_NO) {
-				 		remove_delegate (pitip, delegate, itip_strip_mailto (a->value), comp);
+						remove_delegate (pitip, delegate, itip_strip_mailto (a->value), comp);
 						goto cleanup;
 					} else {
 						goto cleanup;
@@ -1957,8 +1957,8 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
 
 			/* We do this to ensure there is at most one
 			 * attendee in the response */
-            		if (found || g_ascii_strcasecmp (pitip->to_address, text))
-            			list = g_slist_prepend (list, prop);
+			if (found || g_ascii_strcasecmp (pitip->to_address, text))
+				list = g_slist_prepend (list, prop);
 			else if (!g_ascii_strcasecmp (pitip->to_address, text))
 				found = TRUE;
                         g_free (text);
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index d7c0f8a3dd..a893895949 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -48,11 +48,11 @@
 #include <libnotify/notify.h>
 #endif
 
-#define GCONF_KEY_ROOT		 	"/apps/evolution/eplugin/mail-notification/"
+#define GCONF_KEY_ROOT			"/apps/evolution/eplugin/mail-notification/"
 #define GCONF_KEY_NOTIFY_ONLY_INBOX	GCONF_KEY_ROOT "notify-only-inbox"
-#define GCONF_KEY_ENABLED_DBUS	 	GCONF_KEY_ROOT "dbus-enabled"
-#define GCONF_KEY_ENABLED_STATUS 	GCONF_KEY_ROOT "status-enabled"
-#define GCONF_KEY_ENABLED_SOUND	 	GCONF_KEY_ROOT "sound-enabled"
+#define GCONF_KEY_ENABLED_DBUS		GCONF_KEY_ROOT "dbus-enabled"
+#define GCONF_KEY_ENABLED_STATUS	GCONF_KEY_ROOT "status-enabled"
+#define GCONF_KEY_ENABLED_SOUND		GCONF_KEY_ROOT "sound-enabled"
 
 static gboolean enabled = FALSE;
 static GtkWidget *get_cfg_widget (void);
@@ -556,9 +556,9 @@ get_config_widget_status (void)
 	vbox = gtk_vbox_new (FALSE, 0);
 	scw = g_malloc0 (sizeof (struct _StatusConfigureWidgets));
 
-	#define create_check(c, key, desc) 							\
-		c = gtk_check_button_new_with_mnemonic (desc); 					\
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (c), is_part_enabled (key)); 	\
+	#define create_check(c, key, desc)							\
+		c = gtk_check_button_new_with_mnemonic (desc);					\
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (c), is_part_enabled (key));	\
 		gtk_box_pack_start (GTK_BOX (parent), c, FALSE, FALSE, 0);			\
 		g_signal_connect (G_OBJECT (c), "toggled", G_CALLBACK (toggled_status_cb), scw);
 
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index 9c9f3ad244..ac3d8ea6f0 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -811,11 +811,11 @@ pst_process_email (PstImporter *m, pst_item *item)
 	camel_mime_message_set_from (msg, addr);
 	camel_object_unref (addr);
 
- 	if (item->email->sent_date != NULL) {
+	if (item->email->sent_date != NULL) {
 		camel_mime_message_set_date (msg, fileTimeToUnixTime (item->email->sent_date, 0), 0);
 	}
 
- 	if (item->email->messageid != NULL) {
+	if (item->email->messageid != NULL) {
 		camel_mime_message_set_message_id (msg, item->email->messageid);
 	}
 
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index ad6e38e9f9..4650d97375 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -608,7 +608,7 @@ url_remove_clicked (GtkButton *button, PublishUIData *ui)
 	gtk_tree_model_get (model, &iter, URL_LIST_URL_COLUMN, &url, -1);
 
 	confirm = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-			                  GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
+					  GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
 					  _("Are you sure you want to remove this location?"));
 	gtk_dialog_add_button (GTK_DIALOG (confirm), GTK_STOCK_CANCEL, GTK_RESPONSE_NO);
 	gtk_dialog_add_button (GTK_DIALOG (confirm), GTK_STOCK_REMOVE, GTK_RESPONSE_YES);
@@ -704,11 +704,11 @@ publish_calendar_locations (EPlugin *epl, EConfigHookItemFactoryData *data)
 	renderer = gtk_cell_renderer_toggle_new ();
 	g_object_set (G_OBJECT (renderer), "activatable", TRUE, NULL);
 	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (ui->treeview), -1, _("Enabled"),
-			                             renderer, "active", URL_LIST_ENABLED_COLUMN, NULL);
+						     renderer, "active", URL_LIST_ENABLED_COLUMN, NULL);
 	g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (url_list_enable_toggled), ui);
 	renderer = gtk_cell_renderer_text_new ();
 	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (ui->treeview), -1, _("Location"),
-			                             renderer, "text", URL_LIST_LOCATION_COLUMN, NULL);
+						     renderer, "text", URL_LIST_LOCATION_COLUMN, NULL);
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ui->treeview));
 	gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
 	g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (selection_changed), ui);
diff --git a/plugins/python/python-plugin-loader.c b/plugins/python/python-plugin-loader.c
index 4d7ead37da..aa273ae264 100644
--- a/plugins/python/python-plugin-loader.c
+++ b/plugins/python/python-plugin-loader.c
@@ -67,7 +67,7 @@ epp_invoke(EPlugin *ep, const gchar *name, gpointer data)
 	Py_Initialize();
 
 	if (p->pModule == NULL) {
-	        pModuleName = PyString_FromString(epp->module_name);
+		pModuleName = PyString_FromString(epp->module_name);
 
 		PyRun_SimpleString(g_strdup_printf ("import sys ; sys.path.insert(0, '%s')", epp->location));
 
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index 3c92b386ae..d7123dc4e7 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -444,7 +444,7 @@ em_junk_sa_test_spamd (void)
 		em_junk_sa_spamd_binaries [0] = em_junk_sa_spamd_gconf_binary;
 		em_junk_sa_spamd_binaries [1] = NULL;
 		try_system_spamd = FALSE;
-  	}
+	}
 
 	em_junk_sa_use_spamc = FALSE;
 
@@ -513,7 +513,7 @@ em_junk_sa_is_available (GError **error)
 
 	/* While we're at it, see if spamd is running with --allow-tell */
 	if (!em_junk_sa_allow_tell_tested)
- 	        em_junk_sa_test_allow_tell () ;
+		em_junk_sa_test_allow_tell () ;
 
 	pthread_mutex_unlock (&em_junk_sa_init_lock);
 
@@ -900,13 +900,13 @@ static void
 use_remote_tests_cb (GtkWidget *widget, gpointer data)
 {
 	gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
-   	gconf_client_set_bool (em_junk_sa_gconf, data, !active, NULL);
+	gconf_client_set_bool (em_junk_sa_gconf, data, !active, NULL);
 }
 
 GtkWidget *
 org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data)
 {
-   	GtkWidget *check, *vbox, *label;
+	GtkWidget *check, *vbox, *label;
 	gchar *text = g_strdup_printf ("    <small>%s</small>", _("This will make SpamAssassin more reliable, but slower"));
 	guint i = ((GtkTable *)data->parent)->nrows;
 
diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c
index c63c1dab2b..6042de7d6f 100644
--- a/plugins/save-calendar/save-calendar.c
+++ b/plugins/save-calendar/save-calendar.c
@@ -163,7 +163,7 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource
 					      GTK_FILE_CHOOSER_ACTION_SAVE,
 					      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 					      GTK_STOCK_SAVE_AS, GTK_RESPONSE_OK,
-		 			      NULL);
+					      NULL);
 
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 	gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), extra_widget);
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index b0de28ad49..95a3c1e361 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -75,14 +75,14 @@ static void reply_with_template	(EPopup *ep, EPopupItem *item, gpointer data);
 static void popup_free		(EPopup *ep, GSList *l, gpointer data);
 
 static GSList *fill_submenu	(CamelStore *store,
-                             	CamelFolderInfo *info,
-                              	GSList *list,
-                              	EMPopupTargetSelect *t);
+				CamelFolderInfo *info,
+				GSList *list,
+				EMPopupTargetSelect *t);
 
-static GSList *append_to_menu 	(CamelFolder *folder,
-                             	GPtrArray *uids,
-                             	GSList *list,
-                             	EMPopupTargetSelect *t);
+static GSList *append_to_menu	(CamelFolder *folder,
+				GPtrArray *uids,
+				GSList *list,
+				EMPopupTargetSelect *t);
 
 void org_gnome_templates_popup	(EPlugin *ep, EMPopupTargetSelect *t);
 
@@ -709,7 +709,7 @@ static GtkActionEntry entries[] = {
 	{ "Template",
 	  GTK_STOCK_SAVE,
 	  N_("Save as _Template"),
-  	  "<Shift><Control>t",
+	  "<Shift><Control>t",
 	  N_("Save as Template"),
 	  G_CALLBACK (action_template_cb) }
 };
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c
index cdbdb09872..1777f526fb 100644
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.c
@@ -108,7 +108,7 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t)
 	if (camel_data_wrapper_decode_to_stream(content, out) == -1
 	    || camel_stream_close(out) == -1) {
 		camel_object_unref(out);
- 		goto fail;
+		goto fail;
 	}
 	camel_object_unref(out);
 
diff --git a/plugins/webdav-account-setup/webdav-contacts-source.c b/plugins/webdav-account-setup/webdav-contacts-source.c
index d338094726..c4f7ef9f58 100644
--- a/plugins/webdav-account-setup/webdav-contacts-source.c
+++ b/plugins/webdav-account-setup/webdav-contacts-source.c
@@ -322,7 +322,7 @@ plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data)
 			gtk_check_button_new_with_mnemonic(
 				_("_Avoid IfMatch (needed on Apache < 2.2.8)")));
 	gtk_box_pack_start(hbox, GTK_WIDGET(uidata->avoid_ifmatch_toggle),
-	                   FALSE, FALSE, 0);
+			   FALSE, FALSE, 0);
 
 	set_ui_from_source(uidata);