** Remove trailing whitespace from source code.

2007-11-14  Matthew Barnes  <mbarnes@redhat.com>

	** Remove trailing whitespace from source code.


svn path=/trunk/; revision=34537

30 files changed, 278 insertions, 278 deletions

diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c
index 876412099c..9d953b4997 100644
--- a/shell/e-component-registry.c
+++ b/shell/e-component-registry.c
@@ -201,7 +201,7 @@ query_components (EComponentRegistry *registry)
 		}
 
 		label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_label", languages);
-		
+
 		tooltips = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_tooltips", languages);
 
 		menu_label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_label", languages);
diff --git a/shell/e-config-upgrade.c b/shell/e-config-upgrade.c
index 75c6e6228a..a8a012c058 100644
--- a/shell/e-config-upgrade.c
+++ b/shell/e-config-upgrade.c
@@ -141,9 +141,9 @@ e_config_upgrade(int major, int minor, int revision)
 	conf_file = g_build_filename (g_get_home_dir (), "evolution", "config.xmldb", NULL);
 	config_doc = e_xml_parse_file (conf_file);
 	g_free (conf_file);
-	
+
 	if (config_doc && major <=1 && minor < 3) {
-		GConfClient *gconf;	
+		GConfClient *gconf;
 
 		/* move bonobo config to gconf */
 		gconf = gconf_client_get_default ();
diff --git a/shell/e-corba-config-page.c b/shell/e-corba-config-page.c
index bc8bf8507c..290bdfcb04 100644
--- a/shell/e-corba-config-page.c
+++ b/shell/e-corba-config-page.c
@@ -60,7 +60,7 @@ impl_dispose (GObject *object)
 		bonobo_object_release_unref (priv->config_control_interface, &ev);
 		priv->config_control_interface = CORBA_OBJECT_NIL;
 	}
-	
+
 	CORBA_exception_free (&ev);
 
 	(* G_OBJECT_CLASS (e_corba_config_page_parent_class)->dispose) (object);
@@ -99,7 +99,7 @@ e_corba_config_page_init (ECorbaConfigPage *corba_config_page)
 
 	priv = g_new (ECorbaConfigPagePrivate, 1);
 	priv->config_control_interface = CORBA_OBJECT_NIL;
-	
+
 	corba_config_page->priv = priv;
 }
 
@@ -127,7 +127,7 @@ e_corba_config_page_construct (ECorbaConfigPage *corba_config_page,
 	control_widget = bonobo_widget_new_control_from_objref (control, CORBA_OBJECT_NIL);
 	gtk_widget_show (control_widget);
 	gtk_container_add (GTK_CONTAINER (corba_config_page), control_widget);
-	
+
 	/* Notice we *don't* unref the corba_object here as
 	   bonobo_widget_new_control_from_objref() effectively takes ownership
 	   for the object that we get from ::__get_control.  */
diff --git a/shell/e-history.c b/shell/e-history.c
index d73e9ea54c..c8288f3eaf 100644
--- a/shell/e-history.c
+++ b/shell/e-history.c
@@ -63,7 +63,7 @@ static void
 e_history_class_init (EHistoryClass *klass)
 {
 	GObjectClass *object_class;
-	
+
 	object_class = G_OBJECT_CLASS (klass);
 	object_class->finalize = impl_finalize;
 }
diff --git a/shell/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c
index 24bf3a58e8..5f12035239 100644
--- a/shell/e-shell-folder-title-bar.c
+++ b/shell/e-shell-folder-title-bar.c
@@ -470,8 +470,8 @@ e_shell_folder_title_bar_init (EShellFolderTitleBar *shell_folder_title_bar)
 
 /**
  * e_shell_folder_title_bar_construct:
- * @folder_title_bar: 
- * 
+ * @folder_title_bar:
+ *
  * Construct the folder title bar widget.
  **/
 void
@@ -552,11 +552,11 @@ e_shell_folder_title_bar_construct (EShellFolderTitleBar *folder_title_bar)
 
 /**
  * e_shell_folder_title_bar_new:
- * @void: 
- * 
+ * @void:
+ *
  * Create a new title bar widget.
- * 
- * Return value: 
+ *
+ * Return value:
  **/
 GtkWidget *
 e_shell_folder_title_bar_new (void)
@@ -572,9 +572,9 @@ e_shell_folder_title_bar_new (void)
 
 /**
  * e_shell_folder_title_bar_set_title:
- * @folder_title_bar: 
- * @title: 
- * 
+ * @folder_title_bar:
+ * @title:
+ *
  * Set the title for the title bar.
  **/
 void
@@ -629,9 +629,9 @@ e_shell_folder_title_bar_set_folder_bar_label (EShellFolderTitleBar *folder_titl
 
 /**
  * e_shell_folder_title_bar_set_icon:
- * @folder_title_bar: 
- * @icon: 
- * 
+ * @folder_title_bar:
+ * @icon:
+ *
  * Set the name of the icon for the title bar.
  **/
 void
@@ -668,9 +668,9 @@ e_shell_folder_title_bar_set_icon (EShellFolderTitleBar *folder_title_bar,
 
 /**
  * e_shell_folder_title_bar_set_toggle_state:
- * @folder_title_bar: 
- * @state: 
- * 
+ * @folder_title_bar:
+ * @state:
+ *
  * Set whether the title bar's button is in pressed state (TRUE) or not (FALSE).
  **/
 void
@@ -689,9 +689,9 @@ e_shell_folder_title_bar_set_toggle_state (EShellFolderTitleBar *folder_title_ba
 
 /**
  * e_shell_folder_title_bar_set_clickable:
- * @folder_title_bar: 
- * @clickable: 
- * 
+ * @folder_title_bar:
+ * @clickable:
+ *
  * Specify whether the title in the @folder_title_bar is clickable.  If not,
  * the arrow pixmap is not shown.
  **/
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index ab8d4f6caa..23223614ec 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -90,7 +90,7 @@ typedef struct _ImportDialogImporterPage {
 typedef struct _ImportData {
 	EShell *shell;
 	EShellWindow *window;
-	
+
 	GladeXML *wizard;
 	GtkWidget *dialog;
 	GtkWidget *druid;
@@ -166,9 +166,9 @@ create_help (const char *name)
 			break;
 	}
 
-	if (i >= num_info) 
+	if (i >= num_info)
 		g_warning ("i > num_info\n");
-	
+
 
 	label = gtk_label_new(i < num_info ? _(info[i].text): NULL);
 	gtk_widget_show (label);
@@ -286,14 +286,14 @@ importer_file_page_new (ImportData *data)
 	gtk_box_pack_start (GTK_BOX (page->vbox), table, TRUE, TRUE, 0);
 
 	label = gtk_label_new_with_mnemonic (_("F_ilename:"));
-	gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1, 
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
 			  GTK_FILL, 0, 0, 0);
 	gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
 
 	page->filename = gtk_file_chooser_button_new (_("Select a file"), GTK_FILE_CHOOSER_ACTION_OPEN);
 	g_signal_connect (GTK_FILE_CHOOSER_BUTTON (page->filename), "selection-changed", G_CALLBACK (filename_changed), data);
 
-	gtk_table_attach (GTK_TABLE (table), page->filename, 1, 2, 
+	gtk_table_attach (GTK_TABLE (table), page->filename, 1, 2,
 			  row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
 	gtk_label_set_mnemonic_widget(GTK_LABEL(label), page->filename);
 
@@ -305,7 +305,7 @@ importer_file_page_new (ImportData *data)
 	gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
 
 	page->filetype = gtk_option_menu_new ();
-	gtk_table_attach (GTK_TABLE (table), page->filetype, 1, 2, 
+	gtk_table_attach (GTK_TABLE (table), page->filetype, 1, 2,
 			  row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
 	gtk_label_set_mnemonic_widget(GTK_LABEL(label), page->filetype);
 
@@ -334,7 +334,7 @@ importer_type_page_new (ImportData *data)
 	page = g_new0 (ImportDialogTypePage, 1);
 
 	page->vbox = gtk_vbox_new (FALSE, 5);
-	page->intelligent = gtk_radio_button_new_with_mnemonic (NULL, 
+	page->intelligent = gtk_radio_button_new_with_mnemonic (NULL,
 							     _("Import data and settings from _older programs"));
 	gtk_box_pack_start (GTK_BOX (page->vbox), page->intelligent, FALSE, FALSE, 0);
 	page->file = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (page->intelligent),
@@ -402,7 +402,7 @@ prepare_intelligent_page (GnomeDruidPage *dpage,
 		gtk_widget_show(label);
 		g_free(str);
 
-		gtk_misc_set_alignment((GtkMisc *)label, 0, .5); 
+		gtk_misc_set_alignment((GtkMisc *)label, 0, .5);
 
 		gtk_table_attach((GtkTable *)table, label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0);
 		if (w)
@@ -424,8 +424,8 @@ import_druid_cancel (GnomeDruid *druid,
 }
 
 static gboolean
-import_druid_esc (GnomeDruid *druid, 
-		  GdkEventKey *event, 
+import_druid_esc (GnomeDruid *druid,
+		  GdkEventKey *event,
 		  ImportData *data)
 {
 	if (event->keyval == GDK_Escape) {
@@ -450,7 +450,7 @@ import_druid_weak_notify (void *blah,
 	g_slist_free(data->filepage->items);
 
 	g_object_unref(data->import);
-		
+
 	g_object_unref(data->wizard);
 	g_free(data);
 }
@@ -493,7 +493,7 @@ import_intelligent_done(EImport *ei, void *d)
 	} else
 		import_done(ei, d);
 }
-				
+
 static void
 import_druid_finish (GnomeDruidPage *page,
 		     GnomeDruid *druid,
@@ -678,7 +678,7 @@ e_shell_importer_start_import (EShellWindow *shell_window)
 	data->import = e_import_new("org.gnome.evolution.shell.importer");
 
 	icon = e_icon_factory_get_icon ("stock_mail-import", E_ICON_SIZE_DIALOG);
-	
+
 	dialog_open = TRUE;
 	data->window = shell_window;
 	data->shell = e_shell_window_peek_shell (data->window);
@@ -692,7 +692,7 @@ e_shell_importer_start_import (EShellWindow *shell_window)
 				"Evolution:shell");
 	e_dialog_set_transient_for (GTK_WINDOW (data->dialog), GTK_WIDGET (shell_window));
 	g_object_weak_ref ((GObject *)data->dialog, dialog_weak_notify, &dialog_open);
-	
+
 	data->druid = glade_xml_get_widget (data->wizard, "druid1");
 	g_signal_connect (data->druid, "cancel",
 			  G_CALLBACK (import_druid_cancel), data);
@@ -730,9 +730,9 @@ e_shell_importer_start_import (EShellWindow *shell_window)
 	html = create_help ("intelligent_html");
 	gtk_box_pack_start (GTK_BOX (data->importerpage->vbox), html, FALSE, TRUE, 0);
 	gtk_box_reorder_child (GTK_BOX (data->importerpage->vbox), html, 0);
-	
+
 	gtk_box_pack_start (GTK_BOX (GNOME_DRUID_PAGE_STANDARD (data->intelligent)->vbox), data->importerpage->vbox, TRUE, TRUE, 0);
-	
+
 
 	/* File selection and file type page */
 	data->filedialog = glade_xml_get_widget (data->wizard, "page2-file");
diff --git a/shell/e-shell-nm-glib.c b/shell/e-shell-nm-glib.c
index a85cfd50f4..e14a2afee8 100644
--- a/shell/e-shell-nm-glib.c
+++ b/shell/e-shell-nm-glib.c
@@ -48,7 +48,7 @@ static void e_shell_glib_network_monitor (libnm_glib_ctx *ctx, gpointer user_dat
 
 	if (line_status == E_SHELL_LINE_STATUS_ONLINE && state == LIBNM_NO_NETWORK_CONNECTION) {
 	   	 shell_state = GNOME_Evolution_FORCED_OFFLINE;
-		 e_shell_go_offline (shell, window, shell_state);   
+		 e_shell_go_offline (shell, window, shell_state);
 	} else if (line_status == E_SHELL_LINE_STATUS_OFFLINE && state == LIBNM_ACTIVE_NETWORK_CONNECTION) {
 	       	 shell_state = GNOME_Evolution_USER_ONLINE;
 		 e_shell_go_online (shell, window, shell_state);
@@ -66,11 +66,11 @@ int e_shell_nm_glib_initialise (EShellWindow *window)
 		if (!nm_ctx) {
 				fprintf (stderr, "Could not initialize libnm.\n");
 				return FALSE;
-			  }	
+			  }
 	}
 
 	id = libnm_glib_register_callback (nm_ctx, e_shell_glib_network_monitor, window, NULL);
-	
+
 	return TRUE;
 }
 
diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c
index 4c0a8a52e1..de06ed2d8a 100644
--- a/shell/e-shell-nm.c
+++ b/shell/e-shell-nm.c
@@ -51,9 +51,9 @@ reinit_dbus (gpointer user_data)
 {
 	if (init_dbus (user_data))
 		return FALSE;
-	
+
 	/* keep trying to re-establish dbus connection */
-	
+
 	return TRUE;
 }
 
@@ -68,41 +68,41 @@ e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED,
 	EShell *shell = e_shell_window_peek_shell ((EShellWindow *) user_data);
 	GNOME_Evolution_ShellState shell_state;
 	EShellLineStatus line_status;
-	
+
 	dbus_error_init (&error);
 	object = dbus_message_get_path (message);
-	
+
 	if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected") &&
 		 strcmp (dbus_message_get_path (message), DBUS_PATH_LOCAL) == 0) {
 		dbus_connection_unref (dbus_connection);
 		dbus_connection = NULL;
-		
+
 		g_timeout_add (3000, reinit_dbus, window);
-		
+
 		return DBUS_HANDLER_RESULT_HANDLED;
 	}
-	
+
 	if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNoLongerActive"))
 		status = E_SHELL_LINE_DOWN;
-	else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNowActive")) 
+	else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNowActive"))
 		status = E_SHELL_LINE_UP;
 	else
 		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	
+
 	if (!dbus_message_get_args (message, &error, DBUS_TYPE_OBJECT_PATH,
 				    &object, DBUS_TYPE_INVALID))
 		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	
+
 	line_status = e_shell_get_line_status (shell);
-	
+
 	if (line_status == E_SHELL_LINE_STATUS_ONLINE && status == E_SHELL_LINE_DOWN) {
 		  shell_state = GNOME_Evolution_FORCED_OFFLINE;
-		  e_shell_go_offline (shell, window, shell_state);   
+		  e_shell_go_offline (shell, window, shell_state);
 	} else if (line_status == E_SHELL_LINE_STATUS_OFFLINE && status == E_SHELL_LINE_UP) {
 		  shell_state = GNOME_Evolution_USER_ONLINE;
 		  e_shell_go_online (shell, window, shell_state);
 	}
-	
+
 	return DBUS_HANDLER_RESULT_HANDLED;
 }
 
@@ -110,23 +110,23 @@ static gboolean
 init_dbus (EShellWindow *window)
 {
 	DBusError error;
-	
+
 	if (dbus_connection != NULL)
 		return TRUE;
-	
+
 	dbus_error_init (&error);
 	if (!(dbus_connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error))) {
 		g_warning ("could not get system bus: %s\n", error.message);
 		dbus_error_free (&error);
 		return FALSE;
 	}
-	
+
 	dbus_connection_setup_with_g_main (dbus_connection, NULL);
 	dbus_connection_set_exit_on_disconnect (dbus_connection, FALSE);
-	
+
 	if (!dbus_connection_add_filter (dbus_connection, e_shell_network_monitor, window, NULL))
 		goto exception;
-	
+
 	dbus_bus_add_match (dbus_connection,
 			    "type='signal',"
 			    "interface='" NM_DBUS_INTERFACE "',"
@@ -136,21 +136,21 @@ init_dbus (EShellWindow *window)
 		dbus_error_free (&error);
 		goto exception;
 	}
-	
+
 	return TRUE;
-	
+
  exception:
-	
+
 	dbus_connection_unref (dbus_connection);
 	dbus_connection = NULL;
-	
+
 	return FALSE;
 }
 
 int e_shell_dbus_initialise (EShellWindow *window)
 {
 	g_type_init ();
-	
+
 	return init_dbus (window);
 }
 
diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c
index ec6495dde8..a6de85d45c 100644
--- a/shell/e-shell-settings-dialog.c
+++ b/shell/e-shell-settings-dialog.c
@@ -158,7 +158,7 @@ load_pages (EShellSettingsDialog *dialog)
 	int i, j;
 
 	priv = dialog->priv;
-	
+
 	CORBA_exception_init (&ev);
 
 	control_list = bonobo_activation_query ("repo_ids.has('IDL:GNOME/Evolution/ConfigControl:" BASE_VERSION "')", NULL, &ev);
@@ -249,15 +249,15 @@ load_pages (EShellSettingsDialog *dialog)
 
 		if (page->type != NULL) {
 			Bonobo_StringList list = page->type->v._u.value_stringv;
-			
+
 			for (j = 0; j < list._length; j++) {
 				if (g_hash_table_lookup (priv->types, list._buffer[j]) == NULL)
-					g_hash_table_insert (priv->types, g_strdup (list._buffer[j]), 
+					g_hash_table_insert (priv->types, g_strdup (list._buffer[j]),
 							     GINT_TO_POINTER (i));
 			}
 		}
-		
-		
+
+
 		page_free (page);
 	}
 
@@ -276,11 +276,11 @@ impl_finalize (GObject *object)
 
 	dialog = E_SHELL_SETTINGS_DIALOG (object);
 	priv = dialog->priv;
-	
+
 	g_hash_table_destroy (priv->types);
 
 	g_free (priv);
-	
+
 	(* G_OBJECT_CLASS (e_shell_settings_dialog_parent_class)->finalize) (object);
 }
 
@@ -309,7 +309,7 @@ e_shell_settings_dialog_init (EShellSettingsDialog *dialog)
 
 	load_pages (dialog);
 	set_dialog_size (dialog);
-	
+
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Evolution Preferences"));
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 }
@@ -331,13 +331,13 @@ e_shell_settings_dialog_show_type (EShellSettingsDialog *dialog, const char *typ
 	EShellSettingsDialogPrivate *priv;
 	gpointer key, value;
 	int page;
-	
+
 	g_return_if_fail (dialog != NULL);
 	g_return_if_fail (E_IS_SHELL_SETTINGS_DIALOG (dialog));
 	g_return_if_fail (type != NULL);
 
 	priv = dialog->priv;
-	
+
 	if (!g_hash_table_lookup_extended (priv->types, type, &key, &value)) {
 		char *slash, *supertype;
 
@@ -350,7 +350,7 @@ e_shell_settings_dialog_show_type (EShellSettingsDialog *dialog, const char *typ
 			value = NULL;
 	}
 	page = GPOINTER_TO_INT (value);
-	
+
 	e_multi_config_dialog_show_page (E_MULTI_CONFIG_DIALOG (dialog), page);
 }
 
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c
index c8846dfff8..0343c4eb25 100644
--- a/shell/e-shell-utils.c
+++ b/shell/e-shell-utils.c
@@ -118,14 +118,14 @@ e_shell_folder_name_is_valid (const char *name,
 			*reason_return = _("No folder name specified.");
 		return FALSE;
 	}
-	
+
 	/* GtkEntry is broken - if you hit KP_ENTER you get a \r inserted... */
 	if (strchr (name, '\r')) {
 		if (reason_return != NULL)
 			*reason_return = _("Folder name cannot contain the Return character.");
 		return FALSE;
 	}
-	
+
 	if (strchr (name, E_PATH_SEPARATOR) != NULL) {
 		if (reason_return != NULL)
 			*reason_return = _("Folder name cannot contain the character \"/\".");
@@ -145,7 +145,7 @@ e_shell_folder_name_is_valid (const char *name,
 	}
 
 	*reason_return = NULL;
-	
+
 	return TRUE;
 }
 
diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c
index 799cb2002d..7700e86608 100644
--- a/shell/e-shell-window-commands.c
+++ b/shell/e-shell-window-commands.c
@@ -639,7 +639,7 @@ static const char *authors[] = {
 	NULL
 };
 
-static const char *documentors[] = { 
+static const char *documentors[] = {
 	"Aaron Weber",
 	"Binika Preet",
 	"Dan Winship",
@@ -688,7 +688,7 @@ command_help_faq (BonoboUIComponent *uih,
 {
 	/* FIXME Show when we have a faq */
 	/* FIXME use the error */
-	gnome_url_show ("http://gnome.org/projects/evolution/faq.shtml", NULL);	
+	gnome_url_show ("http://gnome.org/projects/evolution/faq.shtml", NULL);
 }
 #endif
 
@@ -780,7 +780,7 @@ command_forget_passwords (BonoboUIComponent *ui_component,
 			  void *data,
 			  const char *path)
 {
-	if (e_error_run (NULL, "shell:forget-passwords", NULL) == GTK_RESPONSE_OK) 
+	if (e_error_run (NULL, "shell:forget-passwords", NULL) == GTK_RESPONSE_OK)
 		e_passwords_forget_passwords();
 }
 
@@ -853,7 +853,7 @@ static EPixmap pixmaps [] = {
 	E_PIXMAP ("/menu/File/FileClose", "window-close", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/menu/File/FileExit", "application-exit", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/menu/Edit/Settings", "preferences-desktop", E_ICON_SIZE_MENU),
-	
+
 	E_PIXMAP_END
 };
 
@@ -994,7 +994,7 @@ view_buttons_hide_item_toggled_handler (BonoboUIComponent           *ui_componen
 	gboolean is_visible;
 
 	sidebar = e_shell_window_peek_sidebar (shell_window);
-	
+
 	is_visible = state[0] == '0';
 
 	e_sidebar_set_show_buttons (sidebar, is_visible);
@@ -1026,7 +1026,7 @@ view_statusbar_item_toggled_handler (BonoboUIComponent           *ui_component,
 	gboolean is_visible;
 	GConfClient *gconf_client;
 
-	is_visible = state[0] == '1';	
+	is_visible = state[0] == '1';
 	if(is_visible)
 		gtk_widget_show (status_bar);
 	else
@@ -1047,7 +1047,7 @@ view_sidebar_item_toggled_handler (BonoboUIComponent           *ui_component,
 	gboolean is_visible;
 	GConfClient *gconf_client;
 
-	is_visible = state[0] == '1';	
+	is_visible = state[0] == '1';
 	if(is_visible)
 		gtk_widget_show (side_bar);
 	else
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index a76183c7f6..d897160807 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -106,7 +106,7 @@ struct _EShellWindowPrivate {
 
 	/* The sidebar.  */
 	GtkWidget *sidebar;
-	
+
 	/* Notebooks used to switch between components.  */
 	GtkWidget *sidebar_notebook;
 	GtkWidget *view_notebook;
@@ -467,7 +467,7 @@ sidebar_button_pressed_callback (ESidebar       *sidebar,
 		ComponentView *component_view;
 
 		if ((component_view = get_component_view (window, button_id))) {
-			e_shell_create_window (window->priv->shell.eshell, 
+			e_shell_create_window (window->priv->shell.eshell,
 					       component_view->component_id,
 					       window);
 		}
@@ -624,7 +624,7 @@ setup_nm_support (EShellWindow *window)
 	       e_shell_nm_glib_initialise (window);
 	#elif NM_SUPPORT
 	       e_shell_dbus_initialise (window);
-	#endif             
+	#endif
 }
 
 static void
@@ -688,7 +688,7 @@ setup_widgets (EShellWindow *window)
 	gboolean visible;
 	char *style;
 	int mode;
-	
+
 	priv->paned = gtk_hpaned_new ();
 	gtk_widget_show (priv->paned);
 
@@ -730,7 +730,7 @@ setup_widgets (EShellWindow *window)
 	style = gconf_client_get_string (gconf_client,
 					 "/apps/evolution/shell/view_defaults/buttons_style",
 					 NULL);
-	
+
  	if (gconf_string_to_enum (button_styles, style, &mode)) {
 		switch (mode) {
 		case E_SIDEBAR_MODE_TEXT:
@@ -755,7 +755,7 @@ setup_widgets (EShellWindow *window)
 						      "state", "1", NULL);
 			break;
 		}
-		
+
 		e_sidebar_set_mode (E_SIDEBAR (priv->sidebar), mode);
 	}
 	g_free (style);
@@ -870,7 +870,7 @@ impl_dispose (GObject *object)
 	EShellWindowPrivate *priv = self->priv;
 
 	priv->destroyed = TRUE;
-	
+
 	if (priv->shell.eshell != NULL) {
 		g_object_remove_weak_pointer (G_OBJECT (priv->shell.eshell), &priv->shell.pointer);
 		priv->shell.eshell = NULL;
@@ -889,11 +889,11 @@ impl_dispose (GObject *object)
 	if (priv->store_window_size_timer) {
 		g_source_remove (priv->store_window_size_timer);
 		self->priv->store_window_size_timer = 0;
-		
+
 		/* There was a timer. Let us store the settings.*/
-		store_window_size (GTK_WIDGET (self));		
+		store_window_size (GTK_WIDGET (self));
 	}
-	
+
 	#ifdef NM_SUPPORT_GLIB
 		e_shell_nm_glib_dispose (E_SHELL_WINDOW (object));
 	#elif NM_SUPPORT
@@ -1015,7 +1015,7 @@ e_shell_window_init (EShellWindow *shell_window)
 	priv->tooltips = gtk_tooltips_new ();
 	priv->shell_view = e_shell_view_new(shell_window);
 	priv->destroyed = FALSE;
-	
+
 	shell_window->priv = priv;
 
 	/** @HookPoint: Shell Main Menu
@@ -1234,7 +1234,7 @@ e_shell_window_save_defaults (EShellWindow *window)
 				       NULL);
 		g_free (prop);
 	}
-	
+
 	/* SideBar visibility setting */
 	prop = bonobo_ui_component_get_prop (e_shell_window_peek_bonobo_ui_component (window),
 					     "/commands/ViewSideBar",
@@ -1248,7 +1248,7 @@ e_shell_window_save_defaults (EShellWindow *window)
 				       NULL);
 		g_free (prop);
 	}
-	
+
 
 	g_object_unref (client);
 }
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 0fdf766903..4e651453a4 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -165,11 +165,11 @@ set_interactive (EShell *shell,
 	GtkWidget *view;
 
 	g_return_if_fail (E_IS_SHELL (shell));
-	
+
 	shell->priv->is_interactive = interactive;
 
 	num_windows = g_list_length (shell->priv->windows);
-	
+
 	/* We want to send the "interactive" message only when the first
 	window is created */
 	if (num_windows != 1)
@@ -196,7 +196,7 @@ set_interactive (EShell *shell,
 
 		/* Ignore errors, the components can decide to not implement
 		   this interface. */
-		
+
 		CORBA_exception_free (&ev);
 	}
 }
@@ -249,7 +249,7 @@ impl_Shell_createNewWindow (PortableServer_Servant servant,
 
 	/* refs?? */
 	shell_view = e_shell_view_new(shell_window);
-	
+
 	return BONOBO_OBJREF(shell_view);
 
 }
@@ -283,14 +283,14 @@ impl_Shell_handleURI (PortableServer_Servant servant,
 
 	if (show) {
 		GtkWidget *shell_window;
-		
+
 		shell_window = (GtkWidget *)e_shell_create_window (shell, component_info->id, NULL);
 		if (shell_window == NULL) {
 			CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_ComponentNotFound, NULL);
 			return;
 		}
 	}
-	
+
 	GNOME_Evolution_Component_handleURI (component_info->iface, uri, ev);
 	/* not an error not to implement it */
 	if (ev->_id != NULL && strcmp(ev->_id, ex_CORBA_NO_IMPLEMENT) == 0)
@@ -556,10 +556,10 @@ detect_version (GConfClient *gconf, int *major, int *minor, int *revision)
 {
 	char *val, *evolution_dir;
 	struct stat st;
-	
+
 	evolution_dir = g_build_filename (g_get_home_dir (), "evolution", NULL);
-	
-	val = gconf_client_get_string(gconf, "/apps/evolution/version", NULL);	
+
+	val = gconf_client_get_string(gconf, "/apps/evolution/version", NULL);
 	if (val) {
 		/* Since 1.4.0 We've been keeping the version key in gconf */
 		sscanf(val, "%d.%d.%d", major, minor, revision);
@@ -593,7 +593,7 @@ detect_version (GConfClient *gconf, int *major, int *minor, int *revision)
 		}
 		g_free (tmp);
 		if (config_doc)
-			xmlFreeDoc (config_doc);		
+			xmlFreeDoc (config_doc);
 	}
 
 	g_free (evolution_dir);
@@ -615,9 +615,9 @@ attempt_upgrade (EShell *shell, int major, int minor, int revision)
 		CORBA_Environment ev;
 
 		CORBA_exception_init (&ev);
-		
+
 		GNOME_Evolution_Component_upgradeFromVersion (info->iface, major, minor, revision, &ev);
-		
+
 		if (BONOBO_EX (&ev)) {
 			char *exception_text;
 			CORBA_char *id = CORBA_exception_id(&ev);
@@ -654,7 +654,7 @@ attempt_upgrade (EShell *shell, int major, int minor, int revision)
  * @shell: An EShell object to construct
  * @iid: OAFIID for registering the shell into the name server
  * @startup_line_mode: How to set up the line mode (online or offline) initally.
- * 
+ *
  * Construct @shell so that it uses the specified @corba_object.
  *
  * Return value: The result of the operation.
@@ -668,31 +668,31 @@ e_shell_construct (EShell *shell,
 	CORBA_Object corba_object;
 	gboolean start_online;
 	GSList *component;
-	
+
 	g_return_val_if_fail (E_IS_SHELL (shell), E_SHELL_CONSTRUCT_RESULT_INVALIDARG);
 	g_return_val_if_fail (startup_line_mode == E_SHELL_STARTUP_LINE_MODE_CONFIG
 			      || startup_line_mode == E_SHELL_STARTUP_LINE_MODE_ONLINE
 			      || startup_line_mode == E_SHELL_STARTUP_LINE_MODE_OFFLINE,
 			      E_SHELL_CONSTRUCT_RESULT_INVALIDARG);
-	
+
 	priv = shell->priv;
 	priv->iid = g_strdup (iid);
 
 	/* Now we can register into OAF.  Notice that we shouldn't be
 	   registering into OAF until we are sure we can complete.  */
-	
+
 	/* FIXME: Multi-display stuff.  */
 	corba_object = bonobo_object_corba_objref (BONOBO_OBJECT (shell));
 	if (bonobo_activation_active_server_register (iid, corba_object) != Bonobo_ACTIVATION_REG_SUCCESS)
 		return E_SHELL_CONSTRUCT_RESULT_CANNOTREGISTER;
 
 	while (gtk_events_pending ())
-		gtk_main_iteration ();	
-	
+		gtk_main_iteration ();
+
 	/* activate all the components (peek list does this implictly) */
 	/* Do we really need to assign the result of this to the list? */
 	component = e_component_registry_peek_list (shell->priv->component_registry);
-	
+
 	e_shell_attempt_upgrade(shell);
 
 	priv->is_initialized = TRUE;
@@ -725,10 +725,10 @@ e_shell_construct (EShell *shell,
  * @start_online: Whether to start in on-line mode or not.
  * @construct_result_return: A pointer to an EShellConstructResult variable into
  * which the result of the operation will be stored.
- * 
+ *
  * Create a new EShell.
- * 
- * Return value: 
+ *
+ * Return value:
  **/
 EShell *
 e_shell_new (EShellStartupLineMode startup_line_mode,
@@ -793,10 +793,10 @@ fail:
 
 /**
  * e_shell_attempt_upgrade:
- * @shell: 
- * 
+ * @shell:
+ *
  * Upgrade config and components from the currently installed version.
- * 
+ *
  * Return value: %TRUE If it works.  If it fails the application will exit.
  **/
 gboolean
@@ -904,13 +904,13 @@ check_old:
 	/** @Event: Shell attempted upgrade
 	 * @Id: upgrade.done
 	 * @Target: ESMenuTargetState
-	 * 
+	 *
 	 * This event is emitted whenever the shell successfully attempts an upgrade.
 	 *
 	 */
 	ese = es_event_peek();
 	e_event_emit((EEvent *)ese, "upgrade.done", (EEventTarget *)es_event_target_new_upgrade(ese, cmajor, cminor, crevision));
-	
+
 	return TRUE;
 }
 
@@ -919,9 +919,9 @@ check_old:
  * @shell: The shell for which to create a new window.
  * @component_id: Id or alias of the component to display in the new window.
  * @template_window: Window from which to copy the window settings (can be %NULL).
- * 
+ *
  * Create a new window for @uri.
- * 
+ *
  * Return value: The new window.
  **/
 EShellWindow *
@@ -952,7 +952,7 @@ e_shell_create_window (EShell *shell,
 
 	if (!session_started) {
 		ESEvent *ese;
-		
+
 		session_started = TRUE;
 		ese = es_event_peek();
 		e_event_emit((EEvent *)ese, "started.done", (EEventTarget *)es_event_target_new_shell(ese, shell));
@@ -981,9 +981,9 @@ e_shell_request_close_window (EShell *shell,
 /**
  * e_shell_peek_uri_schema_registry:
  * @shell: An EShell object.
- * 
+ *
  * Get the schema registry associated to @shell.
- * 
+ *
  * Return value: A pointer to the EUriSchemaRegistry associated to @shell.
  **/
 EUriSchemaRegistry  *
@@ -998,11 +998,11 @@ e_shell_peek_uri_schema_registry (EShell *shell)
 
 /**
  * e_shell_peek_component_registry:
- * @shell: 
- * 
+ * @shell:
+ *
  * Get the component registry associated to @shell.
- * 
- * Return value: 
+ *
+ * Return value:
  **/
 EComponentRegistry *
 e_shell_peek_component_registry (EShell *shell)
@@ -1015,10 +1015,10 @@ e_shell_peek_component_registry (EShell *shell)
 
 /**
  * e_shell_save_settings:
- * @shell: 
- * 
+ * @shell:
+ *
  * Save the settings for this shell.
- * 
+ *
  * Return value: %TRUE if it worked, %FALSE otherwise.  Even if %FALSE is
  * returned, it is possible that at least part of the settings for the windows
  * have been saved.
@@ -1040,8 +1040,8 @@ e_shell_save_settings (EShell *shell)
 
 /**
  * e_shell_close_all_windows:
- * @shell: 
- * 
+ * @shell:
+ *
  * Destroy all the windows in @shell.
  **/
 void
@@ -1054,7 +1054,7 @@ e_shell_close_all_windows (EShell *shell)
 	g_return_if_fail (E_IS_SHELL (shell));
 
 	if (shell->priv->windows)
-		e_shell_save_settings (shell); 
+		e_shell_save_settings (shell);
 
 	priv = shell->priv;
 	for (p = priv->windows; p != NULL; p = pnext) {
@@ -1069,9 +1069,9 @@ e_shell_close_all_windows (EShell *shell)
 /**
  * e_shell_get_line_status:
  * @shell: A pointer to an EShell object.
- * 
+ *
  * Get the line status for @shell.
- * 
+ *
  * Return value: The current line status for @shell.
  **/
 EShellLineStatus
@@ -1100,7 +1100,7 @@ set_line_status_finished(EShell *shell)
 	/** @Event: Shell online state changed
 	 * @Id: state.changed
 	 * @Target: ESMenuTargetState
-	 * 
+	 *
 	 * This event is emitted whenever the shell online state changes.
 	 *
 	 * Only the online and offline states are emitted.
@@ -1133,10 +1133,10 @@ set_line_status(EShell *shell, GNOME_Evolution_ShellState shell_state)
 	gboolean status;
 
 	priv = shell->priv;
-	
+
 	if (shell_state == GNOME_Evolution_FORCED_OFFLINE || shell_state == GNOME_Evolution_USER_OFFLINE)
 		status = FALSE;
-	else 
+	else
 		status = TRUE;
 
 	if ((status && priv->line_status == E_SHELL_LINE_STATUS_ONLINE)
@@ -1165,7 +1165,7 @@ set_line_status(EShell *shell, GNOME_Evolution_ShellState shell_state)
 		GNOME_Evolution_Component_setLineStatus(info->iface, shell_state, bonobo_object_corba_objref((BonoboObject *)priv->line_status_listener), &ev);
 		if (ev._major == CORBA_NO_EXCEPTION)
 			priv->line_status_pending++;
-		
+
 		CORBA_exception_free (&ev);
 	}
 
@@ -1176,9 +1176,9 @@ set_line_status(EShell *shell, GNOME_Evolution_ShellState shell_state)
 
 /**
  * e_shell_go_offline:
- * @shell: 
+ * @shell:
  * @action_window: Obsolete/unused.
- * 
+ *
  * Make the shell go into off-line mode.
  **/
 void
@@ -1195,9 +1195,9 @@ e_shell_go_offline (EShell *shell,
 
 /**
  * e_shell_go_online:
- * @shell: 
+ * @shell:
  * @action_window: Obsolete/unused.
- * 
+ *
  * Make the shell go into on-line mode.
  **/
 void
@@ -1243,18 +1243,18 @@ e_shell_show_settings (EShell *shell,
 		       EShellWindow *shell_window)
 {
 	EShellPrivate *priv;
-	
+
 	g_return_if_fail (shell != NULL);
 	g_return_if_fail (E_IS_SHELL (shell));
 
 	priv = shell->priv;
-	
+
 	if (priv->settings_dialog.widget != NULL) {
 		gdk_window_show (priv->settings_dialog.widget->window);
 		gtk_widget_grab_focus (priv->settings_dialog.widget);
 		return;
 	}
-	
+
 	priv->settings_dialog.widget = e_shell_settings_dialog_new ();
 
 	if (type != NULL)
diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c
index 24f685a525..9bf9b0ae33 100644
--- a/shell/e-sidebar.c
+++ b/shell/e-sidebar.c
@@ -50,9 +50,9 @@ typedef struct {
 struct _ESidebarPrivate {
 	ESidebarMode mode;
 	ESidebarMode toolbar_mode;
-	
+
 	gboolean show;
-	
+
 	GtkWidget *selection_widget;
 	GSList *buttons;
 
@@ -222,7 +222,7 @@ layout_buttons (ESidebar *sidebar)
 		gtk_widget_size_request (GTK_WIDGET (button->button_widget), &requisition);
 
 		max_btn_height = MAX (max_btn_height, requisition.height);
-		max_btn_width = MAX (max_btn_width, requisition.width);	
+		max_btn_width = MAX (max_btn_width, requisition.width);
 	}
 
 	/* Figure out how many rows and columns we'll use. */
@@ -264,7 +264,7 @@ layout_buttons (ESidebar *sidebar)
 	/* Layout the buttons. */
 	for (i = row_last; i >= 0; i --) {
 		int len, extra_width;
-		
+
 		y -= max_btn_height;
 		x = H_PADDING + allocation->x;
 		len = g_slist_length (rows[i]);
@@ -306,13 +306,13 @@ do_layout (ESidebar *sidebar)
 		y = layout_buttons (sidebar);
 	else
 		y = allocation->y + allocation->height;
-	
+
 	/* Place the selection widget.  */
 	child_allocation.x = allocation->x;
 	child_allocation.y = allocation->y;
 	child_allocation.width = allocation->width;
 	child_allocation.height = y - allocation->y;
-	
+
 	gtk_widget_size_allocate (sidebar->priv->selection_widget, & child_allocation);
 }
 
@@ -380,7 +380,7 @@ impl_size_request (GtkWidget *widget,
 
 	if (!sidebar->priv->show)
 		return;
-	
+
 	for (p = sidebar->priv->buttons; p != NULL; p = p->next) {
 		Button *button = p->data;
 		GtkRequisition button_requisition;
@@ -418,7 +418,7 @@ impl_dispose (GObject *object)
 		gconf_client_notify_remove (gconf_client, priv->style_changed_id);
 		priv->style_changed_id = 0;
 	}
-	
+
  	g_object_unref (gconf_client);
 
 	(* G_OBJECT_CLASS (e_sidebar_parent_class)->dispose) (object);
@@ -431,7 +431,7 @@ boolean_handled_accumulator (GSignalInvocationHint *ihint,
 			     gpointer               dummy)
 {
 	gboolean handled;
-	
+
 	handled = g_value_get_boolean (handler_return);
 	g_value_set_boolean (return_accu, handled);
 
@@ -493,7 +493,7 @@ e_sidebar_init (ESidebar *sidebar)
 	ESidebarPrivate *priv;
 
 	GTK_WIDGET_SET_FLAGS (sidebar, GTK_NO_WINDOW);
-  
+
 	priv = g_new0 (ESidebarPrivate, 1);
 	sidebar->priv = priv;
 
@@ -550,12 +550,12 @@ e_sidebar_add_button (ESidebar *sidebar,
 
 	icon_widget = gtk_image_new_from_pixbuf (icon);
 	gtk_widget_show (icon_widget);
-	
+
 	label_widget = gtk_label_new (label);
 	gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.5);
 	gtk_widget_show (label_widget);
 	button_tooltips = gtk_tooltips_new();
-	gtk_tooltips_set_tip (GTK_TOOLTIPS (button_tooltips), button_widget, tooltips, NULL);		
+	gtk_tooltips_set_tip (GTK_TOOLTIPS (button_tooltips), button_widget, tooltips, NULL);
 
 	switch (INTERNAL_MODE (sidebar)) {
 	case E_SIDEBAR_MODE_TEXT:
@@ -653,7 +653,7 @@ set_mode_internal (ESidebar *sidebar, ESidebarMode mode )
 
 	if (mode == INTERNAL_MODE (sidebar))
 		return;
-	
+
 	for (p = sidebar->priv->buttons; p != NULL; p = p->next) {
 		Button *button = p->data;
 
@@ -703,8 +703,8 @@ style_changed_notify (GConfClient *gconf, guint id, GConfEntry *entry, void *dat
 {
 	ESidebar *sidebar = data;
  	char *val;
- 	int mode;	
- 
+ 	int mode;
+
 	val = gconf_client_get_string (gconf, "/desktop/gnome/interface/toolbar_style", NULL);
 	if (val == NULL || !gconf_string_to_enum (toolbar_styles, val, &mode))
 		mode = E_SIDEBAR_MODE_BOTH;
@@ -728,9 +728,9 @@ e_sidebar_set_mode (ESidebar *sidebar, ESidebarMode mode)
 		if (sidebar->priv->style_changed_id) {
 			gconf_client_notify_remove (gconf_client, sidebar->priv->style_changed_id);
 			sidebar->priv->style_changed_id = 0;
-		}		
+		}
 	}
-	
+
 	if (mode != E_SIDEBAR_MODE_TOOLBAR) {
 		set_mode_internal (sidebar, mode);
 
@@ -747,7 +747,7 @@ e_sidebar_set_mode (ESidebar *sidebar, ESidebarMode mode)
 									   style_changed_notify, sidebar, NULL, NULL);
 		style_changed_notify (gconf_client, 0, NULL, sidebar);
 	}
-	
+
 	g_object_unref (gconf_client);
 
 	sidebar->priv->mode = mode;
@@ -760,7 +760,7 @@ e_sidebar_set_show_buttons  (ESidebar *sidebar, gboolean show)
 
 	if (sidebar->priv->show == show)
 		return;
-	
+
 	for (p = sidebar->priv->buttons; p != NULL; p = p->next) {
 		Button *button = p->data;
 
@@ -774,7 +774,7 @@ e_sidebar_set_show_buttons  (ESidebar *sidebar, gboolean show)
 
 	gtk_widget_queue_resize (GTK_WIDGET (sidebar));
 }
-		
+
 gboolean
 e_sidebar_get_show_buttons  (ESidebar *sidebar)
 {
diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c
index b367113683..bd72b57f59 100644
--- a/shell/e-user-creatable-items-handler.c
+++ b/shell/e-user-creatable-items-handler.c
@@ -382,7 +382,7 @@ execute_verb (EUserCreatableItemsHandler *handler,
 				CORBA_Environment ev;
 
 				CORBA_exception_init (&ev);
-				
+
 				GNOME_Evolution_Component_requestCreateItem (component->component, id, &ev);
 
 				if (ev._major != CORBA_NO_EXCEPTION)
@@ -706,8 +706,8 @@ new_button_change (GConfClient *gconf,
 	priv = handler->priv;
 	val = gconf_client_get_string (gconf, "/desktop/gnome/interface/toolbar_style", NULL);
 
-	set_combo_button_style (E_COMBO_BUTTON (priv->new_button), 
-				val, priv->default_menu_item->icon);	
+	set_combo_button_style (E_COMBO_BUTTON (priv->new_button),
+				val, priv->default_menu_item->icon);
 
 	g_free (val);
 	gtk_widget_show (priv->new_button);
@@ -731,7 +731,7 @@ setup_toolbar_button (EUserCreatableItemsHandler *handler)
 	gtk_widget_show_all (priv->new_menu);
 	e_combo_button_set_menu (E_COMBO_BUTTON (priv->new_button),
 				 GTK_MENU (priv->new_menu));
-        
+
 	g_signal_connect (priv->new_button, "activate_default",
 			  G_CALLBACK (default_activate), handler);
 
@@ -745,11 +745,11 @@ setup_toolbar_button (EUserCreatableItemsHandler *handler)
 	}
 
 	gtk_widget_set_sensitive (priv->new_button, TRUE);
-	
-	set_combo_button_style (E_COMBO_BUTTON (priv->new_button), 
-				val, priv->default_menu_item->icon);	
 
-	gconf_client_notify_add(gconf,"/desktop/gnome/interface/toolbar_style", 
+	set_combo_button_style (E_COMBO_BUTTON (priv->new_button),
+				val, priv->default_menu_item->icon);
+
+	gconf_client_notify_add(gconf,"/desktop/gnome/interface/toolbar_style",
 		(GConfClientNotifyFunc)new_button_change, handler, NULL, NULL);
 
 	gtk_widget_show (priv->new_button);
@@ -775,7 +775,7 @@ impl_set_property (GObject *object, guint prop_id,
 	case PROP_THIS_COMPONENT:
 		handler->priv->this_component = g_value_dup_string (value);
 
-		get_components_from_bonobo (handler);	
+		get_components_from_bonobo (handler);
 		ensure_menu_items (handler);
 		break;
 	default:
@@ -843,7 +843,7 @@ static void
 e_user_creatable_items_handler_class_init (EUserCreatableItemsHandlerClass *klass)
 {
 	GObjectClass *object_class;
-	
+
 	object_class = G_OBJECT_CLASS (klass);
 	object_class->dispose      = impl_dispose;
 	object_class->finalize     = impl_finalize;
@@ -888,7 +888,7 @@ e_user_creatable_items_handler_new (const char *component_alias,
  * e_user_creatable_items_handler_activate:
  * @handler: the #EUserCreatableItemsHandler
  * @ui_component: the #BonoboUIComponent to attach to
- * 
+ *
  * Set up the menus and toolbar items for @ui_component.
  **/
 void
diff --git a/shell/es-event.c b/shell/es-event.c
index 78847e3f49..89ba18f492 100644
--- a/shell/es-event.c
+++ b/shell/es-event.c
@@ -90,11 +90,11 @@ es_event_get_type(void)
 
 /**
  * es_event_peek:
- * @void: 
- * 
+ * @void:
+ *
  * Get the singular instance of the shell event handler.
- * 
- * Return value: 
+ *
+ * Return value:
  **/
 ESEvent *es_event_peek(void)
 {
@@ -148,7 +148,7 @@ es_event_target_new_upgrade(ESEvent *eme, int major, int minor, int revision)
 	t->minor = minor;
 	t->revision = revision;
 
-	return t;	
+	return t;
 }
 
 /* ********************************************************************** */
@@ -185,7 +185,7 @@ emeh_class_init(EPluginHookClass *klass)
 	/** @HookClass: Shell Main Menu
 	 * @Id: org.gnome.evolution.shell.events:1.0
 	 * @Target: ESEventTargetState
-	 * 
+	 *
 	 * A hook for events coming from the shell.
 	 **/
 
@@ -202,7 +202,7 @@ GType
 es_event_hook_get_type(void)
 {
 	static GType type = 0;
-	
+
 	if (!type) {
 		static const GTypeInfo info = {
 			sizeof(ESEventHookClass), NULL, NULL, (GClassInitFunc) emeh_class_init, NULL, NULL,
@@ -212,6 +212,6 @@ es_event_hook_get_type(void)
 		emeh_parent_class = g_type_class_ref(e_event_hook_get_type());
 		type = g_type_register_static(e_event_hook_get_type(), "ESEventHook", &info, 0);
 	}
-	
+
 	return type;
 }
diff --git a/shell/es-menu.c b/shell/es-menu.c
index 2d62bf16f2..ed7ceef46c 100644
--- a/shell/es-menu.c
+++ b/shell/es-menu.c
@@ -100,10 +100,10 @@ ESMenu *es_menu_new(const char *menuid)
  * es_menu_target_new_shell:
  * @esm:
  * @flags:
- * 
+ *
  * Create a new menu target for the shell.
- * 
- * Return value: 
+ *
+ * Return value:
  **/
 ESMenuTargetShell *
 es_menu_target_new_shell(ESMenu *esm, guint32 flags)
@@ -150,7 +150,7 @@ esph_class_init(EPluginHookClass *klass)
 	/** @HookClass: Shell Main Menu
 	 * @Id: org.gnome.evolution.shell.bonobomenu:1.0
 	 * @Target: ESMenuTargetShell
-	 * 
+	 *
 	 * A hook for the main menus from the shell component.
 	 *
 	 * These menu's will be available from all components, but
@@ -171,7 +171,7 @@ GType
 es_menu_hook_get_type(void)
 {
 	static GType type = 0;
-	
+
 	if (!type) {
 		static const GTypeInfo info = {
 			sizeof(ESMenuHookClass), NULL, NULL, (GClassInitFunc) esph_class_init, NULL, NULL,
@@ -181,6 +181,6 @@ es_menu_hook_get_type(void)
 		esph_parent_class = g_type_class_ref(e_menu_hook_get_type());
 		type = g_type_register_static(e_menu_hook_get_type(), "ESMenuHook", &info, 0);
 	}
-	
+
 	return type;
 }
diff --git a/shell/evolution-component.c b/shell/evolution-component.c
index fd8a6e5d74..07de00c282 100644
--- a/shell/evolution-component.c
+++ b/shell/evolution-component.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
+/*
  * Copyright (C) 2005  Novell, Inc.
  *
  * Authors: Michael Zucchi <notzed@novell.com>
diff --git a/shell/evolution-config-control.c b/shell/evolution-config-control.c
index 6b00fd8559..3e38a43456 100644
--- a/shell/evolution-config-control.c
+++ b/shell/evolution-config-control.c
@@ -129,7 +129,7 @@ evolution_config_control_class_init (EvolutionConfigControlClass *class)
 	epv = &class->epv;
 	epv->_get_control     = impl__get_control;
 	epv->_get_eventSource = impl__get_eventSource;
-	
+
 	parent_class = g_type_class_ref (PARENT_TYPE);
 }
 
diff --git a/shell/evolution-listener.c b/shell/evolution-listener.c
index 83d5d6a34e..3e2cfa944c 100644
--- a/shell/evolution-listener.c
+++ b/shell/evolution-listener.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
+/*
  * Copyright (C) 2005  Novell, Inc.
  *
  * Authors: Michael Zucchi <notzed@novell.com>
diff --git a/shell/evolution-shell-component-utils.c b/shell/evolution-shell-component-utils.c
index cbdbac0c10..bd63228deb 100644
--- a/shell/evolution-shell-component-utils.c
+++ b/shell/evolution-shell-component-utils.c
@@ -89,9 +89,9 @@ free_pixmaps (void)
 /**
  * e_get_activation_failure_msg:
  * @ev: An exception returned by an oaf_activate call.
- * 
+ *
  * Get a descriptive error message from @ev.
- * 
+ *
  * Return value: A newly allocated string with the printable error message.
  **/
 char *
@@ -103,7 +103,7 @@ e_get_activation_failure_msg (CORBA_Environment *ev)
 		return NULL;
 
 	if (strcmp (CORBA_exception_id (ev), ex_Bonobo_GeneralError) != 0) {
-		return bonobo_exception_get_text (ev); 
+		return bonobo_exception_get_text (ev);
 	} else {
 		const Bonobo_GeneralError *oaf_general_error;
 
diff --git a/shell/importer/evolution-importer-client.c b/shell/importer/evolution-importer-client.c
index 24ed38b445..89cac677d3 100644
--- a/shell/importer/evolution-importer-client.c
+++ b/shell/importer/evolution-importer-client.c
@@ -66,7 +66,7 @@ evolution_importer_client_init (EvolutionImporterClient *client)
  * @objref: The CORBA_Object to make a client for.
  *
  * Makes a client for @objref. @objref should be an Evolution_Importer.
- * 
+ *
  * Returns: A newly created EvolutionImporterClient.
  */
 EvolutionImporterClient *
@@ -87,7 +87,7 @@ evolution_importer_client_new (const CORBA_Object objref)
  * @id: The oafiid of the component to make a client for.
  *
  * Makes a client for the object returned by activating @id.
- * 
+ *
  * Returns: A newly created EvolutionImporterClient.
  */
 EvolutionImporterClient *
@@ -123,7 +123,7 @@ evolution_importer_client_create_control (EvolutionImporterClient *client)
 	GtkWidget *widget = NULL;
 	Bonobo_Control control;
 	CORBA_Environment ev;
-	
+
 	g_return_val_if_fail (client != NULL, NULL);
 	g_return_val_if_fail (EVOLUTION_IS_IMPORTER_CLIENT (client), NULL);
 
@@ -135,11 +135,11 @@ evolution_importer_client_create_control (EvolutionImporterClient *client)
 		/* FIXME Pass in container? */
 		widget = bonobo_widget_new_control_from_objref (control, NULL);
 		gtk_widget_show (widget);
-	}	
-	
+	}
+
 	CORBA_exception_free (&ev);
 
-	return widget;	
+	return widget;
 }
 
 /**
@@ -165,7 +165,7 @@ evolution_importer_client_support_format (EvolutionImporterClient *client,
 
 	CORBA_exception_init (&ev);
 	corba_importer = client->objref;
-	result = GNOME_Evolution_Importer_supportFormat (corba_importer, 
+	result = GNOME_Evolution_Importer_supportFormat (corba_importer,
 							 filename, &ev);
 	CORBA_exception_free (&ev);
 
@@ -242,9 +242,9 @@ evolution_importer_client_process_item (EvolutionImporterClient *client,
  * evolution_importer_client_get_error:
  * @client: The EvolutionImporterClient.
  *
- * Gets the error as a string. 
+ * Gets the error as a string.
  *
- * Returns: The error as a string. If there is no error NULL is returned. 
+ * Returns: The error as a string. If there is no error NULL is returned.
  * Importers need not support this method and if so, NULL is also returned.
  */
 const char *
@@ -261,6 +261,6 @@ evolution_importer_client_get_error (EvolutionImporterClient *client)
 
 	CORBA_exception_init (&ev);
 	str = GNOME_Evolution_Importer_getError (corba_importer, &ev);
-	
+
 	return str;
 }
diff --git a/shell/importer/evolution-importer-listener.c b/shell/importer/evolution-importer-listener.c
index 182c726ee4..85c9211377 100644
--- a/shell/importer/evolution-importer-listener.c
+++ b/shell/importer/evolution-importer-listener.c
@@ -110,12 +110,12 @@ impl_GNOME_Evolution_ImporterListener_notifyResult (PortableServer_Servant serva
 
 	out_result = corba_result_to_evolution (result);
 	if (priv->callback) {
-		(priv->callback) (listener, out_result, more_items, 
+		(priv->callback) (listener, out_result, more_items,
 				  priv->closure);
 	}
 
 	return;
-}	
+}
 
 
 /* GObject methods */
@@ -152,7 +152,7 @@ corba_class_init (void)
 
 	epv = g_new0 (POA_GNOME_Evolution_ImporterListener__epv, 1);
 	epv->notifyResult = impl_GNOME_Evolution_ImporterListener_notifyResult;
-	
+
 	vepv = &Listener_vepv;
 	vepv->_base_epv = base_epv;
 	vepv->Bonobo_Unknown_epv = bonobo_object_get_epv ();
@@ -165,7 +165,7 @@ evolution_importer_listener_class_init (EvolutionImporterListenerClass *klass)
 {
 	GObjectClass *object_class;
 	POA_GNOME_Evolution_ImporterListener__epv *epv = &klass->epv;
-	
+
 	object_class = G_OBJECT_CLASS (klass);
 	object_class->finalize = finalise;
 
diff --git a/shell/importer/evolution-importer-listener.h b/shell/importer/evolution-importer-listener.h
index 14951a9fac..fdd673089e 100644
--- a/shell/importer/evolution-importer-listener.h
+++ b/shell/importer/evolution-importer-listener.h
@@ -49,7 +49,7 @@ typedef void (* EvolutionImporterListenerCallback) (EvolutionImporterListener *l
 						    void *closure);
 struct _EvolutionImporterListener {
 	BonoboObject parent;
-	
+
 	EvolutionImporterListenerPrivate *priv;
 };
 
diff --git a/shell/importer/evolution-importer.c b/shell/importer/evolution-importer.c
index 88322a7ba2..a437fd6209 100644
--- a/shell/importer/evolution-importer.c
+++ b/shell/importer/evolution-importer.c
@@ -80,7 +80,7 @@ impl_GNOME_Evolution_Importer_supportFormat (PortableServer_Servant servant,
 	priv = importer->priv;
 
 	if (priv->support_format_fn != NULL)
-		return (priv->support_format_fn) (importer, filename, 
+		return (priv->support_format_fn) (importer, filename,
 						  priv->closure);
 	else
 		return FALSE;
@@ -222,7 +222,7 @@ evolution_importer_construct (EvolutionImporter *importer,
  * @get_error_fn: The function to be called by the getError method.
  * @closure: The data to be passed to all of the above functions.
  *
- * Creates a new EvolutionImporter object. Of the parameters only 
+ * Creates a new EvolutionImporter object. Of the parameters only
  * @get_error_function and @closure may be #NULL.
  *
  * Returns: A newly created EvolutionImporter object.
diff --git a/shell/importer/evolution-importer.h b/shell/importer/evolution-importer.h
index 0314ec71cb..21d661d0ff 100644
--- a/shell/importer/evolution-importer.h
+++ b/shell/importer/evolution-importer.h
@@ -73,13 +73,13 @@ typedef enum {
 
 struct _EvolutionImporter {
 	BonoboObject parent;
-	
+
 	EvolutionImporterPrivate *priv;
 };
 
 struct _EvolutionImporterClass {
 	BonoboObjectClass parent_class;
-	
+
 	POA_GNOME_Evolution_Importer__epv epv;
 };
 
diff --git a/shell/importer/evolution-intelligent-importer.c b/shell/importer/evolution-intelligent-importer.c
index 8070f7be18..ff786efd3d 100644
--- a/shell/importer/evolution-intelligent-importer.c
+++ b/shell/importer/evolution-intelligent-importer.c
@@ -54,10 +54,10 @@ impl_GNOME_Evolution_IntelligentImporter__get_importername (PortableServer_Serva
 							    CORBA_Environment *ev)
 {
 	EvolutionIntelligentImporter *ii;
-	
+
 	ii = evolution_intelligent_importer_from_servant (servant);
 
-	return CORBA_string_dup (ii->priv->importername ? 
+	return CORBA_string_dup (ii->priv->importername ?
 				 ii->priv->importername : "");
 }
 
@@ -82,8 +82,8 @@ impl_GNOME_Evolution_IntelligentImporter_canImport (PortableServer_Servant serva
 
 	ii = evolution_intelligent_importer_from_servant (servant);
 	priv = ii->priv;
-	
-	if (priv->can_import_fn != NULL) 
+
+	if (priv->can_import_fn != NULL)
 		return (priv->can_import_fn) (ii, priv->closure);
 	else
 		return FALSE;
@@ -108,9 +108,9 @@ static void
 finalise (GObject *object)
 {
 	EvolutionIntelligentImporter *ii;
-	
+
 	ii = EVOLUTION_INTELLIGENT_IMPORTER (object);
-	
+
 	if (ii->priv == NULL)
 		return;
 
@@ -129,7 +129,7 @@ evolution_intelligent_importer_class_init (EvolutionIntelligentImporterClass *kl
 
 	object_class = G_OBJECT_CLASS (klass);
 	object_class->finalize = finalise;
-	
+
 	parent_class = g_type_class_ref(PARENT_TYPE);
 	epv->_get_importername = impl_GNOME_Evolution_IntelligentImporter__get_importername;
 	epv->_get_message = impl_GNOME_Evolution_IntelligentImporter__get_message;
@@ -165,7 +165,7 @@ evolution_intelligent_importer_construct (EvolutionIntelligentImporter *ii,
  * evolution_intelligent_importer_new:
  * can_import_fn: The function that will be called to see if this importer can do
  * anything.
- * import_data_fn: The function that will be called when the importer should 
+ * import_data_fn: The function that will be called when the importer should
  * import the data.
  * importername: The name of this importer.
  * message: The message that will be displayed when the importer can import.
diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c
index db6906b836..47c1a9537e 100644
--- a/shell/importer/intelligent.c
+++ b/shell/importer/intelligent.c
@@ -1,20 +1,20 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* intelligent.c
- * 
- * Authors: 
+ *
+ * Authors:
  *    Iain Holmes  <iain@ximian.com>
  *
  * Copyright 2001 Ximian, Inc. (www.ximian.com)
  *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
@@ -101,7 +101,7 @@ free_importer_dialog (IntelligentImporterDialog *d)
 		data = l->data;
 
 		CORBA_exception_init (&ev);
-		if (data->object != CORBA_OBJECT_NIL) 
+		if (data->object != CORBA_OBJECT_NIL)
 			bonobo_object_release_unref (data->object, &ev);
 
 		g_free (data->iid);
@@ -147,7 +147,7 @@ get_intelligent_importers (void)
 
 	for (i = 0; i < info_list->_length; i++) {
 		const Bonobo_ServerInfo *info;
-		
+
 		info = info_list->_buffer + i;
 		iids_ret = g_list_prepend (iids_ret, g_strdup (info->iid));
 	}
@@ -207,7 +207,7 @@ create_gui (GList *importers)
 
 	d->clist = clist = gtk_clist_new (1);
 	gtk_clist_set_selection_mode (GTK_CLIST (d->clist), GTK_SELECTION_MULTIPLE);
-	
+
 	label = gtk_label_new (_("Evolution can import data from the following files:"));
 	gtk_misc_set_alignment(GTK_MISC(label), 0, .5);
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), label,
@@ -220,14 +220,14 @@ create_gui (GList *importers)
 			    TRUE, TRUE, 0);
 
 	sw = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(sw), 
-					GTK_POLICY_AUTOMATIC, 
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(sw),
+					GTK_POLICY_AUTOMATIC,
 					GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
 	gtk_widget_set_size_request (sw, 300, 150);
 	gtk_container_add (GTK_CONTAINER (sw), clist);
 	gtk_box_pack_start (GTK_BOX (hbox), sw, TRUE, TRUE, 0);
-	
+
 	vbox = gtk_vbox_new (FALSE, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
 	gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
@@ -246,10 +246,10 @@ create_gui (GList *importers)
 		prefix = g_strdup_printf ("=%s/evolution/config/Shell=/intelligent-importers/", g_get_home_dir ());
 		gnome_config_push_prefix (prefix);
 		g_free (prefix);
-		
+
 		dontaskagain = gnome_config_get_bool (l->data);
 		gnome_config_pop_prefix ();
-		
+
 		if (dontaskagain)
 			continue;
 
@@ -257,7 +257,7 @@ create_gui (GList *importers)
 		data->iid = g_strdup (l->data);
 
 		CORBA_exception_init (&ev);
-		data->object = bonobo_activation_activate_from_id ((char *) data->iid, 0, 
+		data->object = bonobo_activation_activate_from_id ((char *) data->iid, 0,
 						     NULL, &ev);
 		if (ev._major != CORBA_NO_EXCEPTION) {
 			g_warning ("Could not start %s: %s", data->iid,
@@ -282,7 +282,7 @@ create_gui (GList *importers)
 		can_run = GNOME_Evolution_IntelligentImporter_canImport (data->object,
 									 &ev);
 		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("Could not get canImport(%s): %s", 
+			g_warning ("Could not get canImport(%s): %s",
 				   data->iid, CORBA_exception_id (&ev));
 			bonobo_object_release_unref (data->object, &ev);
 			CORBA_exception_free (&ev);
@@ -291,7 +291,7 @@ create_gui (GList *importers)
 			continue;
 		}
 		CORBA_exception_free (&ev);
-		
+
 		if (can_run == FALSE) {
 			CORBA_exception_init (&ev);
 			bonobo_object_release_unref (data->object, &ev);
@@ -305,7 +305,7 @@ create_gui (GList *importers)
 
 		data->name = g_strdup (GNOME_Evolution_IntelligentImporter__get_importername (data->object, &ev));
 		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("Could not get name(%s): %s", 
+			g_warning ("Could not get name(%s): %s",
 				   data->iid, CORBA_exception_id (&ev));
 			bonobo_object_release_unref (data->object, &ev);
 			CORBA_exception_free (&ev);
@@ -316,7 +316,7 @@ create_gui (GList *importers)
 
 		data->blurb = g_strdup (GNOME_Evolution_IntelligentImporter__get_message (data->object, &ev));
 		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("Could not get message(%s): %s", 
+			g_warning ("Could not get message(%s): %s",
 				   data->iid, CORBA_exception_id (&ev));
 			bonobo_object_release_unref (data->object, &ev);
 			CORBA_exception_free (&ev);
@@ -356,7 +356,7 @@ create_gui (GList *importers)
 		text[0] = data->name;
 		gtk_clist_prepend (GTK_CLIST (clist), text);
 	}
-	
+
 	d->running = running;
 	dummy = gtk_drawing_area_new ();
 	gtk_widget_show (dummy);
@@ -365,7 +365,7 @@ create_gui (GList *importers)
 	/* Set the start to the blank page */
 	gtk_notebook_set_current_page (GTK_NOTEBOOK (d->placeholder), running);
 
-	g_signal_connect((clist), "select-row", 
+	g_signal_connect((clist), "select-row",
 			    G_CALLBACK (select_row_cb), d);
 	g_signal_connect((clist), "unselect-row",
 			    G_CALLBACK (unselect_row_cb), d);
@@ -386,10 +386,10 @@ intelligent_importer_init (void)
 	prefix = g_strdup_printf ("=%s/evolution/config/Shell=/intelligent-importers/", g_get_home_dir());
 	gnome_config_push_prefix (prefix);
 	g_free (prefix);
-	
+
 	dontaskagain = gnome_config_get_bool ("Dontaskagain=False");
 	gnome_config_pop_prefix ();
-	
+
 	if (dontaskagain) {
 		return;
 	}
@@ -423,7 +423,7 @@ intelligent_importer_init (void)
 			new_data = g_new (SelectedImporterData, 1);
 			new_data->iid = iid;
 
-			/* Reference the remote object, and duplicate the 
+			/* Reference the remote object, and duplicate the
 			   local one. */
 			CORBA_exception_init (&ev);
 			new_data->importer = bonobo_object_dup_ref (data->object, &ev);
@@ -440,14 +440,14 @@ intelligent_importer_init (void)
 			selected = g_list_prepend (selected, new_data);
 		}
 
-		/* Now destroy all the importers, as we've kept references to 
+		/* Now destroy all the importers, as we've kept references to
 		   the ones we need */
 		free_importer_dialog (d);
 
 		if (selected != NULL) {
 			/* Restart the selected ones */
 			start_importers (selected);
-			
+
 			/* Free the selected list */
 			for (l = selected; l; l = l->next) {
 				CORBA_Environment ev;
@@ -464,12 +464,12 @@ intelligent_importer_init (void)
 		}
 
 		break;
-		
+
 	case GTK_RESPONSE_CANCEL: /* Dont ask again */
 		prefix = g_strdup_printf ("=%s/evolution/config/Shell=/intelligent-importers/", g_get_home_dir());
 		gnome_config_push_prefix (prefix);
 		g_free (prefix);
-		
+
 		gnome_config_set_bool ("Dontaskagain", TRUE);
 		gnome_config_pop_prefix ();
 
diff --git a/shell/main.c b/shell/main.c
index 114ead8835..4d9e785cc3 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -383,7 +383,7 @@ idle_cb (gchar **uris)
 	CORBA_Object_release (corba_shell, &ev);
 
 	CORBA_exception_free (&ev);
-	
+
 	if (shell == NULL) {
 		/*there is another instance but because we don't open any windows
 		we must notify the startup was complete manually*/
@@ -397,7 +397,7 @@ idle_cb (gchar **uris)
 #ifndef G_OS_WIN32
 
 /* SIGSEGV handling.
-   
+
    The GNOME SEGV handler will lose if it's not run from the main Gtk
    thread. So if we have to redirect the signal if the crash happens in another
    thread.  */
@@ -440,7 +440,7 @@ setup_segv_redirect (void)
 	sigaction (SIGSEGV, &sa, NULL);
 	sigaction (SIGBUS, &sa, NULL);
 	sigaction (SIGFPE, &sa, NULL);
-		
+
 	sa.sa_handler = SIG_IGN;
 	sigaction (SIGXFSZ, &sa, NULL);
 	gnome_segv_handler = osa.sa_handler;
@@ -459,19 +459,19 @@ static const GOptionEntry options[] = {
 	{ "online", '\0', 0, G_OPTION_ARG_NONE, &start_online,
 	  N_("Start in online mode"), NULL },
 #ifdef KILL_PROCESS_CMD
-	{ "force-shutdown", '\0', 0, G_OPTION_ARG_NONE, &killev, 
+	{ "force-shutdown", '\0', 0, G_OPTION_ARG_NONE, &killev,
 	  N_("Forcibly shut down all Evolution components"), NULL },
 #endif
 #if DEVELOPMENT
-	{ "force-migrate", '\0', 0, G_OPTION_ARG_NONE, &force_migrate, 
+	{ "force-migrate", '\0', 0, G_OPTION_ARG_NONE, &force_migrate,
 	  N_("Forcibly re-migrate from Evolution 1.4"), NULL },
 #endif
-	{ "debug", '\0', 0, G_OPTION_ARG_STRING, &evolution_debug_log, 
+	{ "debug", '\0', 0, G_OPTION_ARG_STRING, &evolution_debug_log,
 	  N_("Send the debugging output of all components to a file."), NULL },
-	{ "disable-eplugin", '\0', 0, G_OPTION_ARG_NONE, &disable_eplugin, 
+	{ "disable-eplugin", '\0', 0, G_OPTION_ARG_NONE, &disable_eplugin,
 	  N_("Disable loading of any plugins."), NULL },
-	{ "disable-preview", '\0', 0, G_OPTION_ARG_NONE, &disable_preview, 
-	  N_("Disable preview pane of Mail, Contacts and Tasks."), NULL },	
+	{ "disable-preview", '\0', 0, G_OPTION_ARG_NONE, &disable_preview,
+	  N_("Disable preview pane of Mail, Contacts and Tasks."), NULL },
 	{ "setup-only", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE,
 	  &setup_only, NULL, NULL },
 	{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &remaining_args, NULL, NULL },
@@ -506,7 +506,7 @@ main (int argc, char **argv)
 
 	g_option_context_set_translation_domain(context, GETTEXT_PACKAGE);
 
-	program = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv, 
+	program = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv,
 				      GNOME_PROGRAM_STANDARD_PROPERTIES,
 				      GNOME_PARAM_GOPTION_CONTEXT, context,
 				      GNOME_PARAM_HUMAN_READABLE_NAME, _("Evolution"),
@@ -546,7 +546,7 @@ main (int argc, char **argv)
 	}
 
 	setup_segv_redirect ();
-	
+
 	if (evolution_debug_log) {
 		int fd;
 
@@ -596,11 +596,11 @@ main (int argc, char **argv)
 
 	g_object_unref (client);
 #else
-	g_idle_add ((GSourceFunc) idle_cb, remaining_args);	
+	g_idle_add ((GSourceFunc) idle_cb, remaining_args);
 #endif
-	
+
 	bonobo_main ();
-	
+
 	e_icon_factory_shutdown ();
 	g_object_unref (program);
 	gnome_sound_shutdown ();
diff --git a/shell/test/evolution-test-component.c b/shell/test/evolution-test-component.c
index 1e1cc92483..b53608d4af 100644
--- a/shell/test/evolution-test-component.c
+++ b/shell/test/evolution-test-component.c
@@ -120,9 +120,9 @@ impl_requestCreateItem (PortableServer_Servant servant,
 {
 	EvolutionTestComponent *evolution_test_component = EVOLUTION_TEST_COMPONENT (bonobo_object_from_servant (servant));
 	EvolutionTestComponentPrivate *priv;
-	
+
 	priv = evolution_test_component->priv;
-	
+
 	if (strcmp (item_type_name, CREATE_TEST_ID) == 0) {
 		g_message ("Creating test item");
 	} else {
@@ -171,7 +171,7 @@ factory (BonoboGenericFactory *factory,
 		bonobo_object_ref (object);
 		return object;
 	}
-	
+
 	g_warning (FACTORY_ID ": Don't know what to do with %s", component_id);
 
 	return NULL;