** 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

54 files changed, 789 insertions, 789 deletions

diff --git a/e-util/e-bconf-map.c b/e-util/e-bconf-map.c
index 039121a1fa..b41bbe1cde 100644
--- a/e-util/e-bconf-map.c
+++ b/e-util/e-bconf-map.c
@@ -58,12 +58,12 @@ e_bconf_hex_decode (const char *val)
 {
 	const unsigned char *p = (const unsigned char *) val;
 	char *o, *res;
-	
+
 	o = res = g_malloc (strlen (val) / 2 + 1);
 	for (p = (const unsigned char *)val; (p[0] && p[1]); p += 2)
 		*o++ = (hexnib[p[0]] << 4) | hexnib[p[1]];
 	*o = 0;
-	
+
 	return res;
 }
 
@@ -72,7 +72,7 @@ e_bconf_url_decode (const char *val)
 {
 	const unsigned char *p = (const unsigned char *) val;
 	char *o, *res, c;
-	
+
 	o = res = g_malloc (strlen (val) + 1);
 	while (*p) {
 		c = *p++;
@@ -84,7 +84,7 @@ e_bconf_url_decode (const char *val)
 			*o++ = c;
 	}
 	*o = 0;
-	
+
 	return res;
 }
 
@@ -95,13 +95,13 @@ e_bconf_get_path (xmlDocPtr doc, const char *path)
 	xmlNodePtr root;
 	char *val;
 	int found;
-	
+
 	root = doc->children;
 	if (strcmp ((char *)root->name, "bonobo-config") != 0) {
 		g_warning ("not bonobo-config xml file");
 		return NULL;
 	}
-	
+
 	root = root->children;
 	while (root) {
 		if (!strcmp ((char *)root->name, "section")) {
@@ -113,7 +113,7 @@ e_bconf_get_path (xmlDocPtr doc, const char *path)
 		}
 		root = root->next;
 	}
-	
+
 	return root;
 }
 
@@ -123,7 +123,7 @@ e_bconf_get_entry (xmlNodePtr root, const char *name)
 	xmlNodePtr node = root->children;
 	int found;
 	char *val;
-	
+
 	while (node) {
 		if (!strcmp ((char *)node->name, "entry")) {
 			val = (char *)xmlGetProp (node, (const unsigned char *)"name");
@@ -134,7 +134,7 @@ e_bconf_get_entry (xmlNodePtr root, const char *name)
 		}
 		node = node->next;
 	}
-	
+
 	return node;
 }
 
@@ -143,12 +143,12 @@ e_bconf_get_value (xmlNodePtr root, const char *name)
 {
 	xmlNodePtr node = e_bconf_get_entry (root, name);
 	char *prop, *val = NULL;
-	
+
 	if (node && (prop = (char *)xmlGetProp (node, (const unsigned char *)"value"))) {
 		val = g_strdup (prop);
 		xmlFree (prop);
 	}
-	
+
 	return val;
 }
 
@@ -156,13 +156,13 @@ char *
 e_bconf_get_bool (xmlNodePtr root, const char *name)
 {
 	char *val, *res;
-	
+
 	if ((val = e_bconf_get_value (root, name))) {
 		res = g_strdup (val[0] == '1' ? "true" : "false");
 		g_free (val);
 	} else
 		res = NULL;
-	
+
 	return res;
 }
 
@@ -170,13 +170,13 @@ char *
 e_bconf_get_long (xmlNodePtr root, const char *name)
 {
 	char *val, *res;
-	
+
 	if ((val = e_bconf_get_value (root, name))) {
 		res = g_strdup (val);
 		g_free (val);
 	} else
 		res = NULL;
-	
+
 	return res;
 }
 
@@ -184,13 +184,13 @@ char *
 e_bconf_get_string (xmlNodePtr root, const char *name)
 {
 	char *val, *res;
-	
+
 	if ((val = e_bconf_get_value (root, name))) {
 		res = e_bconf_hex_decode (val);
 		g_free (val);
 	} else
 		res = NULL;
-	
+
 	return res;
 }
 
@@ -221,17 +221,17 @@ bconf_lookup_enum (xmlNodePtr root, const char *name, e_bconf_map_t *map)
 {
 	int index = 0, i;
 	char *val;
-	
+
 	if ((val = e_bconf_get_value (root, name))) {
 		index = atoi (val);
 		g_free (val);
 	}
-	
+
 	for (i = 0; map->child[i].from; i++) {
 		if (i == index)
 			return g_strdup (map->child[i].from);
 	}
-	
+
 	return NULL;
 }
 
@@ -245,7 +245,7 @@ get_name (const char *in, int index)
 {
 	GString *out = g_string_new ("");
 	char c, *res;
-	
+
 	while ((c = *in++)) {
 		if (c == '%') {
 			c = *in++;
@@ -261,10 +261,10 @@ get_name (const char *in, int index)
 			g_string_append_c (out, c);
 		}
 	}
-	
+
 	res = out->str;
 	g_string_free (out, FALSE);
-	
+
 	return res;
 }
 
@@ -273,7 +273,7 @@ build_xml (xmlNodePtr root, e_bconf_map_t *map, int index, xmlNodePtr source)
 {
 	char *name, *value;
 	xmlNodePtr node;
-	
+
 	while (map->type != E_BCONF_MAP_END) {
 		if ((map->type & E_BCONF_MAP_MASK) == E_BCONF_MAP_CHILD) {
 			node = xmlNewChild (root, NULL, (unsigned char *)map->to, NULL);
@@ -281,16 +281,16 @@ build_xml (xmlNodePtr root, e_bconf_map_t *map, int index, xmlNodePtr source)
 		} else {
 			name = get_name (map->from, index);
 			value = lookup_table[(map->type & E_BCONF_MAP_MASK) - 1] (source, name, map);
-			
+
 			d(printf ("key '%s=%s' -> ", name, value));
-			
+
 			if (map->type & E_BCONF_MAP_CONTENT) {
 				if (value && value[0])
 					xmlNewTextChild (root, NULL, (unsigned char *)map->to, (unsigned char *)value);
 			} else {
 				xmlSetProp (root, (unsigned char *)map->to, (unsigned char *)value);
 			}
-			
+
 			g_free (value);
 			g_free (name);
 		}
@@ -308,7 +308,7 @@ e_bconf_import_xml_blob (GConfClient *gconf, xmlDocPtr config_xmldb, e_bconf_map
 	int count = 0, i;
 	GSList *list, *l;
 	char *val;
-	
+
 	source = e_bconf_get_path (config_xmldb, bconf_path);
 	if (source) {
 		list = NULL;
@@ -316,37 +316,37 @@ e_bconf_import_xml_blob (GConfClient *gconf, xmlDocPtr config_xmldb, e_bconf_map
 			count = atoi (val);
 			g_free (val);
 		}
-		
+
 		d(printf("Found %d blobs at %s\n", count, bconf_path));
-		
+
 		for (i = 0; i < count; i++) {
 			xmlDocPtr doc;
 			xmlNodePtr root;
 			xmlChar *xmlbuf;
 			int n;
-			
+
 			doc = xmlNewDoc ((const unsigned char *)"1.0");
 			root = xmlNewDocNode (doc, NULL, (unsigned char *)name, NULL);
 			xmlDocSetRootElement (doc, root);
-			
+
 			/* This could be set with a MAP_UID type ... */
 			if (idparam) {
 				char buf[16];
-				
+
 				sprintf (buf, "%d", i);
 				xmlSetProp (root, (unsigned char *)idparam, (unsigned char *)buf);
 			}
-			
+
 			build_xml (root, map, i, source);
-			
+
 			xmlDocDumpMemory (doc, &xmlbuf, &n);
 			xmlFreeDoc (doc);
-			
+
 			list = g_slist_append (list, xmlbuf);
 		}
-		
+
 		gconf_client_set_list (gconf, gconf_path, GCONF_VALUE_STRING, list, NULL);
-		
+
 		while (list) {
 			l = list->next;
 			xmlFree (list->data);
@@ -356,7 +356,7 @@ e_bconf_import_xml_blob (GConfClient *gconf, xmlDocPtr config_xmldb, e_bconf_map
 	} else {
 		g_warning ("could not find '%s' in old config database, skipping", bconf_path);
 	}
-	
+
 	return 0;
 }
 
@@ -372,13 +372,13 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t *
 	GSList *list, *l;
 	char buf[32];
 	int i, j, k;
-	
+
 	/* process all flat config */
 	for (i = 0; remap_list[i].root; i++) {
 		d(printf ("Path: %s\n", remap_list[i].root));
 		if (!(source = e_bconf_get_path (config_xmldb, remap_list[i].root)))
 			continue;
-		
+
 		map = remap_list[i].map;
 		for (j = 0; map[j].from; j++) {
 			if (map[j].type & E_GCONF_MAP_LIST) {
@@ -401,12 +401,12 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t *
 							list = g_slist_append (list, e_bconf_hex_decode (val));
 							break;
 						}
-						
+
 						g_free (val);
 						k++;
 					}
 				} while (val);
-				
+
 				if (list) {
 					path = g_strdup_printf ("/apps/evolution/%s", map[j].to);
 					gconf_client_set_list (gconf, path, gconf_type[map[j].type & E_GCONF_MAP_MASK], list, NULL);
@@ -415,7 +415,7 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t *
 						g_slist_foreach (list, (GFunc) g_free, NULL);
 					g_slist_free (list);
 				}
-				
+
 				continue;
 			} else if (map[j].type == E_GCONF_MAP_ANYLIST) {
 				val = NULL;
@@ -423,13 +423,13 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t *
 				if (!(val = e_bconf_get_value (source, map[j].from)))
 					continue;
 			}
-			
+
 			d(printf (" %s = '%s' -> %s [%d]\n",
 				  map[j].from,
 				  val == NULL ? "(null)" : val,
 				  map[j].to,
 				  map[j].type));
-			
+
 			path = g_strdup_printf ("/apps/evolution/%s", map[j].to);
 			switch (map[j].type) {
 			case E_GCONF_MAP_BOOL:
@@ -455,13 +455,13 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t *
 			case E_GCONF_MAP_STRLIST: {
 				char *v = e_bconf_hex_decode (val);
 				char **t = g_strsplit (v, " !<-->!", 8196);
-				
+
 				list = NULL;
 				for (k = 0; t[k]; k++) {
 					list = g_slist_append (list, t[k]);
 					d(printf ("  [%d] = '%s'\n", k, t[k]));
 				}
-				
+
 				gconf_client_set_list (gconf, path, GCONF_VALUE_STRING, list, NULL);
 				g_slist_free (list);
 				g_strfreev (t);
@@ -470,12 +470,12 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t *
 			case E_GCONF_MAP_ANYLIST: {
 				xmlNodePtr node = source->children;
 				list = NULL;
-				
+
 				/* find the entry node */
 				while (node) {
 					if (!strcmp ((char *)node->name, "entry")) {
 						int found;
-						
+
 						if ((tmp = (char *)xmlGetProp (node, (const unsigned char *)"name"))) {
 							found = strcmp ((char *)tmp, map[j].from) == 0;
 							xmlFree (tmp);
@@ -483,10 +483,10 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t *
 								break;
 						}
 					}
-					
+
 					node = node->next;
 				}
-				
+
 				/* find the the any block */
 				if (node) {
 					node = node->children;
@@ -496,7 +496,7 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t *
 						node = node->next;
 					}
 				}
-				
+
 				/* skip to the value inside it */
 				if (node) {
 					node = node->children;
@@ -506,7 +506,7 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t *
 						node = node->next;
 					}
 				}
-				
+
 				if (node) {
 					node = node->children;
 					while (node) {
@@ -515,7 +515,7 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t *
 						node = node->next;
 					}
 				}
-				
+
 				/* & store */
 				if (list) {
 					gconf_client_set_list (gconf, path, GCONF_VALUE_STRING, list, NULL);
@@ -526,19 +526,19 @@ e_bconf_import (GConfClient *gconf, xmlDocPtr config_xmldb, e_gconf_map_list_t *
 						list = l;
 					}
 				}
-				
+
 				break; }
 			case E_GCONF_MAP_COLOUR:
 				sprintf (buf, "#%06x", atoi (val) & 0xffffff);
 				gconf_client_set_string (gconf, path, buf, NULL);
 				break;
 			}
-			
+
 			/* FIXME: handle errors */
 			g_free (path);
 			g_free (val);
 		}
 	}
-	
+
 	return 0;
 }
diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c
index a4af5e76b5..572f0d4009 100644
--- a/e-util/e-bit-array.c
+++ b/e-util/e-bit-array.c
@@ -153,7 +153,7 @@ eba_dispose (GObject *object)
 		(* G_OBJECT_CLASS (e_bit_array_parent_class)->dispose) (object);
 }
 
-/** 
+/**
  * e_selection_model_is_row_selected
  * @selection: #EBitArray to check
  * @n: The row to check
@@ -172,7 +172,7 @@ e_bit_array_value_at (EBitArray *eba,
 		return (eba->data[BOX(n)] >> OFFSET(n)) & 0x1;
 }
 
-/** 
+/**
  * e_selection_model_foreach
  * @selection: #EBitArray to traverse
  * @callback: The callback function to call back.
@@ -181,7 +181,7 @@ e_bit_array_value_at (EBitArray *eba,
  * This routine calls the given callback function once for each
  * selected row, passing closure as the closure.
  */
-void 
+void
 e_bit_array_foreach (EBitArray *eba,
 		     EForeachFunc     callback,
 		     gpointer         closure)
@@ -202,7 +202,7 @@ e_bit_array_foreach (EBitArray *eba,
 	}
 }
 
-/** 
+/**
  * e_selection_model_clear
  * @selection: #EBitArray to clear
  *
@@ -219,7 +219,7 @@ e_bit_array_clear(EBitArray *eba)
 #define PART(x,n) (((x) & (0x01010101 << n)) >> n)
 #define SECTION(x, n) (((x) >> (n * 8)) & 0xff)
 
-/** 
+/**
  * e_selection_model_selected_count
  * @selection: #EBitArray to count
  *
@@ -253,7 +253,7 @@ e_bit_array_selected_count (EBitArray *eba)
 	return count;
 }
 
-/** 
+/**
  * e_selection_model_select_all
  * @selection: #EBitArray to select all
  *
@@ -264,10 +264,10 @@ void
 e_bit_array_select_all (EBitArray *eba)
 {
 	int i;
-	
+
 	if (!eba->data)
 		eba->data = g_new0 (guint32, (eba->bit_count + 31) / 32);
-	
+
 	for (i = 0; i < (eba->bit_count + 31) / 32; i ++) {
 		eba->data[i] = ONES;
 	}
@@ -285,7 +285,7 @@ e_bit_array_select_all (EBitArray *eba)
 	}
 }
 
-/** 
+/**
  * e_selection_model_invert_selection
  * @selection: #EBitArray to invert
  *
@@ -299,7 +299,7 @@ e_bit_array_invert_selection (EBitArray *eba)
 
 	if (!eba->data)
 		eba->data = g_new0 (guint32, (eba->bit_count + 31) / 32);
-	
+
 	for (i = 0; i < (eba->bit_count + 31) / 32; i ++) {
 		eba->data[i] = ~eba->data[i];
 	}
diff --git a/e-util/e-bit-array.h b/e-util/e-bit-array.h
index 0c7ba61199..b15e50a581 100644
--- a/e-util/e-bit-array.h
+++ b/e-util/e-bit-array.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
+/*
  * e-bit-array.h
  * Copyright 2000, 2001, Ximian, Inc.
  *
diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c
index 16a7671155..9907f557e3 100644
--- a/e-util/e-categories-config.c
+++ b/e-util/e-categories-config.c
@@ -78,22 +78,22 @@ e_categories_config_open_dialog_for_entry (GtkEntry *entry)
 	GtkDialog *dialog;
 	const char *text;
 	int result;
-	
+
 	g_return_if_fail (entry != NULL);
 	g_return_if_fail (GTK_IS_ENTRY (entry));
-	
+
 	text = gtk_entry_get_text (GTK_ENTRY (entry));
 	dialog = GTK_DIALOG (e_categories_dialog_new (text));
 
 	gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW(gtk_widget_get_toplevel (GTK_WIDGET (entry))));
-		
+
 	/* run the dialog */
 	result = gtk_dialog_run (dialog);
-	
+
 	if (result == GTK_RESPONSE_OK) {
 		text = e_categories_dialog_get_categories (E_CATEGORIES_DIALOG (dialog));
 		gtk_entry_set_text (GTK_ENTRY (entry), text);
 	}
-	
+
 	gtk_object_destroy (GTK_OBJECT (dialog));
 }
diff --git a/e-util/e-config-listener.c b/e-util/e-config-listener.c
index 44ed9c0447..b40b8e170a 100644
--- a/e-util/e-config-listener.c
+++ b/e-util/e-config-listener.c
@@ -572,7 +572,7 @@ e_config_listener_remove_dir (EConfigListener *cl, const char *dir)
 	slist = gconf_client_all_entries (cl->priv->db, dir, NULL);
         for (iter = slist; iter != NULL; iter = iter->next) {
                 GConfEntry *entry = iter->data;
-                                                                                                
+
                 key = gconf_entry_get_key (entry);
                 gconf_client_unset (cl->priv->db, key, NULL);
                 gconf_entry_free (entry);
diff --git a/e-util/e-config.c b/e-util/e-config.c
index 484630cd1d..79e87c84b6 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -47,7 +47,7 @@
 
 #include <glib/gi18n.h>
 
-#define d(x) 
+#define d(x)
 
 struct _EConfigFactory {
 	struct _EConfigFactory *next, *prev;
@@ -179,10 +179,10 @@ ep_base_init(GObjectClass *klass)
 
 /**
  * e_config_get_type:
- * 
+ *
  * Standard GObject method.  Used to subclass for the concrete
  * implementations.
- * 
+ *
  * Return value: EConfig type.
  **/
 GType
@@ -211,9 +211,9 @@ e_config_get_type(void)
  * @type: The type of configuration manager, @E_CONFIG_BOOK or
  * @E_CONFIG_DRUID.
  * @id: The name of the configuration window this manager drives.
- * 
+ *
  * Used by implementing classes to initialise base parameters.
- * 
+ *
  * Return value: @ep is returned.
  **/
 EConfig *e_config_construct(EConfig *ep, int type, const char *id)
@@ -238,7 +238,7 @@ EConfig *e_config_construct(EConfig *ep, int type, const char *id)
  * @freefunc: If supplied, called to free the item list (and/or items)
  * once they are no longer needed.
  * @data: Data for the callback methods.
- * 
+ *
  * Add new EConfigItems to the configuration window.  Nothing will be
  * done with them until the widget is built.
  *
@@ -264,7 +264,7 @@ e_config_add_items(EConfig *ec, GSList *items, EConfigItemsFunc commitfunc, ECon
  * @pageid: pageid to check.
  * @check: checking callback.
  * @data: user-data for the callback.
- * 
+ *
  * Add a page-checking function callback.  It will be called to validate the
  * data in the given page or pages.  If @pageid is NULL then it will be called
  * to validate every page, or the whole configuration window.
@@ -678,7 +678,7 @@ ec_rebuild(EConfig *emp)
 				}
 
 				frame = g_object_new(gtk_frame_get_type(),
-						     "shadow_type", GTK_SHADOW_NONE, 
+						     "shadow_type", GTK_SHADOW_NONE,
 						     "label_widget", label,
 						     "child", g_object_new(gtk_alignment_get_type(),
 									   "left_padding", 12,
@@ -772,7 +772,7 @@ ec_rebuild(EConfig *emp)
  * e_config_set_target:
  * @emp: An initialised EConfig.
  * @target: A target allocated from @emp.
- * 
+ *
  * Sets the target object for the config window.  Generally the target
  * is set only once, and will supply its own "changed" signal which
  * can be used to drive the modal.  This is a virtual method so that
@@ -800,12 +800,12 @@ ec_widget_destroy(GtkWidget *w, EConfig *ec)
 /**
  * e_config_create_widget:
  * @emp: An initialised EConfig object.
- * 
+ *
  * Create the widget described by @emp.  Only the core widget
  * appropriate for the given type is created, i.e. a GtkNotebook for
  * the E_CONFIG_BOOK type and a GnomeDruid for the E_CONFIG_DRUID
  * type.
- * 
+ *
  * This object will be self-driving, but will not close itself once
  * complete.
  *
@@ -877,7 +877,7 @@ ec_dialog_response(GtkWidget *d, int id, EConfig *ec)
  * @emp: Initialised and configured EMConfig derived instance.
  * @parent: Parent window or NULL.
  * @title: Title of window or dialog.
- * 
+ *
  * Create a managed GtkWindow object from @emp.  This window will be
  * fully driven by the EConfig @emp.  If @emp.type is
  * @E_CONFIG_DRUID, then this will be a toplevel GtkWindow containing
@@ -886,7 +886,7 @@ ec_dialog_response(GtkWidget *d, int id, EConfig *ec)
  *
  * Unless reffed otherwise, the management object @emp will be
  * finalised when the widget is.
- * 
+ *
  * Return value: The window widget.  This is also stored in @emp.window.
  **/
 GtkWidget *
@@ -949,9 +949,9 @@ ec_idle_handler_for_rebuild (gpointer data)
 
 /**
  * e_config_target_changed:
- * @emp: 
- * @how: 
- * 
+ * @emp:
+ * @how:
+ *
  * Indicate that the target has changed.  This may be called by the
  * self-aware target itself, or by the driving code.  If @how is
  * %E_CONFIG_TARGET_CHANGED_REBUILD, then the entire configuration
@@ -987,8 +987,8 @@ void e_config_target_changed(EConfig *emp, e_config_target_change_t how)
 
 /**
  * e_config_abort:
- * @ec: 
- * 
+ * @ec:
+ *
  * Signify that the stateful configuration changes must be discarded
  * to all listeners.  This is used by self-driven druid or notebook, or
  * may be used by code using the widget directly.
@@ -1007,8 +1007,8 @@ void e_config_abort(EConfig *ec)
 
 /**
  * e_config_commit:
- * @ec: 
- * 
+ * @ec:
+ *
  * Signify that the stateful configuration changes should be saved.
  * This is used by the self-driven druid or notebook, or may be used
  * by code driving the widget directly.
@@ -1027,12 +1027,12 @@ void e_config_commit(EConfig *ec)
 
 /**
  * e_config_page_check:
- * @ec: 
+ * @ec:
  * @pageid: The path of the page item.
- * 
+ *
  * Check that a given page is complete.  If @pageid is NULL, then check
  * the whole config.  No check is made that the page actually exists.
- * 
+ *
  * Return value: FALSE if the data is inconsistent/incomplete.
  **/
 gboolean e_config_page_check(EConfig *ec, const char *pageid)
@@ -1052,11 +1052,11 @@ gboolean e_config_page_check(EConfig *ec, const char *pageid)
 
 /**
  * e_config_page_get:
- * @ec: 
+ * @ec:
  * @pageid: The path of the page item.
- * 
+ *
  * Retrieve the page widget corresponding to @pageid.
- * 
+ *
  * Return value: The page widget.  It will be the root GtkNotebook
  * container or the GnomeDruidPage object.
  **/
@@ -1077,12 +1077,12 @@ GtkWidget *e_config_page_get(EConfig *ec, const char *pageid)
 
 /**
  * e_config_page_next:
- * @ec: 
+ * @ec:
  * @pageid: The path of the page item.
- * 
+ *
  * Find the path of the next visible page after @pageid.  If @pageid
  * is NULL then find the first visible page.
- * 
+ *
  * Return value: The path of the next page, or @NULL if @pageid was the
  * last configured and visible page.
  **/
@@ -1108,12 +1108,12 @@ const char *e_config_page_next(EConfig *ec, const char *pageid)
 
 /**
  * e_config_page_next:
- * @ec: 
+ * @ec:
  * @pageid: The path of the page item.
- * 
+ *
  * Find the path of the previous visible page before @pageid.  If @pageid
  * is NULL then find the last visible page.
- * 
+ *
  * Return value: The path of the previous page, or @NULL if @pageid was the
  * first configured and visible page.
  **/
@@ -1147,12 +1147,12 @@ const char *e_config_page_prev(EConfig *ec, const char *pageid)
  * @func: An EConfigFactoryFunc to call when the window @id is being
  * created.
  * @data: Callback data.
- * 
+ *
  * Add a config factory which will be called to add_items() any
  * extra items's if wants to, to the current Config window.
  *
  * TODO: Make the id a pattern?
- * 
+ *
  * Return value: A handle to the factory.
  **/
 EConfigFactory *
@@ -1171,7 +1171,7 @@ e_config_class_add_factory(EConfigClass *klass, const char *id, EConfigFactoryFu
 /**
  * e_config_class_remove_factory:
  * @f: Handle from :class_add_factory() call.
- * 
+ *
  * Remove a config factory.  The handle @f may only be removed once.
  **/
 void
@@ -1187,7 +1187,7 @@ e_config_class_remove_factory(EConfigClass *klass, EConfigFactory *f)
  * @ep: Parent EConfig object.
  * @type: type, up to implementor
  * @size: Size of object to allocate.
- * 
+ *
  * Allocate a new config target suitable for this class.  Implementing
  * classes will define the actual content of the target.
  **/
@@ -1212,7 +1212,7 @@ void *e_config_target_new(EConfig *ep, int type, size_t size)
  * e_config_target_free:
  * @ep: Parent EConfig object.
  * @o: The target to fre.
- * 
+ *
  * Free a target.  The implementing class can override this method to
  * free custom targets.
  **/
@@ -1291,10 +1291,10 @@ ech_check(EConfig *ec, const char *pageid, void *data)
 {
 	struct _EConfigHookGroup *group = data;
 	EConfigHookPageCheckData hdata;
-	
+
 	if (!group->hook->hook.plugin->enabled)
 		return TRUE;
-	
+
 	hdata.config = ec;
 	hdata.target = ec->target;
 	hdata.pageid = pageid?pageid:"";
@@ -1496,16 +1496,16 @@ emph_class_init(EPluginHookClass *klass)
 
 /**
  * e_config_hook_get_type:
- * 
+ *
  * Standard GObject function to get the object type.
- * 
+ *
  * Return value: The EConfigHook class type.
  **/
 GType
 e_config_hook_get_type(void)
 {
 	static GType type = 0;
-	
+
 	if (!type) {
 		static const GTypeInfo info = {
 			sizeof(EConfigHookClass), NULL, NULL, (GClassInitFunc) emph_class_init, NULL, NULL,
@@ -1515,7 +1515,7 @@ e_config_hook_get_type(void)
 		emph_parent_class = g_type_class_ref(e_plugin_hook_get_type());
 		type = g_type_register_static(e_plugin_hook_get_type(), "EConfigHook", &info, 0);
 	}
-	
+
 	return type;
 }
 
@@ -1525,7 +1525,7 @@ e_config_hook_get_type(void)
  * @klass: The dervied EconfigHook class.
  * @map: A map used to describe a single EConfigTarget type for this
  * class.
- * 
+ *
  * Add a targe tmap to a concrete derived class of EConfig.  The
  * target map enumates the target types available for the implenting
  * class.
diff --git a/e-util/e-config.h b/e-util/e-config.h
index c7f37a8e10..ffd4896c9d 100644
--- a/e-util/e-config.h
+++ b/e-util/e-config.h
@@ -62,11 +62,11 @@ typedef struct _GtkWidget * (*EConfigItemFactoryFunc)(EConfig *ec, EConfigItem *
 
 /**
  * enum _e_config_target_changed_t - Target changed mode.
- * 
+ *
  * @E_CONFIG_TARGET_CHANGED_STATE: A state of the target has changed.
  * @E_CONFIG_TARGET_CHANGED_REBUILD: A state of the target has
  * changed, and the UI must be reconfigured as a result.
- * 
+ *
  * How the target has changed.  If @E_CONFIG_TARGET_CHANGED_REBUILD then a
  * widget reconfigure is necessary, otherwise it is used to check if
  * the widget is complete yet.
@@ -79,7 +79,7 @@ enum _e_config_target_change_t {
 
 /**
  * enum _e_config_t - configuration item type.
- * 
+ *
  * @E_CONFIG_BOOK: A notebook item.  Only one of this or
  * @E_CONFIG_DRUID may be included in the item list for the entire
  * configuration description.
@@ -105,7 +105,7 @@ enum _e_config_target_change_t {
  * section defined in the configuration system.
  * @E_CONFIG_ITEM_TABLE: A configuration item with a parent
  * @E_CONFIG_SECTION_TABLE.
- * 
+ *
  * A configuration item type for each configuration item added to the
  * EConfig object.  These are merged from all contributors to the
  * configuration window, and then processed to form the combined
@@ -127,7 +127,7 @@ enum _e_config_t {
 
 /**
  * struct _EConfigItem - A configuration item.
- * 
+ *
  * @type: The configuration item type.
  * @path: An absolute path positioning this item in the configuration
  * window.  This will be used as a sort key for an ASCII sort to
@@ -151,11 +151,11 @@ struct _EConfigItem {
 
 /**
  * struct _EConfigTarget - configuration context.
- * 
+ *
  * @config: The parent object.
  * @widget: A target-specific parent widget.
  * @type: The type of target, defined by implementing classes.
- * 
+ *
  * The base target object is used as the parent and placeholder for
  * configuration context for a given configuration window.  It is
  * subclassed by implementing classes to provide domain-specific
@@ -172,7 +172,7 @@ struct _EConfigTarget {
 
 /**
  * struct _EConfig - A configuration management object.
- * 
+ *
  * @object: Superclass.
  * @priv: Private data.
  * @type: Either @E_CONFIG_BOOK or @E_CONFIG_DRIUD, describing the
@@ -186,7 +186,7 @@ struct _EConfigTarget {
  * @window: If :create_window() is called, then the containing
  * toplevel GtkDialog or GtkWindow appropriate for the @type of
  * configuration window created.
- * 
+ *
  **/
 struct _EConfig {
 	GObject object;
@@ -205,7 +205,7 @@ struct _EConfig {
 
 /**
  * struct _EConfigClass - Configuration management abstract class.
- * 
+ *
  * @object_class: Superclass.
  * @factories: A list of factories registered on this type of
  * configuration manager.
@@ -214,7 +214,7 @@ struct _EConfig {
  * into changes on the target to propery drive the manager.
  * @target_free: A virtual method used to free the target in an
  * implementation-defined way.
- * 
+ *
  **/
 struct _EConfigClass {
 	GObjectClass object_class;
@@ -279,7 +279,7 @@ typedef void (*EConfigHookItemFactoryFunc)(struct _EPlugin *plugin, EConfigHookI
 
 /**
  * struct _EConfigHookItemFactoryData - Factory marshalling structure.
- * 
+ *
  * @config: The parent EConfig.  This is also available in
  * @target->config but is here as a convenience. (TODO: do we need this).
  * @item: The corresponding configuration item.
@@ -303,12 +303,12 @@ struct _EConfigHookItemFactoryData {
 
 /**
  * struct _EConfigHookPageCheckData - Check callback data.
- * 
- * @config: 
+ *
+ * @config:
  * @target: The current configuration target.  This is also available
  * on @config->target.
  * @pageid: Name of page to validate, or "" means check all configuration.
- * 
+ *
  **/
 struct _EConfigHookPageCheckData {
 	EConfig *config;
@@ -318,7 +318,7 @@ struct _EConfigHookPageCheckData {
 
 /**
  * struct _EConfigHookGroup - A group of configuration items.
- * 
+ *
  * @hook: Parent object.
  * @id: The configuration window to which these items apply.
  * @target_type: The target type expected by the items.  This is
@@ -345,11 +345,11 @@ struct _EConfigHookGroup {
 
 /**
  * struct _EConfigHook - Plugin hook for configuration windows.
- * 
+ *
  * @hook: Superclass.
  * @groups: A list of EConfigHookGroup's of all configuration windows
  * this plugin hooks into.
- * 
+ *
  **/
 struct _EConfigHook {
 	EPluginHook hook;
@@ -360,7 +360,7 @@ struct _EConfigHook {
 /**
  * struct _EConfigHookClass - Abstract class for configuration window
  * plugin hooks.
- * 
+ *
  * @hook_class: Superclass.
  * @target_map: A table of EConfigHookTargetMap structures describing
  * the possible target types supported by this class.
@@ -369,7 +369,7 @@ struct _EConfigHook {
  *
  * This is an abstract class defining the plugin hook point for
  * configuration windows.
- * 
+ *
  **/
 struct _EConfigHookClass {
 	EPluginHookClass hook_class;
diff --git a/e-util/e-corba-utils.c b/e-util/e-corba-utils.c
index 9fa5dc1d15..b688de6294 100644
--- a/e-util/e-corba-utils.c
+++ b/e-util/e-corba-utils.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* e-html-utils.c
-* 
+*
  * Copyright (C) 2000  Ximian, Inc.
  * Author: Ettore Perazzoli <ettore@ximian.com>
  *
diff --git a/e-util/e-corba-utils.h b/e-util/e-corba-utils.h
index b93c70d41f..91fb305d52 100644
--- a/e-util/e-corba-utils.h
+++ b/e-util/e-corba-utils.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* e-corba-utils.h
- * 
+ *
  * Copyright (C) 2000  Ximian, Inc.
  * Author: Ettore Perazzoli <ettore@ximian.com>
  *
diff --git a/e-util/e-cursor.c b/e-util/e-cursor.c
index 22d265ce7b..fa7fa991f9 100644
--- a/e-util/e-cursor.c
+++ b/e-util/e-cursor.c
@@ -32,13 +32,13 @@
  * e_cursor_set:
  * @widget: Any widget in a window, to which busy cursor has to be set
  * cursor: The type of cursor to be set defined in e-cursor.h
- * 
+ *
  * Sets the cursor specified, to the top level window of the given widget.
- * It is not window aware, so if you popup a window, it will not have 
+ * It is not window aware, so if you popup a window, it will not have
  * busy cursor set. That has to be handled seperately with a new call to this
  * function.
  *
- * Return value: 
+ * Return value:
  **/
 void e_cursor_set (GtkWidget *widget, ECursorType cursor)
 {
diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c
index 6aa5da34be..1c75dc83e5 100644
--- a/e-util/e-dialog-utils.c
+++ b/e-util/e-dialog-utils.c
@@ -82,7 +82,7 @@ e_notice (gpointer parent, GtkMessageType type, const char *format, ...)
 					 str);
 	va_end (args);
 	g_free (str);
-	
+
 	if (parent)
 		e_dialog_set_transient_for (GTK_WINDOW (dialog), parent);
 	gtk_dialog_run (GTK_DIALOG (dialog));
@@ -117,7 +117,7 @@ e_notice_with_xid (GdkNativeWindow parent, GtkMessageType type, const char *form
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 	va_end (args);
 	g_free (str);
-	
+
 	if (parent)
 		e_dialog_set_transient_for_xid (GTK_WINDOW (dialog), parent);
 	gtk_dialog_run (GTK_DIALOG (dialog));
@@ -158,7 +158,7 @@ window_is_wm_toplevel (Display *display, Window window)
  * e_dialog_set_transient_for:
  * @dialog: a dialog window
  * @parent_widget: the parent for @dialog
- * 
+ *
  * This sets the parent for @dialog to be @parent_widget. Unlike
  * gtk_window_set_transient_for(), this doesn't need @parent_widget to
  * be the actual toplevel, and also works if @parent_widget is
@@ -218,7 +218,7 @@ dialog_realized (GtkWindow *dialog, gpointer xid)
  * e_dialog_set_transient_for_xid:
  * @dialog: a dialog window
  * @xid: the X Window parent
- * 
+ *
  * Like e_dialog_set_transient_for(), but use an XID to specify the
  * parent window.
  **/
@@ -263,7 +263,7 @@ save_ok (GtkWidget *widget, gpointer data)
 	GtkWidget *fs;
 	char **filename = data;
 	char *uri;
-	
+
 	fs = gtk_widget_get_toplevel (widget);
 	uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (fs));
 
@@ -271,7 +271,7 @@ save_ok (GtkWidget *widget, gpointer data)
 		e_file_update_save_path(gtk_file_chooser_get_current_folder_uri(GTK_FILE_CHOOSER(fs)), TRUE);
 		*filename = uri;
 	}
-	
+
 	gtk_main_quit ();
 }
 
@@ -293,13 +293,13 @@ e_file_dialog_save (const char *title, const char *fname)
 	selection = e_file_get_save_filesel(NULL, title, fname, GTK_FILE_CHOOSER_ACTION_SAVE);
 
 	g_signal_connect (G_OBJECT (selection), "response", G_CALLBACK (filechooser_response), &filename);
-	
+
 	gtk_widget_show (GTK_WIDGET (selection));
 	gtk_grab_add (GTK_WIDGET (selection));
 	gtk_main ();
-	
+
 	gtk_widget_destroy (GTK_WIDGET (selection));
-	
+
 	return filename;
 }
 
@@ -309,13 +309,13 @@ save_folder_ok (GtkWidget *widget, gpointer data)
 	GtkWidget *fs;
 	char **filename = data;
 	char *uri;
-	
+
 	fs = gtk_widget_get_toplevel (widget);
 	uri = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (fs));
-	
+
 	e_file_update_save_path(uri, FALSE);
 	*filename = uri;
-	
+
 	gtk_main_quit ();
 }
 
@@ -336,13 +336,13 @@ e_file_dialog_save_folder (const char *title)
 
 	selection = e_file_get_save_filesel(NULL, title, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
 	g_signal_connect (G_OBJECT (selection), "response", G_CALLBACK (folderchooser_response), &filename);
-	
+
 	gtk_widget_show (GTK_WIDGET (selection));
 	gtk_grab_add (GTK_WIDGET (selection));
 	gtk_main ();
-	
+
 	gtk_widget_destroy (GTK_WIDGET (selection));
-	
+
 	return filename;
 }
 
diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c
index 36ade95803..20f7db5ce5 100644
--- a/e-util/e-dialog-widgets.c
+++ b/e-util/e-dialog-widgets.c
@@ -58,7 +58,7 @@ dialog_destroy_cb (DialogHooks *hooks, GObject *dialog)
 {
 	g_slist_free (hooks->whooks);
 	hooks->whooks = NULL;
-	
+
 	g_free (hooks);
 	g_object_set_data (dialog, "dialog-hooks", NULL);
 }
@@ -70,14 +70,14 @@ static DialogHooks *
 get_dialog_hooks (GtkWidget *dialog)
 {
 	DialogHooks *hooks;
-	
+
 	hooks = g_object_get_data ((GObject *) dialog, "dialog-hooks");
 	if (!hooks) {
 		hooks = g_new0 (DialogHooks, 1);
 		g_object_set_data ((GObject *) dialog, "dialog-hooks", hooks);
 		g_object_weak_ref ((GObject *) dialog, (GWeakNotify) dialog_destroy_cb, hooks);
 	}
-	
+
 	return hooks;
 }
 
@@ -88,11 +88,11 @@ static int
 value_to_index (const int *value_map, int value)
 {
 	int i;
-	
+
 	for (i = 0; value_map[i] != -1; i++)
 		if (value_map[i] == value)
 			return i;
-	
+
 	return -1;
 }
 
@@ -103,15 +103,15 @@ static int
 index_to_value (const int *value_map, int index)
 {
 	int i;
-	
+
 	/* We do this the hard way, i.e. not as a simple array reference, to
 	 * check for correctness.
 	 */
-	
+
 	for (i = 0; value_map[i] != -1; i++)
 		if (i == index)
 			return value_map[i];
-	
+
 	return -1;
 }
 
@@ -121,12 +121,12 @@ hook_radio (GtkWidget *dialog, GtkRadioButton *radio, gpointer value_var, gpoint
 {
 	const int *value_map;
 	int *value;
-	
+
 	/* Set the value */
-	
+
 	value = (int *) value_var;
 	value_map = (const int *) info;
-	
+
 	e_dialog_radio_set (GTK_WIDGET (radio), *value, value_map);
 }
 
@@ -136,10 +136,10 @@ get_radio_value (GtkRadioButton *radio, gpointer value_var, gpointer info)
 {
 	int *value;
 	const int *value_map;
-	
+
 	value = (int *) value_var;
 	value_map = (const int *) info;
-	
+
 	*value = e_dialog_radio_get (GTK_WIDGET (radio), value_map);
 }
 
@@ -149,12 +149,12 @@ hook_option_menu (GtkWidget *dialog, GtkOptionMenu *omenu, gpointer value_var, g
 {
 	const int *value_map;
 	int *value;
-	
+
 	/* Set the value */
-	
+
 	value = (int *) value_var;
 	value_map = (const int *) info;
-	
+
 	e_dialog_option_menu_set (GTK_WIDGET (omenu), *value, value_map);
 }
 
@@ -164,10 +164,10 @@ get_option_menu_value (GtkOptionMenu *omenu, gpointer value_var, gpointer info)
 {
 	const int *value_map;
 	int *value;
-	
+
 	value = (int *) value_var;
 	value_map = (const int *) info;
-	
+
 	*value = e_dialog_option_menu_get (GTK_WIDGET (omenu), value_map);
 }
 
@@ -176,9 +176,9 @@ static void
 hook_toggle (GtkWidget *dialog, GtkToggleButton *toggle, gpointer value_var, gpointer info)
 {
 	gboolean *value;
-	
+
 	/* Set the value */
-	
+
 	value = (gboolean *) value_var;
 	e_dialog_toggle_set (GTK_WIDGET (toggle), *value);
 }
@@ -188,7 +188,7 @@ static void
 get_toggle_value (GtkToggleButton *toggle, gpointer value_var, gpointer info)
 {
 	gboolean *value;
-	
+
 	value = (gboolean *) value_var;
 	*value = e_dialog_toggle_get (GTK_WIDGET (toggle));
 }
@@ -199,14 +199,14 @@ hook_spin_button (GtkWidget *dialog, GtkSpinButton *spin, gpointer value_var, gp
 {
 	double *value;
 	GtkAdjustment *adj;
-	
+
 	/* Set the value */
-	
+
 	value = (double *) value_var;
 	e_dialog_spin_set (GTK_WIDGET (spin), *value);
-	
+
 	/* Hook to changed */
-	
+
 	adj = gtk_spin_button_get_adjustment (spin);
 }
 
@@ -215,7 +215,7 @@ static void
 get_spin_button_value (GtkSpinButton *spin, gpointer value_var, gpointer info)
 {
 	double *value;
-	
+
 	value = (double *) value_var;
 	*value = e_dialog_spin_get_double (GTK_WIDGET (spin));
 }
@@ -225,11 +225,11 @@ static void
 hook_editable (GtkWidget *dialog, GtkEditable *editable, gpointer value_var, gpointer info)
 {
 	char **value;
-	
+
 	/* Set the value */
-	
+
 	value = (char **) value_var;
-	
+
 	e_dialog_editable_set (GTK_WIDGET (editable), *value);
 }
 
@@ -238,11 +238,11 @@ static void
 get_editable_value (GtkEditable *editable, gpointer value_var, gpointer data)
 {
 	char **value;
-	
+
 	value = (char **) value_var;
 	if (*value)
 		g_free (*value);
-	
+
 	*value = e_dialog_editable_get (GTK_WIDGET (editable));
 }
 
@@ -250,19 +250,19 @@ get_editable_value (GtkEditable *editable, gpointer value_var, gpointer data)
  * e_dialog_editable_set:
  * @widget: A #GtkEditable widget.
  * @value: String value.
- * 
+ *
  * Sets the string value inside a #GtkEditable-derived widget.
  **/
 void
 e_dialog_editable_set (GtkWidget *widget, const char *value)
 {
 	int pos = 0;
-	
+
 	g_return_if_fail (widget != NULL);
 	g_return_if_fail (GTK_IS_EDITABLE (widget));
-	
+
 	gtk_editable_delete_text (GTK_EDITABLE (widget), 0, -1);
-	
+
 	if (value)
 		gtk_editable_insert_text (GTK_EDITABLE (widget), value, strlen (value), &pos);
 }
@@ -270,9 +270,9 @@ e_dialog_editable_set (GtkWidget *widget, const char *value)
 /**
  * e_dialog_editable_get:
  * @widget: A #GtkEditable widget.
- * 
+ *
  * Queries the string value inside a #GtkEditable-derived widget.
- * 
+ *
  * Return value: String value.  You should free it when you are done with it.
  * This function can return NULL if the string could not be converted from
  * GTK+'s encoding into UTF8.
@@ -282,7 +282,7 @@ e_dialog_editable_get (GtkWidget *widget)
 {
 	g_return_val_if_fail (widget != NULL, NULL);
 	g_return_val_if_fail (GTK_IS_EDITABLE (widget), NULL);
-	
+
 	return gtk_editable_get_chars (GTK_EDITABLE (widget), 0, -1);
 }
 
@@ -291,7 +291,7 @@ e_dialog_editable_get (GtkWidget *widget)
  * @widget: A #GtkRadioButton in a radio button group.
  * @value: Enumerated value.
  * @value_map: Map from enumeration values to array indices.
- * 
+ *
  * Sets the selected item in a radio group.  The specified @widget can be any of
  * the #GtkRadioButtons in the group.  Each radio button should correspond to an
  * enumeration value; the specified @value will be mapped to an integer from
@@ -305,24 +305,24 @@ e_dialog_radio_set (GtkWidget *widget, int value, const int *value_map)
 {
 	GSList *group, *l;
 	int i;
-	
+
 	g_return_if_fail (widget != NULL);
 	g_return_if_fail (GTK_IS_RADIO_BUTTON (widget));
 	g_return_if_fail (value_map != NULL);
-	
+
 	group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (widget));
-	
+
 	i = value_to_index (value_map, value);
 	if (i != -1) {
 		/* Groups are built by prepending items, so the list ends up in reverse
 		 * order; we need to flip the index around.
 		 */
 		i = g_slist_length (group) - i - 1;
-		
+
 		l = g_slist_nth (group, i);
 		if (!l)
 			g_message ("e_dialog_radio_set(): could not find index %d in radio group!", i);
-		
+
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (l->data), TRUE);
 	} else
 		g_message ("e_dialog_radio_set(): could not find value %d in value map!", value);
@@ -332,11 +332,11 @@ e_dialog_radio_set (GtkWidget *widget, int value, const int *value_map)
  * e_dialog_radio_get:
  * @widget: A #GtkRadioButton in a radio button group.
  * @value_map: Map from enumeration values to array indices.
- * 
+ *
  * Queries the selected item in a #GtkRadioButton group.  Please read the
  * description of e_dialog_radio_set() to see how @value_map maps enumeration
  * values to button indices.
- * 
+ *
  * Return value: Enumeration value which corresponds to the selected item in the
  * radio group.
  **/
@@ -345,33 +345,33 @@ e_dialog_radio_get (GtkWidget *widget, const int *value_map)
 {
 	GSList *group, *l;
 	int i, v;
-	
+
 	g_return_val_if_fail (widget != NULL, -1);
 	g_return_val_if_fail (GTK_IS_RADIO_BUTTON (widget), -1);
 	g_return_val_if_fail (value_map != NULL, -1);
-	
+
 	group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (widget));
-	
+
 	for (i = 0, l = group; l; l = l->next, i++) {
 		widget = GTK_WIDGET (l->data);
-		
+
 		if (GTK_TOGGLE_BUTTON (widget)->active)
 			break;
 	}
-	
+
 	g_return_val_if_fail (l != NULL, -1);
-	
+
 	/* Groups are built by prepending items, so the list ends up in reverse
 	 * order; we need to flip the index around.
 	 */
 	i = g_slist_length (group) - i - 1;
-	
+
 	v = index_to_value (value_map, i);
 	if (v == -1) {
 		g_message ("e_dialog_radio_get(): could not find index %d in value map!", i);
 		return -1;
 	}
-	
+
 	return v;
 }
 
@@ -379,7 +379,7 @@ e_dialog_radio_get (GtkWidget *widget, const int *value_map)
  * e_dialog_toggle_set:
  * @widget: A #GtkToggleButton.
  * @value: Toggle value.
- * 
+ *
  * Sets the value of a #GtkToggleButton-derived widget.  This should not be used
  * for radio buttons; it is more convenient to use use e_dialog_radio_set()
  * instead.
@@ -389,18 +389,18 @@ e_dialog_toggle_set (GtkWidget *widget, gboolean value)
 {
 	g_return_if_fail (widget != NULL);
 	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (widget));
-	
+
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), value);
 }
 
 /**
  * e_dialog_toggle_get:
  * @widget: A #GtkToggleButton.
- * 
+ *
  * Queries the value of a #GtkToggleButton-derived widget.  This should not be
  * used for radio buttons; it is more convenient to use e_dialog_radio_get()
  * instead.
- * 
+ *
  * Return value: Toggle value.
  **/
 gboolean
@@ -408,7 +408,7 @@ e_dialog_toggle_get (GtkWidget *widget)
 {
 	g_return_val_if_fail (widget != NULL, FALSE);
 	g_return_val_if_fail (GTK_IS_TOGGLE_BUTTON (widget), FALSE);
-	
+
 	return GTK_TOGGLE_BUTTON (widget)->active;
 }
 
@@ -416,19 +416,19 @@ e_dialog_toggle_get (GtkWidget *widget)
  * e_dialog_spin_set:
  * @widget: A #GtkSpinButton.
  * @value: Numeric value.
- * 
+ *
  * Sets the value of a #GtkSpinButton widget.
  **/
 void
 e_dialog_spin_set (GtkWidget *widget, double value)
 {
 	GtkAdjustment *adj;
-	
+
 	g_return_if_fail (widget != NULL);
 	g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
-	
+
 	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget));
-	
+
 	adj->value = value;
 	g_signal_emit_by_name (adj, "value_changed", 0);
 }
@@ -436,19 +436,19 @@ e_dialog_spin_set (GtkWidget *widget, double value)
 /**
  * e_dialog_spin_get_double:
  * @widget: A #GtkSpinButton.
- * 
+ *
  * Queries the floating-point value of a #GtkSpinButton widget.
- * 
+ *
  * Return value: Numeric value.
  **/
 double
 e_dialog_spin_get_double (GtkWidget *widget)
 {
 	GtkAdjustment *adj;
-	
+
 	g_return_val_if_fail (widget != NULL, 0.0);
 	g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), 0.0);
-	
+
 	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget));
 	return adj->value;
 }
@@ -456,19 +456,19 @@ e_dialog_spin_get_double (GtkWidget *widget)
 /**
  * e_dialog_spin_get_int:
  * @widget: A #GtkSpinButton.
- * 
+ *
  * Queries the integer value of a #GtkSpinButton widget.
- * 
+ *
  * Return value: Numeric value.
  **/
 int
 e_dialog_spin_get_int (GtkWidget *widget)
 {
 	double value;
-	
+
 	g_return_val_if_fail (widget != NULL, -1);
 	g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), -1);
-	
+
 	value = e_dialog_spin_get_double (widget);
 	return (int) floor (value);
 }
@@ -478,7 +478,7 @@ e_dialog_spin_get_int (GtkWidget *widget)
  * @widget: A #GtkOptionMenu.
  * @value: Enumerated value.
  * @value_map: Map from enumeration values to array indices.
- * 
+ *
  * Sets the selected item in a #GtkOptionMenu.  Please read the description of
  * e_dialog_radio_set() to see how @value_map maps enumeration values to item
  * indices.
@@ -487,13 +487,13 @@ void
 e_dialog_option_menu_set (GtkWidget *widget, int value, const int *value_map)
 {
 	int i;
-	
+
 	g_return_if_fail (widget != NULL);
 	g_return_if_fail (GTK_IS_OPTION_MENU (widget));
 	g_return_if_fail (value_map != NULL);
-	
+
 	i = value_to_index (value_map, value);
-	
+
 	if (i != -1)
 		gtk_option_menu_set_history (GTK_OPTION_MENU (widget), i);
 	else
@@ -505,11 +505,11 @@ e_dialog_option_menu_set (GtkWidget *widget, int value, const int *value_map)
  * e_dialog_option_menu_get:
  * @widget: A #GtkOptionMenu.
  * @value_map: Map from enumeration values to array indices.
- * 
+ *
  * Queries the selected item in a #GtkOptionMenu.  Please read the description
  * of e_dialog_radio_set() to see how @value_map maps enumeration values to item
  * indices.
- * 
+ *
  * Return value: Enumeration value which corresponds to the selected item in the
  * option menu.
  **/
@@ -522,31 +522,31 @@ e_dialog_option_menu_get (GtkWidget *widget, const int *value_map)
 	GList *l;
 	int i;
 	int v;
-	
+
 	g_return_val_if_fail (widget != NULL, -1);
 	g_return_val_if_fail (GTK_IS_OPTION_MENU (widget), -1);
 	g_return_val_if_fail (value_map != NULL, -1);
-	
+
 	menu = GTK_MENU (gtk_option_menu_get_menu (GTK_OPTION_MENU (widget)));
-	
+
 	active = gtk_menu_get_active (menu);
 	g_return_val_if_fail (active != NULL, -1);
-	
+
 	children = GTK_MENU_SHELL (menu)->children;
-	
+
 	for (i = 0, l = children; l; l = l->next, i++) {
 		if (GTK_WIDGET (l->data) == active)
 			break;
 	}
-	
+
 	g_return_val_if_fail (l != NULL, -1);
-	
+
 	v = index_to_value (value_map, i);
 	if (v == -1) {
 		g_message ("e_dialog_option_menu_get(): could not find index %d in value map!", i);
 		return -1;
 	}
-	
+
 	return v;
 }
 
@@ -611,7 +611,7 @@ e_dialog_combo_box_get (GtkWidget *widget, const int *value_map)
  * e_dialog_dateedit_set:
  * @widget: A #GnomeDateEdit widget.
  * @t: Date/time value.
- * 
+ *
  * Sets the value of a #GnomeDateEdit widget.
  **/
 void
@@ -619,16 +619,16 @@ e_dialog_dateedit_set (GtkWidget *widget, time_t t)
 {
 	g_return_if_fail (widget != NULL);
 	g_return_if_fail (GNOME_IS_DATE_EDIT (widget));
-	
+
 	gnome_date_edit_set_time (GNOME_DATE_EDIT (widget), t);
 }
 
 /**
  * e_dialog_dateedit_get:
  * @widget: A #GnomeDateEdit widget.
- * 
+ *
  * Queries the value of a #GnomeDateEdit widget.
- * 
+ *
  * Return value: Date/time value.
  **/
 time_t
@@ -636,7 +636,7 @@ e_dialog_dateedit_get (GtkWidget *widget)
 {
 	g_return_val_if_fail (widget != NULL, -1);
 	g_return_val_if_fail (GNOME_IS_DATE_EDIT (widget), -1);
-	
+
 	return gnome_date_edit_get_time (GNOME_DATE_EDIT (widget));
 }
 
@@ -647,7 +647,7 @@ e_dialog_dateedit_get (GtkWidget *widget)
  * @value_var: Pointer to the variable that the @widget will control.
  * @info: NULL for most widgets, or an integer value map array (see
  * e_dialog_radio_set() for details).
- * 
+ *
  * Hooks a widget from a dialog box to the variable it will modify.  Supported
  * widgets are:  #GtkEditable (char *), #GtkRadioButton (int/value_map pair; see
  * e_dialog_radio_set() for more information), #GtkTogglebutton (gboolean),
@@ -671,18 +671,18 @@ e_dialog_widget_hook_value (GtkWidget *dialog, GtkWidget *widget,
 {
 	DialogHooks *hooks;
 	WidgetHook *wh;
-	
+
 	g_return_val_if_fail (dialog != NULL, FALSE);
 	g_return_val_if_fail (widget != NULL, FALSE);
 	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
 	g_return_val_if_fail (value_var != NULL, FALSE);
-	
+
 	hooks = get_dialog_hooks (dialog);
-	
+
 	/* First check if it is a "group" widget, like a radio button or an
 	 * option menu.  Then we check for normal ungrouped widgets.
 	 */
-	
+
 	if (GTK_IS_RADIO_BUTTON (widget))
 		hook_radio (dialog, GTK_RADIO_BUTTON (widget), value_var, info);
 	else if (GTK_IS_OPTION_MENU (widget))
@@ -695,14 +695,14 @@ e_dialog_widget_hook_value (GtkWidget *dialog, GtkWidget *widget,
 		hook_editable (dialog, GTK_EDITABLE (widget), value_var, info);
 	else
 		return FALSE;
-	
+
 	wh = g_new (WidgetHook, 1);
 	wh->widget = widget;
 	wh->value_var = value_var;
 	wh->info = info;
-	
+
 	hooks->whooks = g_slist_prepend (hooks->whooks, wh);
-	
+
 	return TRUE;
 }
 
@@ -710,7 +710,7 @@ e_dialog_widget_hook_value (GtkWidget *dialog, GtkWidget *widget,
  * e_dialog_get_values:
  * @dialog: A dialog box whose widgets have been hooked to the appropriate
  * variables with e_dialog_widget_hook_value().
- * 
+ *
  * Makes every widget in a @dialog that was hooked with
  * e_dialog_widget_hook_value() apply its value to its corresponding variable.
  * The typical usage is to call this function in the handler for the "OK" button
@@ -721,16 +721,16 @@ e_dialog_get_values (GtkWidget *dialog)
 {
 	DialogHooks *hooks;
 	GSList *l;
-	
+
 	g_return_if_fail (dialog != NULL);
-	
+
 	hooks = get_dialog_hooks (dialog);
-	
+
 	for (l = hooks->whooks; l; l = l->next) {
 		WidgetHook *wh;
-		
+
 		wh = l->data;
-		
+
 		if (GTK_IS_RADIO_BUTTON (wh->widget))
 			get_radio_value (GTK_RADIO_BUTTON (wh->widget), wh->value_var, wh->info);
 		else if (GTK_IS_OPTION_MENU (wh->widget))
@@ -754,10 +754,10 @@ e_dialog_get_values (GtkWidget *dialog)
  * @value_var: Pointer to the variable that the widget will control.
  * @info: NULL for most widgets, or an integer value map array (see
  * e_dialog_radio_set() for details).
- * 
+ *
  * Similar to e_dialog_widget_hook_value(), but uses the widget from a #GladeXML
  * data structure.
- * 
+ *
  * Return value: TRUE if the type of the specified widget is supported, FALSE
  * otherwise.
  **/
@@ -766,19 +766,19 @@ e_dialog_xml_widget_hook_value (GladeXML *xml, GtkWidget *dialog, const char *wi
 				gpointer value_var, gpointer info)
 {
 	GtkWidget *widget;
-	
+
 	g_return_val_if_fail (xml != NULL, FALSE);
 	g_return_val_if_fail (GLADE_IS_XML (xml), FALSE);
 	g_return_val_if_fail (dialog != NULL, FALSE);
 	g_return_val_if_fail (widget_name != NULL, FALSE);
 	g_return_val_if_fail (value_var != NULL, FALSE);
-	
+
 	widget = glade_xml_get_widget (xml, widget_name);
 	if (!widget) {
 		g_message ("e_dialog_xml_widget_hook_value(): could not find widget `%s' in "
 			   "Glade data!", widget_name);
 		return FALSE;
 	}
-	
+
 	return e_dialog_widget_hook_value (dialog, widget, value_var, info);
 }
diff --git a/e-util/e-error.c b/e-util/e-error.c
index 9f2a768c9b..94ad35f31a 100644
--- a/e-util/e-error.c
+++ b/e-util/e-error.c
@@ -45,7 +45,7 @@
 #include "e-util-private.h"
 #include "e-error.h"
 
-#define d(x) 
+#define d(x)
 
 struct _e_error_button {
 	struct _e_error_button *next;
@@ -110,7 +110,7 @@ static int
 map_response(const char *name)
 {
 	int i;
-	
+
 	for (i=0;i<sizeof(response_map)/sizeof(response_map[0]);i++)
 		if (!strcmp(name, response_map[i].name))
 			return response_map[i].id;
@@ -169,7 +169,7 @@ ee_load(const char *path)
 	char *tmp;
 
 	d(printf("loading error file %s\n", path));
-	
+
 	doc = e_xml_parse_file (path);
 	if (doc == NULL) {
 		g_warning("Error file '%s' not found", path);
@@ -239,7 +239,7 @@ ee_load(const char *path)
 				e->default_response = map_response(tmp);
 				xmlFree(tmp);
 			}
-			
+
 			tmp = (char *)xmlGetProp(error, (const unsigned char *)"scroll");
 			if (tmp) {
 				if (!strcmp(tmp, "yes"))
@@ -550,9 +550,9 @@ e_error_newv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap)
 		gtk_scrolled_window_add_with_viewport ((GtkScrolledWindow *)scroll, w);
 		gtk_box_pack_start((GtkBox *)hbox, scroll, FALSE, FALSE, 0);
 		gtk_window_set_default_size ((GtkWindow *)dialog, 360, 180);
-	} else 
+	} else
 		gtk_box_pack_start((GtkBox *)hbox, w, FALSE, FALSE, 0);
-		
+
 	gtk_widget_show_all(hbox);
 
 	gtk_box_pack_start((GtkBox *)dialog->vbox, hbox, TRUE, TRUE, 0);
@@ -562,16 +562,16 @@ e_error_newv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap)
 
 /**
  * e_error_new:
- * @parent: 
+ * @parent:
  * @tag: error identifier
  * @arg0: The first argument for the error formatter.  The list must
  * be NULL terminated.
- * 
+ *
  * Creates a new error widget.  The @tag argument is used to determine
  * which error to use, it is in the format domain:error-id.  The NULL
  * terminated list of arguments, starting with @arg0 is used to fill
  * out the error definition.
- * 
+ *
  * Return value: A GtkDialog which can be used for showing an error
  * dialog asynchronously.
  **/
@@ -604,13 +604,13 @@ e_error_runv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap)
 
 /**
  * e_error_run:
- * @parent: 
- * @tag: 
- * @arg0: 
- * 
+ * @parent:
+ * @tag:
+ * @arg0:
+ *
  * Sets up, displays, runs and destroys a standard evolution error
  * dialog based on @tag, which is in the format domain:error-id.
- * 
+ *
  * Return value: The response id of the button pressed.
  **/
 int
@@ -638,8 +638,8 @@ remove_parent(GtkWidget *w, GtkWidget *parent)
 
 /**
  * e_error_default_parent:
- * @parent: 
- * 
+ * @parent:
+ *
  * Bit of a hack, set a default parent that will be used to parent any
  * error boxes if none is supplied.
  *
diff --git a/e-util/e-event.c b/e-util/e-event.c
index 363cc7f91f..5ac51d10ee 100644
--- a/e-util/e-event.c
+++ b/e-util/e-event.c
@@ -132,9 +132,9 @@ ep_class_init(GObjectClass *klass)
 
 /**
  * e_event_get_type:
- * 
+ *
  * Standard GObject type function.  Used to subclass EEvent.
- * 
+ *
  * Return value: The EEvent type.
  **/
 GType
@@ -161,9 +161,9 @@ e_event_get_type(void)
  * e_event_construct:
  * @ep: An instantiated but uninitialised EEvent.
  * @id: Event manager id.
- * 
+ *
  * Construct the base event instance with standard parameters.
- * 
+ *
  * Return value: Returns @ep.
  **/
 EEvent *e_event_construct(EEvent *ep, const char *id)
@@ -179,7 +179,7 @@ EEvent *e_event_construct(EEvent *ep, const char *id)
  * @items: A list of EEventItems event listeners to register on this event manager.
  * @freefunc: A function called when the @items list is no longer needed.
  * @data: callback data for @freefunc and for item event handlers.
- * 
+ *
  * Adds @items to the list of events listened to on the event manager @emp.
  *
  * Return value: An opaque key which can later be passed to remove_items.
@@ -206,9 +206,9 @@ e_event_add_items(EEvent *emp, GSList *items, EEventItemsFunc freefunc, void *da
 
 /**
  * e_event_remove_items:
- * @emp: 
- * @handle: 
- * 
+ * @emp:
+ * @handle:
+ *
  * Remove items previously added.  They MUST have been previously
  * added, and may only be removed once.
  **/
@@ -226,7 +226,7 @@ e_event_remove_items(EEvent *emp, void *handle)
 		g_slist_foreach(emp->priv->sorted, (GFunc)g_free, NULL);
 		g_slist_free(emp->priv->sorted);
 		emp->priv->sorted = NULL;
-	}	
+	}
 }
 
 static int
@@ -248,7 +248,7 @@ ee_cmp(const void *ap, const void *bp)
  * @ee: An initialised EEvent, potentially with registered event listeners.
  * @id: Event name.  This will be compared against EEventItem.id.
  * @target: The target describing the event context.  This will be implementation defined.
- * 
+ *
  * Emit an event.  @target will automatically be freed once its
  * emission is complete.
  **/
@@ -272,7 +272,7 @@ e_event_emit(EEvent *emp, const char *id, EEventTarget *target)
 
 		for (;node->next;node=node->next) {
 			GSList *l = node->events;
-			
+
 			for (;l;l=g_slist_next(l)) {
 				struct _event_info *info;
 
@@ -312,7 +312,7 @@ e_event_emit(EEvent *emp, const char *id, EEventTarget *target)
  * @ep: An initialised EEvent instance.
  * @type: type, up to implementor
  * @size: The size of memory to allocate.  This must be >= sizeof(EEventTarget).
- * 
+ *
  * Allocate a new event target suitable for this class.  It is up to
  * the implementation to define the available target types and their
  * structure.
@@ -338,7 +338,7 @@ void *e_event_target_new(EEvent *ep, int type, size_t size)
  * e_event_target_free:
  * @ep: An initialised EEvent instance on which this target was allocated.
  * @o: The target to free.
- * 
+ *
  * Free a target.  This invokes the virtual free method on the EEventClass.
  **/
 void
@@ -526,17 +526,17 @@ emph_class_init(EPluginHookClass *klass)
 
 /**
  * e_event_hook_get_type:
- * 
+ *
  * Standard GObject function to get the EEvent object type.  Used to
  * subclass EEventHook.
- * 
+ *
  * Return value: The type of the event hook class.
  **/
 GType
 e_event_hook_get_type(void)
 {
 	static GType type = 0;
-	
+
 	if (!type) {
 		static const GTypeInfo info = {
 			sizeof(EEventHookClass), NULL, NULL, (GClassInitFunc) emph_class_init, NULL, NULL,
@@ -546,7 +546,7 @@ e_event_hook_get_type(void)
 		emph_parent_class = g_type_class_ref(e_plugin_hook_get_type());
 		type = g_type_register_static(e_plugin_hook_get_type(), "EEventHook", &info, 0);
 	}
-	
+
 	return type;
 }
 
@@ -555,7 +555,7 @@ e_event_hook_get_type(void)
  * @klass: The derived EEventHook class.
  * @map: A map used to describe a single EEventTarget type for this
  * class.
- * 
+ *
  * Add a target map to a concrete derived class of EEvent.  The target
  * map enumerates a single target type and th eenable mask bit names,
  * so that the type can be loaded automatically by the base EEvent class.
diff --git a/e-util/e-event.h b/e-util/e-event.h
index d75d550767..e7cafbc33f 100644
--- a/e-util/e-event.h
+++ b/e-util/e-event.h
@@ -49,10 +49,10 @@ typedef void (*EEventFactoryFunc)(EEvent *ee, void *);
 
 /**
  * enum _e_event_t - Event type.
- * 
+ *
  * @E_EVENT_PASS: A passthrough event handler which only receives the event.
  * @E_EVENT_SINK: A sink event handler swallows all events it processes.
- * 
+ *
  * The event type defines what type of event listener this is.
  *
  * Events should normally be @E_EVENT_PASS.
@@ -64,7 +64,7 @@ enum _e_event_t {
 
 /**
  * struct _EEventItem - An event listener item.
- * 
+ *
  * @type: The type of the event listener.
  * @priority: A signed number signifying the priority of the event
  * listener.  0 should be used normally.  This is used to order event
@@ -78,7 +78,7 @@ enum _e_event_t {
  * @user_data: Callback data.
  * @enable: Target-specific mask to qualify the receipt of events.
  * This is target and implementation specific.
- * 
+ *
  * An EEventItem defines a specific event listening point on a given
  * EEvent object.  When an event is broadcast onto an EEvent handler,
  * any matching EEventItems will be invoked in priority order.
@@ -95,7 +95,7 @@ struct _EEventItem {
 
 /**
  * struct _EEventTarget - Base EventTarget.
- * 
+ *
  * @event: Parent object.
  * @type: Target type.  Defined by the implementation.
  * @mask: Mask of this target.  This is defined by the implementation,
@@ -104,7 +104,7 @@ struct _EEventItem {
  * This defined a base EventTarget.  This must be subclassed by
  * implementations to provide contextual data for events, and define
  * the enablement qualifiers.
- * 
+ *
  **/
 struct _EEventTarget {
 	struct _EEvent *event;	/* used for virtual methods */
@@ -117,7 +117,7 @@ struct _EEventTarget {
 
 /**
  * struct _EEvent - An Event Manager.
- * 
+ *
  * @object: Superclass.
  * @priv: Private data.
  * @id: Id of this event manager.
@@ -138,7 +138,7 @@ struct _EEvent {
 
 /**
  * struct _EEventClass - Event management type.
- * 
+ *
  * @object_class: Superclass.
  * @target_free: Virtual method to free the target.
  *
@@ -187,7 +187,7 @@ typedef void (*EEventHookFunc)(struct _EPlugin *plugin, EEventTarget *target);
 
 /**
  * struct _EEventHook - An event hook.
- * 
+ *
  * @hook: Superclass.
  *
  * The EEventHook class loads and manages the meta-data required to
@@ -202,13 +202,13 @@ struct _EEventHook {
 };
 
 /**
- * struct _EEventHookClass - 
- * 
- * @hook_class: 
+ * struct _EEventHookClass -
+ *
+ * @hook_class:
  * @target_map: Table of EPluginHookTargetMaps which enumerate the
  * target types and enable bits of the implementing class.
  * @event: The EEvent instance on which all loaded events must be registered.
- * 
+ *
  * The EEventHookClass is an empty event hooking class, which must be
  * subclassed and initialised before use.
  *
diff --git a/e-util/e-folder-map.c b/e-util/e-folder-map.c
index 31ae5ffb8e..6c6e07e263 100644
--- a/e-util/e-folder-map.c
+++ b/e-util/e-folder-map.c
@@ -45,25 +45,25 @@ is_type_folder (const char *metadata, const char *search_type)
 	xmlNodePtr node;
 	xmlDocPtr doc;
 	char *type;
-	
+
 	doc = e_xml_parse_file (metadata);
 	if (!doc) {
 		g_warning ("Cannot parse `%s'", metadata);
 		return FALSE;
 	}
-	
+
 	if (!(node = xmlDocGetRootElement (doc))) {
 		g_warning ("`%s' corrupt: document contains no root node", metadata);
 		xmlFreeDoc (doc);
 		return FALSE;
 	}
-	
+
 	if (!node->name || strcmp ((char *)node->name, "efolder") != 0) {
 		g_warning ("`%s' corrupt: root node is not 'efolder'", metadata);
 		xmlFreeDoc (doc);
 		return FALSE;
 	}
-	
+
 	node = node->children;
 	while (node != NULL) {
 		if (node->name && !strcmp ((char *)node->name, "type")) {
@@ -71,20 +71,20 @@ is_type_folder (const char *metadata, const char *search_type)
 			if (!strcmp (type, search_type)) {
 				xmlFreeDoc (doc);
 				xmlFree (type);
-				
+
 				return TRUE;
 			}
-			
+
 			xmlFree (type);
-			
+
 			break;
 		}
-		
+
 		node = node->next;
 	}
-	
+
 	xmlFreeDoc (doc);
-	
+
 	return FALSE;
 }
 
@@ -101,7 +101,7 @@ e_folder_map_dir (const char *dirname, const char *type, GSList **dir_list)
 		g_free (path);
 		return;
 	}
-	
+
 	if (!is_type_folder (path, type)) {
 		g_free (path);
 		goto try_subdirs;
@@ -109,8 +109,8 @@ e_folder_map_dir (const char *dirname, const char *type, GSList **dir_list)
 
 	d(g_message ("Found '%s'", dirname));
 	*dir_list = g_slist_prepend (*dir_list, g_strdup (dirname));
-	
-	g_free (path);	
+
+	g_free (path);
 
  try_subdirs:
 
@@ -119,32 +119,32 @@ e_folder_map_dir (const char *dirname, const char *type, GSList **dir_list)
 		g_free (path);
 		return;
 	}
-	
+
 	if (!(dir = g_dir_open (path, 0, &error))) {
 		g_warning ("cannot open `%s': %s", path, error->message);
 		g_error_free (error);
 		g_free (path);
 		return;
 	}
-	
+
 	while ((name = g_dir_read_name (dir))) {
 		char *full_path;
-		
+
 		if (*name == '.')
 			continue;
-		
+
 		full_path = g_build_filename (path, name, NULL);
 		if (!g_file_test (full_path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
 			g_free (full_path);
 			continue;
 		}
-		
+
 		e_folder_map_dir (full_path, type, dir_list);
 		g_free (full_path);
 	}
-	
+
 	g_dir_close (dir);
-	
+
 	g_free (path);
 }
 
@@ -152,34 +152,34 @@ GSList *
 e_folder_map_local_folders (char *local_dir, char *type)
 {
 	const char *name;
-	GDir *dir;	
+	GDir *dir;
 	GSList *dir_list = NULL;
 	GError *error = NULL;
-	
+
 	if (!(dir = g_dir_open (local_dir, 0, &error))) {
 		g_warning ("cannot open `%s': %s", local_dir, error->message);
 		g_error_free (error);
 		return NULL;
 	}
-	
+
 	while ((name = g_dir_read_name (dir))) {
 		char *full_path;
-		
+
 		if (*name == '.')
 			continue;
-		
+
 		full_path = g_build_filename (local_dir, name, NULL);
 		d(g_message ("Looking in %s", full_path));
 		if (!g_file_test (full_path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
 			g_free (full_path);
 			continue;
 		}
-		
+
 		e_folder_map_dir (full_path, type, &dir_list);
 
 		g_free (full_path);
 	}
-	
+
 	g_dir_close (dir);
 
 	return dir_list;
diff --git a/e-util/e-fsutils.c b/e-util/e-fsutils.c
index cb126df0cf..97118eddd0 100644
--- a/e-util/e-fsutils.c
+++ b/e-util/e-fsutils.c
@@ -51,10 +51,10 @@
 
 /**
  * e_fsutils_usage:
- * @path: 
- * 
+ * @path:
+ *
  * Calculate the amount of disk space used by a given path.
- * 
+ *
  * Return value: The number of 1024 byte blocks used by the
  * filesystem.
  **/
@@ -118,10 +118,10 @@ fail:
 
 /**
  * e_fsutils_avail:
- * @path: 
- * 
+ * @path:
+ *
  * Find the available disk space at the given path.
- * 
+ *
  * Return value: -1 if it could not be determined, otherwise the
  * number of disk blocks, expressed as system-independent, 1024 byte
  * blocks.
diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c
index 18f9c9b50f..5a828dedf6 100644
--- a/e-util/e-gui-utils.c
+++ b/e-util/e-gui-utils.c
@@ -69,7 +69,7 @@ GtkWidget *e_create_image_widget(gchar *name,
 {
 	GtkWidget *alignment = NULL;
 	GtkWidget *w;
-	
+
 	if (string1) {
 		w = e_icon_factory_get_image (string1, E_ICON_SIZE_DIALOG);
 
diff --git a/e-util/e-html-utils.h b/e-util/e-html-utils.h
index 9d2262f9a7..73f40c9977 100644
--- a/e-util/e-html-utils.h
+++ b/e-util/e-html-utils.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* e-html-utils.c */
-/* 
+/*
  * Copyright (C) 2000  Ximian, Inc.
  * Author: Dan Winship <danw@ximian.com>
  *
diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c
index 52a7f14e82..78b8122cdd 100644
--- a/e-util/e-icon-factory.c
+++ b/e-util/e-icon-factory.c
@@ -110,22 +110,22 @@ load_icon (const char *icon_key, const char *icon_name, int size, int scale)
 			int width;
 			GDir *dir;
 			char *x;
-			
+
 			if (!(dir = g_dir_open (EVOLUTION_ICONSDIR, 0, NULL))) {
 				goto done;
 			}
-			
+
 			/* scan icon directories looking for an icon with a size >= the size we need. */
 			while ((dent = g_dir_read_name (dir))) {
 				if (!(dent[0] >= '1' && dent[0] <= '9'))
 					continue;
-				
+
 				if (((width = strtol (dent, &x, 10)) < size) || *x != 'x')
 					continue;
-				
+
 				if (((strtol (x + 1, &x, 10)) != width) || *x != '\0')
 					continue;
-				
+
 				/* if the icon exists in this directory, we can [use/scale] it */
 				g_free (filename);
 				basename = g_strconcat (icon_name, ".png", NULL);
@@ -137,7 +137,7 @@ load_icon (const char *icon_key, const char *icon_name, int size, int scale)
 				if ((unscaled = gdk_pixbuf_new_from_file (filename, NULL)))
 					break;
 			}
-			
+
 			g_dir_close (dir);
 		} else {
 			gchar *size_x_size;
@@ -213,8 +213,8 @@ e_icon_factory_init (void)
 
 	icon_theme = gtk_icon_theme_get_default ();
 	gtk_icon_theme_append_search_path (icon_theme,
-                                   EVOLUTION_DATADIR G_DIR_SEPARATOR_S 
-                                   "evolution" G_DIR_SEPARATOR_S 
+                                   EVOLUTION_DATADIR G_DIR_SEPARATOR_S
+                                   "evolution" G_DIR_SEPARATOR_S
                                    BASE_VERSION G_DIR_SEPARATOR_S "icons");
 	g_signal_connect (
 		icon_theme, "changed",
@@ -386,12 +386,12 @@ e_icon_factory_get_icon_list (const char *icon_name)
 	for (i = 0; i < G_N_ELEMENTS (icon_list_sizes); i++) {
 		size = icon_list_sizes[i];
 		sprintf (icon_key, "%dx%d/%s", size, size, icon_name);
-		
+
 		if (!(icon = g_hash_table_lookup (name_to_icon, icon_key))) {
 			if ((icon = load_icon (icon_key, icon_name, size, FALSE)))
 				g_hash_table_insert (name_to_icon, icon->name, icon);
 		}
-		
+
 		if (icon && icon->pixbuf) {
 			list = g_list_prepend (list, icon->pixbuf);
 			g_object_ref (icon->pixbuf);
diff --git a/e-util/e-import.c b/e-util/e-import.c
index 7cf02c07e5..92a54f59ac 100644
--- a/e-util/e-import.c
+++ b/e-util/e-import.c
@@ -47,7 +47,7 @@
 
 #include <glib/gi18n.h>
 
-#define d(x) 
+#define d(x)
 
 #define _PRIVATE(o) (g_type_instance_get_private ((GTypeInstance *)o, e_import_get_type()))
 
@@ -124,10 +124,10 @@ ep_base_init(GObjectClass *klass)
 
 /**
  * e_import_get_type:
- * 
+ *
  * Standard GObject method.  Used to subclass for the concrete
  * implementations.
- * 
+ *
  * Return value: EImport type.
  **/
 GType
@@ -154,9 +154,9 @@ e_import_get_type(void)
  * e_import_construct:
  * @ep: The instance to initialise.
  * @id: The name of the instance.
- * 
+ *
  * Used by implementing classes to initialise base parameters.
- * 
+ *
  * Return value: @ep is returned.
  **/
 EImport *e_import_construct(EImport *ep, const char *id)
@@ -175,13 +175,13 @@ EImport *e_import_new(const char *id)
 
 /**
  * e_import_import:
- * @ei: 
+ * @ei:
  * @t: Target to import.
  * @im: Importer to use.
  * @status: Status callback, called with progress information.
  * @done: Complete callback, will always be called once complete.
  * @data:
- * 
+ *
  * Run the import function of the selected importer.  Once the
  * importer has finished, it MUST call the e_import_complete()
  * function.  This allows importers to run in synchronous or
@@ -213,11 +213,11 @@ void e_import_cancel(EImport *ei, EImportTarget *t, EImportImporter *im)
  * @ei:
  * @target: Target of interest
  * @im: Importer to get widget of
- * 
+ *
  * Gets a widget that the importer uses to configure its
  * destination.  This widget should be packed into a container
  * widget.  It should not be shown_all.
- * 
+ *
  * Return value: NULL if the importer doesn't support/require
  * a destination.
  **/
@@ -232,9 +232,9 @@ e_import_get_widget(EImport *ei, EImportTarget *target, EImportImporter *im)
 
 /**
  * e_import_complete:
- * @ei: 
+ * @ei:
  * @target: Target just completed (unused currently)
- * 
+ *
  * Signify that an import is complete.  This must be called by
  * importer implementations when they are done.
  **/
@@ -252,14 +252,14 @@ void e_import_status(EImport *ei, EImportTarget *target, const char *what, int p
 
 /**
  * e_import_get_importers:
- * @emp: 
- * @target: 
- * 
+ * @emp:
+ * @target:
+ *
  * Get a list of importers.  If @target is supplied, then only
  * importers which support the type and location specified by the
  * target are listed.  If @target is NULL, then all importers are
  * listed.
- * 
+ *
  * Return value: A list of importers.  The list should be freed when
  * no longer needed.
  **/
@@ -292,7 +292,7 @@ e_import_get_importers(EImport *emp, EImportTarget *target)
  * @freefunc: If supplied, called to free the importer node
  * when it is no longer needed.
  * @data: Data for the callback.
- * 
+ *
  **/
 void
 e_import_class_add_importer(EImportClass *klass, EImportImporter *importer, EImportImporterFunc freefunc, void *data)
@@ -343,7 +343,7 @@ void e_import_class_remove_importer(EImportClass *klass, EImportImporter *f)
  * @ep: Parent EImport object.
  * @type: type, up to implementor
  * @size: Size of object to allocate.
- * 
+ *
  * Allocate a new import target suitable for this class.  Implementing
  * classes will define the actual content of the target.
  **/
@@ -369,7 +369,7 @@ void *e_import_target_new(EImport *ep, int type, size_t size)
  * e_import_target_free:
  * @ep: Parent EImport object.
  * @o: The target to fre.
- * 
+ *
  * Free a target.  The implementing class can override this method to
  * free custom targets.
  **/
@@ -583,7 +583,7 @@ emph_class_init(EPluginHookClass *klass)
 	/** @HookClass: Evolution Importers
 	 * @Id: org.gnome.evolution.import:1.0
 	 * @Target: EImportTarget
-	 * 
+	 *
 	 * A hook for data importers.
 	 **/
 
@@ -600,16 +600,16 @@ emph_class_init(EPluginHookClass *klass)
 
 /**
  * e_import_hook_get_type:
- * 
+ *
  * Standard GObject function to get the object type.
- * 
+ *
  * Return value: The EImportHook class type.
  **/
 GType
 e_import_hook_get_type(void)
 {
 	static GType type = 0;
-	
+
 	if (!type) {
 		static const GTypeInfo info = {
 			sizeof(EImportHookClass), NULL, NULL, (GClassInitFunc) emph_class_init, NULL, NULL,
@@ -619,7 +619,7 @@ e_import_hook_get_type(void)
 		emph_parent_class = g_type_class_ref(e_plugin_hook_get_type());
 		type = g_type_register_static(e_plugin_hook_get_type(), "EImportHook", &info, 0);
 	}
-	
+
 	return type;
 }
 
@@ -629,7 +629,7 @@ e_import_hook_get_type(void)
  * @klass: The dervied EimportHook class.
  * @map: A map used to describe a single EImportTarget type for this
  * class.
- * 
+ *
  * Add a targe tmap to a concrete derived class of EImport.  The
  * target map enumates the target types available for the implenting
  * class.
diff --git a/e-util/e-import.h b/e-util/e-import.h
index 40bd29655a..15f2e3aea8 100644
--- a/e-util/e-import.h
+++ b/e-util/e-import.h
@@ -60,8 +60,8 @@ enum _e_import_target_t {
 };
 
 /**
- * struct _EImportImporter - 
- * 
+ * struct _EImportImporter -
+ *
  * @type: target type
  * @priority: Priority of importer.  Higher values will be processed first.
  * @supported: Callback to see if this target is supported by the importer.
@@ -90,13 +90,13 @@ struct _EImportImporter {
 
 /**
  * struct _EImportTarget - importation context.
- * 
+ *
  * @import: The parent object.
  * @type: The type of target, defined by implementing classes.
  * @data: This can be used to store run-time information
  * about this target.  Any allocated data must be set so
  * as to free it when the target is freed.
- * 
+ *
  * The base target object is used as the parent and placeholder for
  * import context for a given importer.
  **/
@@ -128,7 +128,7 @@ struct _EImportTargetHome {
 
 /**
  * struct _EImport - An importer management object.
- * 
+ *
  * @object: Superclass.
  * @id: ID of importer.
  * @status: Status callback of current running import.
@@ -148,7 +148,7 @@ struct _EImport {
 
 /**
  * struct _EImportClass - Importer manager abstract class.
- * 
+ *
  * @object_class: Superclass.
  * @factories: A list of factories registered on this type of
  * importuration manager.
@@ -157,7 +157,7 @@ struct _EImport {
  * into changes on the target to propery drive the manager.
  * @target_free: A virtual method used to free the target in an
  * implementation-defined way.
- * 
+ *
  **/
 struct _EImportClass {
 	GObjectClass object_class;
@@ -223,11 +223,11 @@ struct _EImportHookImporter {
 
 /**
  * struct _EImportHook - Plugin hook for importuration windows.
- * 
+ *
  * @hook: Superclass.
  * @groups: A list of EImportHookGroup's of all importuration windows
  * this plugin hooks into.
- * 
+ *
  **/
 struct _EImportHook {
 	EPluginHook hook;
@@ -238,7 +238,7 @@ struct _EImportHook {
 /**
  * struct _EImportHookClass - Abstract class for importuration window
  * plugin hooks.
- * 
+ *
  * @hook_class: Superclass.
  * @target_map: A table of EImportHookTargetMap structures describing
  * the possible target types supported by this class.
@@ -247,7 +247,7 @@ struct _EImportHook {
  *
  * This is an abstract class defining the plugin hook point for
  * importuration windows.
- * 
+ *
  **/
 struct _EImportHookClass {
 	EPluginHookClass hook_class;
diff --git a/e-util/e-menu.c b/e-util/e-menu.c
index c9e6d098b4..0582d35c96 100644
--- a/e-util/e-menu.c
+++ b/e-util/e-menu.c
@@ -148,9 +148,9 @@ em_base_init(GObjectClass *klass)
 
 /**
  * e_menu_get_type:
- * 
+ *
  * Standard GObject type function.  Used to subclass this type only.
- * 
+ *
  * Return value: The EMenu object type.
  **/
 GType
@@ -178,9 +178,9 @@ e_menu_get_type(void)
  * e_menu_construct:
  * @em: An instantiated but uninitislied EPopup.
  * @menuid: The unique identifier for this menu.
- * 
+ *
  * Construct the base menu instance based on the parameters.
- * 
+ *
  * Return value: Returns @em.
  **/
 EMenu *e_menu_construct(EMenu *em, const char *menuid)
@@ -225,7 +225,7 @@ EMenu *e_menu_construct(EMenu *em, const char *menuid)
  * associated with the menus.
  * @freefunc: If supplied, called when the menu items are no longer needed.
  * @data: user-data passed to @freefunc and activate callbacks.
- * 
+ *
  * Add new EMenuItems to the menu's.  This may be called any number of
  * times before the menu is first activated to hook onto any of the
  * menu items defined for that view.
@@ -281,9 +281,9 @@ e_menu_add_items(EMenu *emp, GSList *items, GSList *uifiles, GSList *pixmaps, EM
 
 /**
  * e_menu_remove_items:
- * @emp: 
- * @handle: 
- * 
+ * @emp:
+ * @handle:
+ *
  * Remove menu items previously added.
  **/
 void
@@ -298,7 +298,7 @@ e_menu_remove_items(EMenu *emp, void *handle)
 	if (emp->uic) {
 		for (l = node->items;l;l=g_slist_next(l)) {
 			EMenuItem *item = l->data;
-		
+
 			bonobo_ui_component_remove_verb(emp->uic, item->verb);
 		}
 	}
@@ -341,7 +341,7 @@ em_activate(BonoboUIComponent *uic, void *data, const char *cname)
  * @em: An initialised EMenu.
  * @uic: The BonoboUI component for this views menu's.
  * @act: If %TRUE, then the control is being activated.
- * 
+ *
  * This is called by the owner of the component, control, or view to
  * pass on the activate or deactivate control signals.  If the view is
  * being activated then the callbacks and menu items are setup,
@@ -424,7 +424,7 @@ void e_menu_activate(EMenu *em, struct _BonoboUIComponent *uic, int act)
  * e_menu_update_target:
  * @em: An initialised EMenu.
  * @tp: Target, after this call the menu owns the target.
- * 
+ *
  * Change the target for the menu.  Once the target is changed, the
  * sensitivity state of the menu items managed by @em is re-evaluated
  * and the physical menu's updated to reflect it.
@@ -477,13 +477,13 @@ void e_menu_update_target(EMenu *em, void *tp)
  * called on all menus.
  * @func: An EMenuFactoryFunc callback.
  * @data: Callback data for @func.
- * 
+ *
  * Add a menu factory which will be called when the menu @menuid is
  * created.  The factory is free to add new items as it wishes to the
  * menu provided in the callback.
  *
  * TODO: Make the menuid a pattern?
- * 
+ *
  * Return value: A handle to the factory.
  **/
 EMenuFactory *
@@ -515,7 +515,7 @@ e_menu_class_add_factory(EMenuClass *klass, const char *menuid, EMenuFactoryFunc
  * e_menu_class_remove_factory:
  * @klass: Class on which the factory was originally added.
  * @f: Factory handle.
- * 
+ *
  * Remove a popup factory.  This must only be called once, and must
  * only be called using a valid factory handle @f.  After this call,
  * @f is undefined.
@@ -533,7 +533,7 @@ e_menu_class_remove_factory(EMenuClass *klass, EMenuFactory *f)
  * @ep: An EMenu to which this target applies.
  * @type: Target type, up to implementation.
  * @size: Size of memory to allocate.  Must be >= sizeof(EMenuTarget).
- * 
+ *
  * Allocate a new menu target suitable for this class.  @size is used
  * to specify the actual target size, which may vary depending on the
  * implementing class.
@@ -559,7 +559,7 @@ void *e_menu_target_new(EMenu *ep, int type, size_t size)
  * e_menu_target_free:
  * @ep: EMenu on which the target was allocated.
  * @o: Tareget to free.
- * 
+ *
  * Free a target.
  **/
 void
@@ -886,17 +886,17 @@ emph_class_init(EPluginHookClass *klass)
 
 /**
  * e_menu_hook_get_type:
- * 
+ *
  * Standard GObject function to get the object type.  Used to subclass
  * EMenuHook.
- * 
+ *
  * Return value: The type of the menu hook class.
  **/
 GType
 e_menu_hook_get_type(void)
 {
 	static GType type = 0;
-	
+
 	if (!type) {
 		static const GTypeInfo info = {
 			sizeof(EMenuHookClass), NULL, NULL, (GClassInitFunc) emph_class_init, NULL, NULL,
@@ -906,7 +906,7 @@ e_menu_hook_get_type(void)
 		emph_parent_class = g_type_class_ref(e_plugin_hook_get_type());
 		type = g_type_register_static(e_plugin_hook_get_type(), "EMenuHook", &info, 0);
 	}
-	
+
 	return type;
 }
 
@@ -914,7 +914,7 @@ e_menu_hook_get_type(void)
  * e_menu_hook_class_add_target_map:
  * @klass: The derived EMenuHook class.
  * @map: A map used to describe a single EMenuTarget for this class.
- * 
+ *
  * Adds a target map to a concrete derived class of EMenu.  The target
  * map enumerates a single target type, and the enable mask bit names,
  * so that the type can be loaded automatically by the EMenu class.
diff --git a/e-util/e-menu.h b/e-util/e-menu.h
index 2692878172..c5548a335b 100644
--- a/e-util/e-menu.h
+++ b/e-util/e-menu.h
@@ -53,13 +53,13 @@ typedef void (*EMenuItemsFunc)(EMenu *, GSList *items, GSList *uifiles, GSList *
 
 /**
  * enum _e_menu_t - Menu item type.
- * 
+ *
  * @E_MENU_ITEM: Normal menu item.
  * @E_MENU_TOGGLE: Toggle menu item.
  * @E_MENU_RADIO: unimplemented.
  * @E_MENU_TYPE_MASK: Mask used to separate item type from option bits.
  * @E_MENU_ACTIVE: Whether a toggle item is active.
- * 
+ *
  * The type of menu items which are supported by the menu system.
  **/
 enum _e_menu_t {
@@ -72,7 +72,7 @@ enum _e_menu_t {
 
 /**
  * struct _EMenuItem - A BonoboUI menu item.
- * 
+ *
  * @type: Menu item type.  %E_MENU_ITEM or %E_MENU_TOGGLE.
  * @path: BonoboUI Path to the menu item.
  * @verb: BonoboUI verb for the menu item.
@@ -82,7 +82,7 @@ enum _e_menu_t {
  * @user_data: User data for item.
  * @visible: Visibility mask, unimplemented.
  * @enable: Sensitivity mask, combined with the target mask.
- * 
+ *
  * An EMenuItem defines a single menu item.  This menu item is used to
  * hook onto callbacks from the bonobo menus, but not to build or
  * merge the menu itself.
@@ -99,7 +99,7 @@ struct _EMenuItem {
 
 /**
  * struct _EMenuPixmap - A menu icon holder.
- * 
+ *
  * @command: The path to the command or verb to which this pixmap belongs.
  * @name: The name of the icon.  Either an icon-theme name or the full
  * pathname of the icon.
@@ -119,11 +119,11 @@ struct _EMenuPixmap {
 
 /**
  * struct _EMenuUIFile - A meu UI file holder.
- * 
+ *
  * @appdir: TODO; should this be handled internally.
  * @appname: TODO; should this be handled internally.
  * @filename: The filename of the BonoboUI XML menu definition.
- * 
+ *
  * These values are passed directly to bonobo_ui_util_set_ui() when
  * the menu is activated.
  **/
@@ -135,7 +135,7 @@ struct _EMenuUIFile {
 
 /**
  * struct _EMenuTarget - A BonoboUI menu target definition.
- * 
+ *
  * @menu: The parent menu object, used for virtual methods on the target.
  * @widget: The parent widget where available.  In some cases the type
  * of this object is part of the published api for the target, in
@@ -144,7 +144,7 @@ struct _EMenuUIFile {
  * @type: Target type.  This will be defined by the implementation.
  * @mask: Target mask.  This is used to sensitise show items based on
  * their definition in EMenuItem.
- * 
+ *
  * An EMenuTarget defines the context for a specific view instance.
  * It is used to enable and show menu items, and to provide contextual
  * data to menu invocations.
@@ -156,20 +156,20 @@ struct _EMenuTarget {
 	guint32 type;		/* for implementors */
 
 	guint32 mask;		/* enable/visible mask */
-	
+
 	/* implementation fields follow */
 };
 
 /**
  * struct _EMenu - A BonoboUI menu manager object.
- * 
+ *
  * @object: Superclass.
  * @priv: Private data.
  * @menuid: The id of this menu instance.
  * @uic: The current BonoboUIComponent which stores the actual menu
  * items this object manages.
  * @target: The current target for the view.
- * 
+ *
  * The EMenu manager object manages the mappings between EMenuItems
  * and the BonoboUI menus loaded from UI files.
  **/
@@ -183,8 +183,8 @@ struct _EMenu {
 };
 
 /**
- * struct _EMenuClass - 
- * 
+ * struct _EMenuClass -
+ *
  * @object_class: Superclass type.
  * @factories: A list of factories for this particular class of main menu.
  * @target_free: Virtual method to free the menu target.  The base
@@ -245,7 +245,7 @@ typedef void (*EMenuHookFunc)(struct _EPlugin *plugin, EMenuTarget *target);
 
 /**
  * struct _EMenuHookMenu - A group of items targetting a specific menu.
- * 
+ *
  * @hook: Parent pointer.
  * @id: The identifier of the menu or view to which these items belong.
  * @target_type: The target number of the type of target these menu
@@ -254,7 +254,7 @@ typedef void (*EMenuHookFunc)(struct _EPlugin *plugin, EMenuTarget *target);
  * @uis: A list of filenames of the BonoboUI files that need to be
  * loaded for an active view.
  * @pixmaps: A list of EMenuHookPixmap structures for the menus.
- * 
+ *
  * This structure is used to keep track of all of the items that a
  * plugin wishes to add to specific menu.  This is used internally by
  * a factory method defined by the EMenuHook to add the right menu
@@ -271,7 +271,7 @@ struct _EMenuHookMenu {
 
 /**
  * struct _EMenuHook - A BonoboUI menu hook.
- * 
+ *
  * @hook: Superclass.
  * @menus: A list of EMenuHookMenus for all menus registered on this
  * hook type.
@@ -287,13 +287,13 @@ struct _EMenuHook {
 
 /**
  * struct _EMenuHookClass - Menu hook type.
- * 
+ *
  * @hook_class: Superclass type.
  * @target_map: Table of EluginHookTargetMaps which enumerate the
  * target types and enable bits of the implementing class.
  * @menu_class: The EMenuClass of the corresponding popup manager for
  * implementing the class.
- * 
+ *
  * The EMenuHookClass is an empty concrete class.  It must be
  * subclassed and initialised appropriately to perform useful work.
  *
diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c
index 02a3e784fd..9ff294f929 100644
--- a/e-util/e-mktemp.c
+++ b/e-util/e-mktemp.c
@@ -107,10 +107,10 @@ get_dir (gboolean make)
 	GString *path;
 	time_t now = time(NULL);
 	static time_t last = 0;
-	
+
 #ifdef TEMP_HOME
 	char *tmpdir = NULL;
-	tmpdir = g_build_filename(g_get_home_dir(), ".evolution", 
+	tmpdir = g_build_filename(g_get_home_dir(), ".evolution",
 		"cache", "tmp", NULL);
 	path = g_string_new(tmpdir);
 	if (make && g_mkdir_with_parents(tmpdir, 0777) == -1) {
@@ -123,20 +123,20 @@ get_dir (gboolean make)
 	g_string_append_printf (path, "%d", (int) getuid ());
 	if (make) {
 		int ret;
-		
+
 		/* shoot now, ask questions later */
 		ret = g_mkdir (path->str, S_IRWXU);
 		if (ret == -1) {
 			if (errno == EEXIST) {
 				struct stat st;
-				
+
 				if (g_stat (path->str, &st) == -1) {
 					/* reset errno */
 					errno = EEXIST;
 					g_string_free (path, TRUE);
 					return NULL;
 				}
-				
+
 				/* make sure this is a directory and belongs to us... */
 				if (!S_ISDIR (st.st_mode) || st.st_uid != getuid ()) {
 					/* eek! this is bad... */
@@ -150,7 +150,7 @@ get_dir (gboolean make)
 			}
 		}
 	}
-#endif	
+#endif
 
 	d(printf("temp dir '%s'\n", path ? path->str : "(null)"));
 
@@ -168,20 +168,20 @@ e_mktemp (const char *template)
 {
 	GString *path;
 	char *ret;
-	
+
 	path = get_dir (TRUE);
 	if (!path)
 		return NULL;
-	
+
 	g_string_append_c (path, '/');
 	if (template)
 		g_string_append (path, template);
 	else
 		g_string_append (path, "unknown-XXXXXX");
-	
+
 	ret = mktemp (path->str);
 	g_string_free(path, ret == NULL);
-	
+
 	return ret;
 }
 
@@ -191,20 +191,20 @@ e_mkstemp (const char *template)
 {
 	GString *path;
 	int fd;
-	
+
 	path = get_dir (TRUE);
 	if (!path)
 		return -1;
-	
+
 	g_string_append_c (path, '/');
 	if (template)
 		g_string_append (path, template);
 	else
 		g_string_append (path, "unknown-XXXXXX");
-	
+
 	fd = g_mkstemp (path->str);
 	g_string_free(path, TRUE);
-	
+
 	return fd;
 }
 
@@ -214,17 +214,17 @@ e_mkdtemp (const char *template)
 {
 	GString *path;
 	char *tmpdir;
-	
+
 	path = get_dir (TRUE);
 	if (!path)
 		return NULL;
-	
+
 	g_string_append_c (path, '/');
 	if (template)
 		g_string_append (path, template);
 	else
 		g_string_append (path, "unknown-XXXXXX");
-	
+
 #ifdef HAVE_MKDTEMP
 	tmpdir = mkdtemp (path->str);
 #else
@@ -235,6 +235,6 @@ e_mkdtemp (const char *template)
 	}
 #endif
 	g_string_free(path, tmpdir == NULL);
-	
+
 	return tmpdir;
 }
diff --git a/e-util/e-pilot-map.c b/e-util/e-pilot-map.c
index 3276337679..8c6f6a826c 100644
--- a/e-util/e-pilot-map.c
+++ b/e-util/e-pilot-map.c
@@ -30,7 +30,7 @@
 
 #include "e-pilot-map.h"
 
-typedef struct 
+typedef struct
 {
 	char *uid;
 	gboolean archived;
@@ -65,7 +65,7 @@ real_e_pilot_map_insert (EPilotMap *map, guint32 pid, const char *uid, gboolean
 	if (pid != 0) {
 		new_pid = g_new (guint32, 1);
 		*new_pid = pid;
-	}	
+	}
 	new_uid = g_strdup (uid);
 
 	/* Values */
@@ -76,13 +76,13 @@ real_e_pilot_map_insert (EPilotMap *map, guint32 pid, const char *uid, gboolean
 		if (touch)
 			pnode->touched = TRUE;
 	}
-	
+
 	unode = g_new0 (EPilotMapUidNode, 1);
 	unode->pid = pid;
 	unode->archived = archived;
 	if (touch)
 		unode->touched = TRUE;
-	
+
 	/* Insertion */
 	if (pid != 0)
 		g_hash_table_insert (map->pid_map, new_pid, pnode);
@@ -93,14 +93,14 @@ static void
 map_set_node_timet (xmlNodePtr node, const char *name, time_t t)
 {
 	char *tstring;
-	
+
 	tstring = g_strdup_printf ("%ld", t);
 	xmlSetProp (node, (unsigned char *)name, (unsigned char *)tstring);
 	g_free (tstring);
 }
 
 static void
-map_sax_start_element (void *data, const xmlChar *name, 
+map_sax_start_element (void *data, const xmlChar *name,
 		       const xmlChar **attrs)
 {
 	EPilotMap *map = (EPilotMap *)data;
@@ -108,15 +108,15 @@ map_sax_start_element (void *data, const xmlChar *name,
 	if (!strcmp ((char *)name, "PilotMap")) {
 		while (attrs && *attrs != NULL) {
 			const xmlChar **val = attrs;
-			
+
 			val++;
-			if (!strcmp ((char *)*attrs, "timestamp")) 
+			if (!strcmp ((char *)*attrs, "timestamp"))
 				map->since = (time_t)strtoul ((char *)*val, NULL, 0);
 
 			attrs = ++val;
 		}
 	}
-	 
+
 	if (!strcmp ((char *)name, "map")) {
 		const char *uid = NULL;
 		guint32 pid = 0;
@@ -124,17 +124,17 @@ map_sax_start_element (void *data, const xmlChar *name,
 
 		while (attrs && *attrs != NULL) {
 			const xmlChar **val = attrs;
-			
+
 			val++;
-			if (!strcmp ((char *)*attrs, "uid")) 
+			if (!strcmp ((char *)*attrs, "uid"))
 				uid = (char *)*val;
-			
+
 			if (!strcmp ((char *)*attrs, "pilot_id"))
 				pid = strtoul ((char *)*val, NULL, 0);
 
 			if (!strcmp ((char *)*attrs, "archived"))
 				archived = strtoul ((char *)*val, NULL, 0)== 1 ? TRUE : FALSE;
-				
+
 			attrs = ++val;
 		}
 
@@ -156,7 +156,7 @@ map_write_foreach (gpointer key, gpointer value, gpointer data)
 
 	if (wd->touched_only && !unode->touched)
 		return;
-	
+
 	mnode = xmlNewChild (root, NULL, (const unsigned char *)"map", NULL);
 	xmlSetProp (mnode, (const unsigned char *)"uid", (unsigned char *)uid);
 
@@ -172,38 +172,38 @@ map_write_foreach (gpointer key, gpointer value, gpointer data)
 	}
 }
 
-gboolean 
+gboolean
 e_pilot_map_pid_is_archived (EPilotMap *map, guint32 pid)
 {
 	EPilotMapPidNode *pnode;
 
 	g_return_val_if_fail (map != NULL, FALSE);
-	
+
 	pnode = g_hash_table_lookup (map->pid_map, &pid);
 
 	if (pnode == NULL)
 		return FALSE;
-	
+
 	return pnode->archived;
 }
 
-gboolean 
+gboolean
 e_pilot_map_uid_is_archived (EPilotMap *map, const char *uid)
 {
 	EPilotMapUidNode *unode;
 
 	g_return_val_if_fail (map != NULL, FALSE);
 	g_return_val_if_fail (uid != NULL, FALSE);
-	
+
 	unode = g_hash_table_lookup (map->uid_map, uid);
 
 	if (unode == NULL)
 		return FALSE;
-	
+
 	return unode->archived;
 }
 
-void 
+void
 e_pilot_map_insert (EPilotMap *map, guint32 pid, const char *uid, gboolean archived)
 {
         EPilotMapPidNode *pnode;
@@ -228,7 +228,7 @@ e_pilot_map_insert (EPilotMap *map, guint32 pid, const char *uid, gboolean archi
 	real_e_pilot_map_insert (map, pid, uid, archived, TRUE);
 }
 
-void 
+void
 e_pilot_map_remove_by_pid (EPilotMap *map, guint32 pid)
 {
 	EPilotMapPidNode *pnode;
@@ -247,7 +247,7 @@ e_pilot_map_remove_by_pid (EPilotMap *map, guint32 pid)
 	g_hash_table_remove (map->pid_map, &pid);
 }
 
-void 
+void
 e_pilot_map_remove_by_uid (EPilotMap *map, const char *uid)
 {
 	EPilotMapPidNode *pnode;
@@ -267,28 +267,28 @@ e_pilot_map_remove_by_uid (EPilotMap *map, const char *uid)
 }
 
 
-guint32 
-e_pilot_map_lookup_pid (EPilotMap *map, const char *uid, gboolean touch) 
+guint32
+e_pilot_map_lookup_pid (EPilotMap *map, const char *uid, gboolean touch)
 {
 	EPilotMapUidNode *unode = NULL;
 
 	g_return_val_if_fail (map != NULL, 0);
 	g_return_val_if_fail (uid != NULL, 0);
-	
+
 	unode = g_hash_table_lookup (map->uid_map, uid);
 
 	if (unode == NULL)
 		return 0;
-	
+
 	if (touch) {
 		EPilotMapPidNode *pnode = NULL;
-		
+
 		pnode = g_hash_table_lookup (map->pid_map, &unode->pid);
 		if (pnode != NULL)
 			pnode->touched = TRUE;
-		unode->touched = TRUE;	
+		unode->touched = TRUE;
 	}
-	
+
 	return unode->pid;
 }
 
@@ -298,26 +298,26 @@ e_pilot_map_lookup_uid (EPilotMap *map, guint32 pid, gboolean touch)
 	EPilotMapPidNode *pnode = NULL;
 
 	g_return_val_if_fail (map != NULL, NULL);
-	
+
 	pnode = g_hash_table_lookup (map->pid_map, &pid);
 
 	if (pnode == NULL)
 		return NULL;
-	
+
 	if (touch) {
 		EPilotMapUidNode *unode = NULL;
-		
+
 		unode = g_hash_table_lookup (map->uid_map, pnode->uid);
 		g_return_val_if_fail (unode != NULL, NULL);
-		
+
 		unode->touched = TRUE;
 		pnode->touched = TRUE;
 	}
-	
+
 	return pnode->uid;
 }
 
-int 
+int
 e_pilot_map_read (const char *filename, EPilotMap **map)
 {
 	xmlSAXHandler handler;
@@ -349,12 +349,12 @@ e_pilot_map_read (const char *filename, EPilotMap **map)
 	}
 
 	new_map->write_touched_only = FALSE;
-	
+
 	*map = new_map;
-	
+
 	return 0;
 }
-		
+
 int
 e_pilot_map_write (const char *filename, EPilotMap *map)
 {
@@ -364,7 +364,7 @@ e_pilot_map_write (const char *filename, EPilotMap *map)
 
 	g_return_val_if_fail (filename != NULL, -1);
 	g_return_val_if_fail (map != NULL, -1);
-	
+
 	doc = xmlNewDoc ((const unsigned char *)"1.0");
 	if (doc == NULL) {
 		g_warning ("Pilot map file could not be created\n");
@@ -377,7 +377,7 @@ e_pilot_map_write (const char *filename, EPilotMap *map)
 	wd.touched_only = map->write_touched_only;
 	wd.root = xmlDocGetRootElement(doc);
 	g_hash_table_foreach (map->uid_map, map_write_foreach, &wd);
-	
+
 	/* Write the file */
 	xmlSetDocCompressMode (doc, 0);
 	ret = e_xml_save_file (filename, doc);
@@ -385,7 +385,7 @@ e_pilot_map_write (const char *filename, EPilotMap *map)
 		g_warning ("Pilot map file '%s' could not be saved\n", filename);
 		return -1;
 	}
-	
+
 	xmlFreeDoc (doc);
 
 	return 0;
@@ -403,7 +403,7 @@ e_pilot_map_clear (EPilotMap *map)
 	map->write_touched_only = FALSE;
 }
 
-void 
+void
 e_pilot_map_destroy (EPilotMap *map)
 {
 	g_return_if_fail (map != NULL);
diff --git a/e-util/e-pilot-util.c b/e-util/e-pilot-util.c
index dff11b14c7..b9e1bcb0e4 100644
--- a/e-util/e-pilot-util.c
+++ b/e-util/e-pilot-util.c
@@ -36,7 +36,7 @@ e_pilot_utf8_to_pchar (const char *string)
 
 	if (!string)
 		return NULL;
-	
+
 	res = convert_ToPilotChar ("UTF-8", string, strlen (string), &pstring);
 
 	if (res != 0)
@@ -53,12 +53,12 @@ e_pilot_utf8_from_pchar (const char *string)
 
 	if (!string)
 		return NULL;
-	
+
 	res = convert_FromPilotChar ("UTF-8", string, strlen (string), &ustring);
-	
+
 	if (res != 0)
 		ustring = strdup (string);
-	
+
 	return ustring;
 }
 
@@ -76,7 +76,7 @@ e_pilot_get_sync_source (ESourceList *source_list)
 
 		for (s = e_source_group_peek_sources (group); s; s = s->next) {
 			ESource *source = E_SOURCE (s->data);
-			
+
 			if (e_source_get_property (source, "pilot-sync"))
 				return source;
 		}
@@ -89,7 +89,7 @@ void
 e_pilot_set_sync_source (ESourceList *source_list, ESource *source)
 {
 	GSList *g;
-	
+
 	g_return_if_fail (source_list != NULL);
 	g_return_if_fail (E_IS_SOURCE_LIST (source_list));
 
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index bdfe12c9b1..054298a942 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -270,17 +270,17 @@ ep_class_init(EPluginClass *klass)
 
 /**
  * e_plugin_get_type:
- * 
+ *
  * Standard GObject type function.  This is only an abstract class, so
  * you can only use this to subclass EPlugin.
- * 
+ *
  * Return value: The type.
  **/
 GType
 e_plugin_get_type(void)
 {
 	static GType type = 0;
-	
+
 	if (!type) {
 		char *path, *col, *p;
 
@@ -300,7 +300,7 @@ e_plugin_get_type(void)
 
 			path = g_build_filename(g_get_home_dir(), ".eplugins", NULL);
 		}
-		
+
 		p = path;
 		while ((col = strchr(p, G_SEARCHPATH_SEPARATOR))) {
 			*col++ = 0;
@@ -310,7 +310,7 @@ e_plugin_get_type(void)
 		e_plugin_add_load_path(p);
 		g_free(path);
 	}
-	
+
 	return type;
 }
 
@@ -437,7 +437,7 @@ ep_load_pending(EPlugin *ep, EPluginHookClass *type)
 		if (class) {
 			if (strcmp(class, type->id) == 0) {
 				hook = g_object_new(G_OBJECT_CLASS_TYPE(type), NULL);
-				
+
 				/* Don't bother loading hooks for plugins that are not anyway enabled */
 				if (ep->enabled) {
 					res = type->construct(hook, ep, node);
@@ -470,7 +470,7 @@ ep_load_pending(EPlugin *ep, EPluginHookClass *type)
 /**
  * e_plugin_add_load_path:
  * @path: The path to add to search for plugins.
- * 
+ *
  * Add a path to be searched when e_plugin_load_plugins() is called.
  * By default the system plugin directory and ~/.eplugins is used as
  * the search path unless overriden by the environmental variable
@@ -489,10 +489,10 @@ e_plugin_add_load_path(const char *path)
 
 /**
  * e_plugin_load_plugins:
- * 
+ *
  * Scan the search path, looking for plugin definitions, and load them
  * into memory.
- * 
+ *
  * Return value: Returns -1 if an error occurred.
  **/
 int
@@ -537,7 +537,7 @@ e_plugin_load_plugins(void)
 /**
  * e_plugin_register_type:
  * @type: The GObject type of the plugin loader.
- * 
+ *
  * Register a new plugin type with the plugin system.  Each type must
  * subclass EPlugin and must override the type member of the
  * EPluginClass with a unique name.
@@ -608,10 +608,10 @@ ep_list_plugin(void *key, void *val, void *dat)
 
 /**
  * e_plugin_list_plugins: List all plugins.
- * 
+ *
  * Static class method to retrieve a list of all current plugins.  They
  * are listed in no particular order.
- * 
+ *
  * Return value: A GSList of all plugins, they must be
  * g_object_unref'd and the list freed.
  **/
@@ -631,9 +631,9 @@ e_plugin_list_plugins(void)
  * @ep: An EPlugin derived object.
  * @root: The XML root node of the sub-tree containing the plugin
  * definition.
- * 
+ *
  * Helper to invoke the construct virtual method.
- * 
+ *
  * Return value: The return from the construct virtual method.
  **/
 int
@@ -644,15 +644,15 @@ e_plugin_construct(EPlugin *ep, xmlNodePtr root)
 
 /**
  * e_plugin_invoke:
- * @ep: 
+ * @ep:
  * @name: The name of the function to invoke. The format of this name
  * will depend on the EPlugin type and its language conventions.
  * @data: The argument to the function. Its actual type depends on
  * the hook on which the function resides. It is up to the called
  * function to get this right.
- * 
+ *
  * Helper to invoke the invoke virtual method.
- * 
+ *
  * Return value: The return of the plugin invocation.
  **/
 void *
@@ -668,9 +668,9 @@ e_plugin_invoke(EPlugin *ep, const char *name, void *data)
 
 /**
  * e_plugin_enable:
- * @ep: 
- * @state: 
- * 
+ * @ep:
+ * @state:
+ *
  * Set the enable state of a plugin.
  *
  * THIS IS NOT FULLY IMPLEMENTED YET
@@ -686,8 +686,8 @@ e_plugin_enable(EPlugin *ep, int state)
 
 /**
 * e_plugin_configure:
-* @ep: 
-* 
+* @ep:
+*
 *
 **/
 
@@ -703,11 +703,11 @@ e_plugin_configure (EPlugin *ep)
  * e_plugin_xml_prop:
  * @node: An XML node.
  * @id: The name of the property to retrieve.
- * 
+ *
  * A static helper function to look up a property on an XML node, and
  * ensure it is allocated in GLib system memory.  If GLib isn't using
  * the system malloc then it must copy the property value.
- * 
+ *
  * Return value: The property, allocated in GLib memory, or NULL if no
  * such property exists.
  **/
@@ -732,10 +732,10 @@ e_plugin_xml_prop(xmlNodePtr node, const char *id)
  * @node: An XML node.
  * @id: The name of the property to retrieve.
  * @domain: The translation domain for this string.
- * 
+ *
  * A static helper function to look up a property on an XML node, and
  * translate it based on @domain.
- * 
+ *
  * Return value: The property, allocated in GLib memory, or NULL if no
  * such property exists.
  **/
@@ -760,11 +760,11 @@ e_plugin_xml_prop_domain(xmlNodePtr node, const char *id, const char *domain)
  * @id: The name of the property to retrieve.
  * @def: A default value if the property doesn't exist.  Can be used
  * to determine if the property isn't set.
- * 
+ *
  * A static helper function to look up a property on an XML node as an
  * integer.  If the property doesn't exist, then @def is returned as a
  * default value instead.
- * 
+ *
  * Return value: The value if set, or @def if not.
  **/
 int
@@ -780,12 +780,12 @@ e_plugin_xml_int(xmlNodePtr node, const char *id, int def)
 
 /**
  * e_plugin_xml_content:
- * @node: 
- * 
+ * @node:
+ *
  * A static helper function to retrieve the entire textual content of
  * an XML node, and ensure it is allocated in GLib system memory.  If
  * GLib isn't using the system malloc them it must copy the content.
- * 
+ *
  * Return value: The node content, allocated in GLib memory.
  **/
 char *
@@ -806,13 +806,13 @@ e_plugin_xml_content(xmlNodePtr node)
 
 /**
  * e_plugin_xml_content_domain:
- * @node: 
+ * @node:
  * @domain:
- * 
+ *
  * A static helper function to retrieve the entire textual content of
  * an XML node, and ensure it is allocated in GLib system memory.  If
  * GLib isn't using the system malloc them it must copy the content.
- * 
+ *
  * Return value: The node content, allocated in GLib memory.
  **/
 char *
@@ -852,7 +852,7 @@ epl_loadmodule(EPlugin *ep)
 {
 	if (epl->module == NULL) {
 		EPluginLibEnableFunc enable;
-		
+
 		if ((epl->module = g_module_open(epl->location, 0)) == NULL) {
 			g_warning("can't load plugin '%s'", g_module_error());
 			return -1;
@@ -1015,18 +1015,18 @@ epl_class_init(EPluginClass *klass)
 
 /**
  * e_plugin_lib_get_type:
- * 
+ *
  * Standard GObject function to retrieve the EPluginLib type.  Use to
  * register the type with the plugin system if you want to use shared
  * library plugins.
- * 
+ *
  * Return value: The EPluginLib type.
  **/
 GType
 e_plugin_lib_get_type(void)
 {
 	static GType type = 0;
-	
+
 	if (!type) {
 		static const GTypeInfo info = {
 			sizeof(EPluginLibClass), NULL, NULL, (GClassInitFunc) epl_class_init, NULL, NULL,
@@ -1036,7 +1036,7 @@ e_plugin_lib_get_type(void)
 		epl_parent_class = g_type_class_ref(e_plugin_get_type());
 		type = g_type_register_static(e_plugin_get_type(), "EPluginLib", &info, 0);
 	}
-	
+
 	return type;
 }
 
@@ -1072,17 +1072,17 @@ eph_class_init(EPluginHookClass *klass)
 
 /**
  * e_plugin_hook_get_type:
- * 
+ *
  * Standard GObject function to retrieve the EPluginHook type.  Since
  * EPluginHook is an abstract class, this is only used to subclass it.
- * 
+ *
  * Return value: The EPluginHook type.
  **/
 GType
 e_plugin_hook_get_type(void)
 {
 	static GType type = 0;
-	
+
 	if (!type) {
 		static const GTypeInfo info = {
 			sizeof(EPluginHookClass), NULL, NULL, (GClassInitFunc) eph_class_init, NULL, NULL,
@@ -1092,15 +1092,15 @@ e_plugin_hook_get_type(void)
 		eph_parent_class = g_type_class_ref(G_TYPE_OBJECT);
 		type = g_type_register_static(G_TYPE_OBJECT, "EPluginHook", &info, 0);
 	}
-	
+
 	return type;
 }
 
 /**
  * e_plugin_hook_enable: Set hook enabled state.
- * @eph: 
- * @state: 
- * 
+ * @eph:
+ * @state:
+ *
  * Set the enabled state of the plugin hook.  This is called by the
  * plugin code.
  *
@@ -1114,8 +1114,8 @@ e_plugin_hook_enable(EPluginHook *eph, int state)
 
 /**
  * e_plugin_hook_register_type:
- * @type: 
- * 
+ * @type:
+ *
  * Register a new plugin hook type with the plugin system.  Each type
  * must subclass EPluginHook and must override the id member of the
  * EPluginHookClass with a unique identification string.
@@ -1195,7 +1195,7 @@ e_plugin_hook_register_type(GType type)
  * @map: A zero-fill terminated array of EPluginHookTargeKeys used to
  * map a string with a bit value.
  * @prop: The property name.
- * 
+ *
  * This is a static helper function which looks up a property @prop on
  * the XML node @root, and then uses the @map table to convert it into
  * a bitmask.  The property value is a comma separated list of
@@ -1241,17 +1241,17 @@ e_plugin_hook_mask(xmlNodePtr root, const struct _EPluginHookTargetKey *map, con
 
 /**
  * e_plugin_hook_id:
- * @root: 
- * @map: 
- * @prop: 
- * 
+ * @root:
+ * @map:
+ * @prop:
+ *
  * This is a static helper function which looks up a property @prop on
  * the XML node @root, and then uses the @map table to convert it into
  * an integer.
  *
  * This is used as a helper wherever you need to represent an
  * enumerated value in the XML.
- * 
+ *
  * Return value: If the @prop value is in @map, then the corresponding
  * integer value, if not, then ~0.
  **/
@@ -1352,7 +1352,7 @@ epth_class_init(EPluginHookClass *klass)
 
 /**
  * e_plugin_type_hook_get_type:
- * 
+ *
  * Get the type for the plugin plugin hook.
  *
  * Return value: The type of the plugin type hook.
@@ -1361,7 +1361,7 @@ GType
 e_plugin_type_hook_get_type(void)
 {
 	static GType type = 0;
-	
+
 	if (!type) {
 		static const GTypeInfo info = {
 			sizeof(EPluginTypeHookClass), NULL, NULL, (GClassInitFunc) epth_class_init, NULL, NULL,
@@ -1371,6 +1371,6 @@ e_plugin_type_hook_get_type(void)
 		epth_parent_class = g_type_class_ref(e_plugin_hook_get_type());
 		type = g_type_register_static(e_plugin_hook_get_type(), "EPluginTypeHook", &info, 0);
 	}
-	
+
 	return type;
 }
diff --git a/e-util/e-plugin.h b/e-util/e-plugin.h
index e1dc1f29fd..1d628dacd4 100644
--- a/e-util/e-plugin.h
+++ b/e-util/e-plugin.h
@@ -22,7 +22,7 @@ struct _EPluginAuthor {
 
 /**
  * struct _EPlugin - An EPlugin instance.
- * 
+ *
  * @object: Superclass.
  * @id: Unique identifier for plugin instance.
  * @path: Filename where the xml definition resides.
@@ -34,7 +34,7 @@ struct _EPluginAuthor {
  * @hooks: A list of the EPluginHooks this plugin requires.
  * @enabled: Whether the plugin is enabled or not.  This is not fully
  * implemented.
- * 
+ *
  * The base EPlugin object is used to represent each plugin directly.
  * All of the plugin's hooks are loaded and managed through this
  * object.
@@ -56,8 +56,8 @@ struct _EPlugin {
 };
 
 /**
- * struct _EPluginClass - 
- * 
+ * struct _EPluginClass -
+ *
  * @class: Superclass.
  * @type: The plugin type.  This is used by the plugin loader to
  * determine which plugin object to instantiate to handle the plugin.
@@ -126,18 +126,18 @@ typedef int (*EPluginLibEnableFunc)(EPluginLib *ep, int enable);
 typedef int (*EPluginLibConfigureFunc)(EPluginLib *ep);
 
 /**
- * struct _EPluginLib - 
- * 
+ * struct _EPluginLib -
+ *
  * @plugin: Superclass.
  * @location: The filename of the shared object.
  * @module: The GModule once it is loaded.
- * 
+ *
  * This is a concrete EPlugin class.  It loads and invokes dynamically
  * loaded libraries using GModule.  The shared object isn't loaded
  * until the first callback is invoked.
  *
  * When the plugin is loaded, and if it exists, "e_plugin_lib_enable"
- * will be invoked to initialise the 
+ * will be invoked to initialise the
  **/
 struct _EPluginLib {
 	EPlugin plugin;
@@ -147,10 +147,10 @@ struct _EPluginLib {
 };
 
 /**
- * struct _EPluginLibClass - 
- * 
+ * struct _EPluginLibClass -
+ *
  * @plugin_class: Superclass.
- * 
+ *
  * The plugin library needs no additional class data.
  **/
 struct _EPluginLibClass {
@@ -169,11 +169,11 @@ typedef struct _EPluginHookTargetMap EPluginHookTargetMap;
 typedef struct _EPluginHookTargetKey EPluginHookTargetKey;
 
 /**
- * struct _EPluginHookTargetKey - 
- * 
+ * struct _EPluginHookTargetKey -
+ *
  * @key: Enumeration value as a string.
  * @value: Enumeration value as an integer.
- * 
+ *
  * A multi-purpose string to id mapping structure used with various
  * helper functions to simplify plugin hook subclassing.
  **/
@@ -183,8 +183,8 @@ struct _EPluginHookTargetKey {
 };
 
 /**
- * struct _EPluginHookTargetMap - 
- * 
+ * struct _EPluginHookTargetMap -
+ *
  * @type: The string id of the target.
  * @id: The integer id of the target.  Maps directly to the type field
  * of the various plugin type target id's.
@@ -202,10 +202,10 @@ struct _EPluginHookTargetMap {
 
 /**
  * struct _EPluginHook - A plugin hook.
- * 
+ *
  * @object: Superclass.
  * @plugin: The parent object.
- * 
+ *
  * An EPluginHook is used as a container for each hook a given plugin
  * is listening to.
  **/
@@ -216,8 +216,8 @@ struct _EPluginHook {
 };
 
 /**
- * struct _EPluginHookClass - 
- * 
+ * struct _EPluginHookClass -
+ *
  * @class: Superclass.
  * @id: The plugin hook type. This must be overriden by each subclass
  * and is used as a key when loading hook definitions.  This string
@@ -227,7 +227,7 @@ struct _EPluginHook {
  * @construct: Virtual method used to initialise the object when
  * loaded.
  * @enable: Virtual method used to enable or disable the hook.
- * 
+ *
  * The EPluginHookClass represents each hook type.  The type of the
  * class is registered in a global table and is used to instantiate a
  * container for each hook.
diff --git a/e-util/e-popup.c b/e-util/e-popup.c
index c607b9045c..edeb6cebdc 100644
--- a/e-util/e-popup.c
+++ b/e-util/e-popup.c
@@ -164,9 +164,9 @@ ep_base_init(GObjectClass *klass)
 
 /**
  * e_popup_get_type:
- * 
+ *
  * Standard GObject type function.
- * 
+ *
  * Return value: The EPopup object type.
  **/
 GType
@@ -192,11 +192,11 @@ e_popup_get_type(void)
 /**
  * e_popup_new - Create an targetless popup menu manager.
  * @menuid: Unique ID for this menu.
- * 
+ *
  * Create a targetless popup menu object.  This can be used as a
  * helper for creating popup menu's with no target.  Such popup menu's
  * wont be very pluggable.
- * 
+ *
  * Return value: A new EPopup.
  **/
 EPopup *e_popup_new(const char *menuid)
@@ -212,9 +212,9 @@ EPopup *e_popup_new(const char *menuid)
  * e_popup_construct:
  * @ep: An instantiated but uninitialised EPopup.
  * @menuid: The menu identifier.
- * 
+ *
  * Construct the base popup instance with standard parameters.
- * 
+ *
  * Return value: Returns @ep.
  **/
 EPopup *e_popup_construct(EPopup *ep, const char *menuid)
@@ -233,7 +233,7 @@ EPopup *e_popup_construct(EPopup *ep, const char *menuid)
  * longer needed.
  * @data: user-data passed to @freefunc, and passed to all activate
  * methods.
- * 
+ *
  * Add new EPopupItems to the menus.  Any with the same path
  * will override previously defined menu items, at menu building
  * time.  This may be called any number of times before the menu is
@@ -385,7 +385,7 @@ ep_build_tree(struct _item_node *inode, guint32 mask)
 			break;
 		case E_POPUP_RADIO: {
 			char *ppath = inode->parent?inode->parent->item->path:NULL;
-			
+
 			menuitem = (GtkMenuItem *)gtk_radio_menu_item_new(g_hash_table_lookup(group_hash, ppath));
 			g_hash_table_insert(group_hash, ppath, gtk_radio_menu_item_get_group((GtkRadioMenuItem *)menuitem));
 			gtk_check_menu_item_set_active((GtkCheckMenuItem *)menuitem, item->type & E_POPUP_ACTIVE);
@@ -565,12 +565,12 @@ ep_popup_done(GtkWidget *w, EPopup *emp)
  * @target: If set, the target of the selection.  Static menu
  * items will be added.  The target will be freed once complete.
  * @mask: Enable/disable and visibility mask.
- * 
+ *
  * Like popup_create_menu, but automatically sets up the menu
  * so that it is destroyed once a selection takes place, and
  * the EPopup is unreffed.  This is the normal entry point as it
  * automates most memory management for popup menus.
- * 
+ *
  * Return value: A menu, to popup.
  **/
 GtkMenu *
@@ -597,11 +597,11 @@ e_popup_create_menu_once(EPopup *emp, EPopupTarget *target, guint32 mask)
  *
  * This is a class-static method used to register factory callbacks
  * against specific menu's.
- * 
+ *
  * The factory method will be invoked before the menu is created.
  * This way, the factory may add any additional menu items it wishes
  * based on the context supplied in the @target.
- * 
+ *
  * Return value: A handle to the factory which can be used to remove
  * it later.
  **/
@@ -622,7 +622,7 @@ e_popup_class_add_factory(EPopupClass *klass, const char *menuid, EPopupFactoryF
  * e_popup_class_remove_factory:
  * @klass: The EPopup derived class.
  * @f: The factory handle returned by e_popup_class_add_factory().
- * 
+ *
  * Remove a popup menu factory. If it has not been added, or it has
  * already been removed, then the result is undefined (i.e. it will
  * crash).
@@ -644,7 +644,7 @@ e_popup_class_remove_factory(EPopupClass *klass, EPopupFactory *f)
  * @type: type, defined by the implementing class.
  * @size: The size of memory to allocate for the target.  It must be
  * equal or greater than the size of EPopupTarget.
- * 
+ *
  * Allocate a new popup target suitable for this popup type.
  **/
 void *e_popup_target_new(EPopup *ep, int type, size_t size)
@@ -668,7 +668,7 @@ void *e_popup_target_new(EPopup *ep, int type, size_t size)
  * e_popup_target_free:
  * @ep: An EPopup derived object.
  * @o: The target, previously allocated by e_popup_target_new().
- * 
+ *
  * Free the target against @ep. Note that targets are automatically
  * freed if they are passed to the menu creation functions, so this is
  * only required if you are using the target for other purposes.
@@ -912,7 +912,7 @@ emph_class_init(EPluginHookClass *klass)
 
 /**
  * e_popup_hook_get_type:
- * 
+ *
  * Standard GObject function to get the object type.  Used to subclass
  * EPopupHook.
  *
@@ -922,7 +922,7 @@ GType
 e_popup_hook_get_type(void)
 {
 	static GType type = 0;
-	
+
 	if (!type) {
 		static const GTypeInfo info = {
 			sizeof(EPopupHookClass), NULL, NULL, (GClassInitFunc) emph_class_init, NULL, NULL,
@@ -932,7 +932,7 @@ e_popup_hook_get_type(void)
 		emph_parent_class = g_type_class_ref(e_plugin_hook_get_type());
 		type = g_type_register_static(e_plugin_hook_get_type(), "EPopupHook", &info, 0);
 	}
-	
+
 	return type;
 }
 
@@ -941,7 +941,7 @@ e_popup_hook_get_type(void)
  * @klass: The derived EPopupHook class.
  * @map: A map used to describe a single EPopupTarget type for this
  * class.
- * 
+ *
  * Add a target map to a concrete derived class of EPopup.  The target
  * map enumerates a single target type and the enable mask bit names,
  * so that the type can be loaded automatically by the EPopup class.
diff --git a/e-util/e-popup.h b/e-util/e-popup.h
index e6d12cb9d4..a4928c035c 100644
--- a/e-util/e-popup.h
+++ b/e-util/e-popup.h
@@ -148,12 +148,12 @@ struct _EPopupTarget {
 
 /**
  * struct _EPopup - A Popup menu manager.
- * 
+ *
  * @object: Superclass, GObject.
  * @priv: Private data.
  * @menuid: The id of this menu instance.
  * @target: The current target during the display of the popup menu.
- * 
+ *
  * The EPopup manager object.  Each popup menu is built using this
  * one-off object which is created each time the popup is invoked.
  */
@@ -168,15 +168,15 @@ struct _EPopup {
 };
 
 /**
- * struct _EPopupClass - 
- * 
+ * struct _EPopupClass -
+ *
  * @object_class: Superclass type.
  * @factories: A list of factories for this particular class of popup
  * menu.
  * @target_free: Virtual method to free the popup target.  The base
  * class frees the allocation and unrefs the popup pointer
  * structure.
- * 
+ *
  * The EPopup class definition.  This should be sub-classed for each
  * component that wants to provide hookable popup menus.  The
  * sub-class only needs to know how to allocate and free the various target
@@ -229,15 +229,15 @@ typedef struct _EPluginHookTargetKey EPopupHookTargetMask;
 typedef void (*EPopupHookFunc)(struct _EPlugin *plugin, EPopupTarget *target);
 
 /**
- * struct _EPopupHookMenu - 
- * 
+ * struct _EPopupHookMenu -
+ *
  * @hook: Parent pointer.
  * @id: The identifier of the menu to which these items belong.
  * @target_type: The target number of the type of target these menu
  * items expect. It will generally also be defined by the menu id.
  * @items: A list of EPopupItems.
  * @factory: If supplied, a function to call
- * 
+ *
  * The structure used to keep track of all of the items that a plugin
  * wishes to add to a given menu. This is used internally by a factory
  * method set on EPlugin to add the right menu items to a given menu.
@@ -252,7 +252,7 @@ struct _EPopupHookMenu {
 
 /**
  * struct _EPopupHook - A popup menu hook.
- * 
+ *
  * @hook: Superclass.
  * @menus: A list of EPopupHookMenus, for all menus registered on
  * this hook type.
@@ -267,14 +267,14 @@ struct _EPopupHook {
 };
 
 /**
- * struct _EPopupHookClass - 
- * 
+ * struct _EPopupHookClass -
+ *
  * @hook_class: Superclass.
  * @target_map: Table of EPluginHookTargetMaps which enumerate the
  * target types and enable bits of the implementing class.
  * @popup_class: The EPopupClass of the corresponding popup manager
  * for the implementing class.
- * 
+ *
  * The EPopupHookClass is a concrete class, however it is empty on its
  * own.  It needs to be sub-classed and initialised appropriately.
  *
diff --git a/e-util/e-print.c b/e-util/e-print.c
index 204b621286..57d089f779 100644
--- a/e-util/e-print.c
+++ b/e-util/e-print.c
@@ -58,7 +58,7 @@ load_settings (void)
 	GtkPrintSettings *settings;
 	GSList *list;
 	GError *error = NULL;
-	
+
 	client = gconf_client_get_default ();
 	settings = gtk_print_settings_new ();
 
@@ -83,9 +83,9 @@ save_settings (GtkPrintSettings *settings)
 	GConfClient *client;
 	GSList *list = NULL;
 	GError *error = NULL;
-	
+
 	client = gconf_client_get_default ();
-	
+
 	gtk_print_settings_foreach (
 		settings, (GtkPrintSettingsFunc) pack_settings, &list);
 	gconf_client_set_list (
@@ -96,7 +96,7 @@ save_settings (GtkPrintSettings *settings)
 	}
 	g_slist_foreach (list, (GFunc) g_free, NULL);
 	g_slist_free (list);
-	
+
 	g_object_unref (client);
 }
 
@@ -113,7 +113,7 @@ load_page_setup (GtkPrintSettings *settings)
 	if (paper_size != NULL)
 		gtk_page_setup_set_paper_size_and_default_margins (
 			page_setup, paper_size);
-	
+
 	return page_setup;
 }
 
diff --git a/e-util/e-print.h b/e-util/e-print.h
index 9102ddb9f5..740989a79b 100644
--- a/e-util/e-print.h
+++ b/e-util/e-print.h
@@ -31,4 +31,4 @@ void			e_print_run_page_setup_dialog	(GtkWindow *parent);
 
 G_END_DECLS
 
-#endif 
+#endif
diff --git a/e-util/e-profile-event.c b/e-util/e-profile-event.c
index 9c86f72b60..023f76746e 100644
--- a/e-util/e-profile-event.c
+++ b/e-util/e-profile-event.c
@@ -92,11 +92,11 @@ e_profile_event_get_type(void)
 
 /**
  * e_profile_event_peek:
- * @void: 
- * 
+ * @void:
+ *
  * Get the singular instance of the profile event handler.
- * 
- * Return value: 
+ *
+ * Return value:
  **/
 EProfileEvent *e_profile_event_peek(void)
 {
@@ -185,7 +185,7 @@ GType
 e_profile_event_hook_get_type(void)
 {
 	static GType type = 0;
-	
+
 	if (!type) {
 		static const GTypeInfo info = {
 			sizeof(EProfileEventHookClass), NULL, NULL, (GClassInitFunc) emeh_class_init, NULL, NULL,
@@ -195,6 +195,6 @@ e_profile_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(), "EProfileEventHook", &info, 0);
 	}
-	
+
 	return type;
 }
diff --git a/e-util/e-request.c b/e-util/e-request.c
index a0fb9cfac3..beb52686e9 100644
--- a/e-util/e-request.c
+++ b/e-util/e-request.c
@@ -39,9 +39,9 @@
  * @title: the dialog title (in the locale character set)
  * @prompt: the prompt (in the locale character set)
  * @default: default value (in UTF8)
- * 
+ *
  * Request a string from the user.
- * 
+ *
  * Return value: %NULL if the user cancelled the dialog, the inserted
  * string (in UTF8) otherwise. The string must be freed by the caller.
  **/
@@ -56,10 +56,10 @@ e_request_string (GtkWindow *parent,
 	GtkWidget *dialog;
 	GtkWidget *entry;
 	GtkWidget *vbox;
-	
+
 	g_return_val_if_fail (title != NULL, NULL);
 	g_return_val_if_fail (prompt != NULL, NULL);
-	
+
 	dialog = gtk_dialog_new_with_buttons (title, parent,
 					      GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
 					      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -68,13 +68,13 @@ e_request_string (GtkWindow *parent,
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 	gtk_window_set_default_size (GTK_WINDOW (dialog), 275, -1);
-	gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); 
+	gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
 
 	vbox = GTK_DIALOG (dialog)->vbox;
-	
+
 	prompt_label = gtk_label_new (prompt);
 	gtk_box_pack_start (GTK_BOX (vbox), prompt_label, TRUE, TRUE, 6);
-	gtk_box_set_spacing (GTK_BOX (vbox), 6); 
+	gtk_box_set_spacing (GTK_BOX (vbox), 6);
 
 	entry = gtk_entry_new ();
 	gtk_entry_set_text (GTK_ENTRY (entry), default_string);
@@ -82,14 +82,14 @@ e_request_string (GtkWindow *parent,
 	gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
 	gtk_box_pack_start (GTK_BOX (vbox), entry, TRUE, TRUE, 3);
 
-	atk_object_set_description (gtk_widget_get_accessible (entry), prompt);	
+	atk_object_set_description (gtk_widget_get_accessible (entry), prompt);
 
 	gtk_widget_grab_focus (entry);
-	
+
 	gtk_widget_show (prompt_label);
 	gtk_widget_show (entry);
 	gtk_widget_show (dialog);
-	
+
 	switch (gtk_dialog_run (GTK_DIALOG (dialog))) {
 	case GTK_RESPONSE_OK:
 		text = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
@@ -100,6 +100,6 @@ e_request_string (GtkWindow *parent,
 	}
 
 	gtk_widget_destroy (dialog);
-	
+
 	return text;
 }
diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c
index cbdf138a95..8acd9af451 100644
--- a/e-util/e-signature-list.c
+++ b/e-util/e-signature-list.c
@@ -61,7 +61,7 @@ GType
 e_signature_list_get_type (void)
 {
 	static GType type = 0;
-	
+
 	if (!type) {
 		GTypeInfo type_info = {
 			sizeof (ESignatureListClass),
@@ -72,10 +72,10 @@ e_signature_list_get_type (void)
 			0,
 			(GInstanceInitFunc) e_signature_list_init,
 		};
-		
+
 		type = g_type_register_static (E_TYPE_LIST, "ESignatureList", &type_info, 0);
 	}
-	
+
 	return type;
 }
 
@@ -84,13 +84,13 @@ static void
 e_signature_list_class_init (ESignatureListClass *klass)
 {
 	GObjectClass *object_class = (GObjectClass *) klass;
-	
+
 	parent_class = g_type_class_ref (E_TYPE_LIST);
-	
+
 	/* virtual method override */
 	object_class->dispose = e_signature_list_dispose;
 	object_class->finalize = e_signature_list_finalize;
-	
+
 	/* signals */
 	signals[SIGNATURE_ADDED] =
 		g_signal_new ("signature-added",
@@ -131,14 +131,14 @@ static void
 e_signature_list_dispose (GObject *object)
 {
 	ESignatureList *list = (ESignatureList *) object;
-	
+
 	if (list->priv->gconf) {
 		if (list->priv->notify_id != 0)
 			gconf_client_notify_remove (list->priv->gconf, list->priv->notify_id);
 		g_object_unref (list->priv->gconf);
 		list->priv->gconf = NULL;
 	}
-	
+
 	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
@@ -146,9 +146,9 @@ static void
 e_signature_list_finalize (GObject *object)
 {
 	ESignatureList *list = (ESignatureList *) object;
-	
+
 	g_free (list->priv);
-	
+
 	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
@@ -156,13 +156,13 @@ static GSList *
 add_autogen (ESignatureList *list, GSList *new_sigs)
 {
 	ESignature *autogen;
-	
+
 	autogen = e_signature_new ();
 	autogen->name = g_strdup ("Autogenerated");
 	autogen->autogen = TRUE;
-	
+
 	e_list_append (E_LIST (list), autogen);
-	
+
 	return g_slist_prepend (new_sigs, autogen);
 }
 
@@ -178,9 +178,9 @@ gconf_signatures_changed (GConfClient *client, guint cnxn_id, GConfEntry *entry,
 	EIterator *iter;
 	gboolean found;
 	char *uid;
-	
+
 	old_sigs = e_list_duplicate (E_LIST (signature_list));
-	
+
 	list = gconf_client_get_list (client, "/apps/evolution/mail/signatures", GCONF_VALUE_STRING, NULL);
 	for (l = list; l; l = l->next) {
 		found = FALSE;
@@ -196,16 +196,16 @@ gconf_signatures_changed (GConfClient *client, guint cnxn_id, GConfEntry *entry,
 					e_iterator_delete (iter);
 					if (e_signature_set_from_xml (signature, l->data))
 						g_signal_emit (signature_list, signals[SIGNATURE_CHANGED], 0, signature);
-					
+
 					have_autogen |= signature->autogen;
-					
+
 					break;
 				}
 			}
-			
+
 			g_object_unref (iter);
 		}
-		
+
 		if (!found) {
 			/* Must be a new signature */
 			signature = e_signature_new_from_xml (l->data);
@@ -214,20 +214,20 @@ gconf_signatures_changed (GConfClient *client, guint cnxn_id, GConfEntry *entry,
 				signature->uid = e_uid_new ();
 				resave = TRUE;
 			}
-			
+
 			e_list_append (E_LIST (signature_list), signature);
 			new_sigs = g_slist_prepend (new_sigs, signature);
 		}
-		
+
 		g_free (uid);
 	}
-	
+
 	if (!have_autogen) {
 		new_sigs = add_autogen (signature_list, new_sigs);
 		have_autogen = TRUE;
 		resave = TRUE;
 	}
-	
+
 	if (new_sigs != NULL) {
 		/* Now emit signals for each added signature. */
 		l = g_slist_reverse (new_sigs);
@@ -240,17 +240,17 @@ gconf_signatures_changed (GConfClient *client, guint cnxn_id, GConfEntry *entry,
 			l = n;
 		}
 	}
-	
+
 	/* Anything left in old_sigs must have been deleted */
 	for (iter = e_list_get_iterator (old_sigs); e_iterator_is_valid (iter); e_iterator_next (iter)) {
 		signature = (ESignature *) e_iterator_get (iter);
 		e_list_remove (E_LIST (signature_list), signature);
 		g_signal_emit (signature_list, signals[SIGNATURE_REMOVED], 0, signature);
 	}
-	
+
 	g_object_unref (iter);
 	g_object_unref (old_sigs);
-	
+
 	signature_list->priv->resave = resave;
 }
 
@@ -258,9 +258,9 @@ static void *
 copy_func (const void *data, void *closure)
 {
 	GObject *object = (GObject *)data;
-	
+
 	g_object_ref (object);
-	
+
 	return object;
 }
 
@@ -289,12 +289,12 @@ ESignatureList *
 e_signature_list_new (GConfClient *gconf)
 {
 	ESignatureList *signature_list;
-	
+
 	g_return_val_if_fail (GCONF_IS_CLIENT (gconf), NULL);
-	
+
 	signature_list = g_object_new (E_TYPE_SIGNATURE_LIST, NULL);
 	e_signature_list_construct (signature_list, gconf);
-	
+
 	return signature_list;
 }
 
@@ -302,29 +302,29 @@ void
 e_signature_list_construct (ESignatureList *signature_list, GConfClient *gconf)
 {
 	g_return_if_fail (GCONF_IS_CLIENT (gconf));
-	
+
 	e_list_construct (E_LIST (signature_list), copy_func, free_func, NULL);
 	signature_list->priv->gconf = gconf;
 	g_object_ref (gconf);
-	
+
 	gconf_client_add_dir (signature_list->priv->gconf,
 			      "/apps/evolution/mail/signatures",
 			      GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-	
+
 	signature_list->priv->notify_id =
 		gconf_client_notify_add (signature_list->priv->gconf,
 					 "/apps/evolution/mail/signatures",
 					 gconf_signatures_changed, signature_list,
 					 NULL, NULL);
-	
+
 	gconf_signatures_changed (signature_list->priv->gconf,
 				  signature_list->priv->notify_id,
 				  NULL, signature_list);
-	
+
 	if (signature_list->priv->resave) {
 		e_signature_list_save (signature_list);
 		signature_list->priv->resave = FALSE;
-	}		
+	}
 }
 
 
@@ -341,27 +341,27 @@ e_signature_list_save (ESignatureList *signature_list)
 	ESignature *signature;
 	EIterator *iter;
 	char *xmlbuf;
-	
+
 	for (iter = e_list_get_iterator (E_LIST (signature_list));
 	     e_iterator_is_valid (iter);
 	     e_iterator_next (iter)) {
 		signature = (ESignature *) e_iterator_get (iter);
-		
+
 		if ((xmlbuf = e_signature_to_xml (signature)))
 			list = g_slist_append (list, xmlbuf);
 	}
-	
+
 	g_object_unref (iter);
-	
+
 	gconf_client_set_list (signature_list->priv->gconf,
 			       "/apps/evolution/mail/signatures",
 			       GCONF_VALUE_STRING, list, NULL);
-	
+
 	while (list) {
 		g_free (list->data);
 		list = g_slist_remove (list, list->data);
 	}
-	
+
 	gconf_client_suggest_sync (signature_list->priv->gconf, NULL);
 }
 
@@ -370,7 +370,7 @@ e_signature_list_save (ESignatureList *signature_list)
  * e_signature_list_add:
  * @signatures: signature list
  * @signature: signature to add
- * 
+ *
  * Add an signature to the signature list.  Will emit the signature-changed
  * event.
  **/
@@ -386,7 +386,7 @@ e_signature_list_add (ESignatureList *signatures, ESignature *signature)
  * e_signature_list_change:
  * @signatures: signature list
  * @signature: signature to change
- * 
+ *
  * Signal that the details of an signature have changed.
  **/
 void
@@ -401,7 +401,7 @@ e_signature_list_change (ESignatureList *signatures, ESignature *signature)
  * e_signature_list_remove:
  * @signatures: signature list
  * @signature: signature
- * 
+ *
  * Remove an signature from the signature list, and emit the
  * signature-removed signal.  If the signature was the default signature,
  * then reset the default to the first signature.
@@ -422,13 +422,13 @@ e_signature_list_remove (ESignatureList *signatures, ESignature *signature)
  * @signatures: signature list
  * @type: Type of search.
  * @key: Search key.
- * 
+ *
  * Perform a search of the signature list on a single key.
  *
  * @type must be set from one of the following search types:
  * E_SIGNATURE_FIND_NAME - Find a signature by signature name.
  * E_SIGNATURE_FIND_UID - Find a signature based on UID
- * 
+ *
  * Return value: The signature or NULL if it doesn't exist.
  **/
 const ESignature *
@@ -436,20 +436,20 @@ e_signature_list_find (ESignatureList *signatures, e_signature_find_t type, cons
 {
 	const ESignature *signature = NULL;
 	EIterator *it;
-	
+
 	/* this could use a callback for more flexibility ...
 	   ... but this makes the common cases easier */
-	
+
 	if (!key)
 		return NULL;
-	
+
 	for (it = e_list_get_iterator ((EList *) signatures);
 	     e_iterator_is_valid (it);
 	     e_iterator_next (it)) {
 		int found = 0;
-		
+
 		signature = (const ESignature *) e_iterator_get (it);
-		
+
 		switch (type) {
 		case E_SIGNATURE_FIND_NAME:
 			found = strcmp (signature->name, key) == 0;
@@ -458,14 +458,14 @@ e_signature_list_find (ESignatureList *signatures, e_signature_find_t type, cons
 			found = strcmp (signature->uid, key) == 0;
 			break;
 		}
-		
+
 		if (found)
 			break;
-		
+
 		signature = NULL;
 	}
-	
+
 	g_object_unref (it);
-	
+
 	return signature;
 }
diff --git a/e-util/e-signature-list.h b/e-util/e-signature-list.h
index 6dae824616..d79963672a 100644
--- a/e-util/e-signature-list.h
+++ b/e-util/e-signature-list.h
@@ -46,13 +46,13 @@ typedef enum {
 
 struct _ESignatureList {
 	EList parent_object;
-	
+
 	struct _ESignatureListPrivate *priv;
 };
 
 struct _ESignatureListClass {
 	EListClass parent_class;
-	
+
 	/* signals */
 	void (* signature_added)   (ESignatureList *, ESignature *);
 	void (* signature_changed) (ESignatureList *, ESignature *);
diff --git a/e-util/e-signature.c b/e-util/e-signature.c
index 9803ba7389..c062468174 100644
--- a/e-util/e-signature.c
+++ b/e-util/e-signature.c
@@ -50,7 +50,7 @@ GType
 e_signature_get_type (void)
 {
 	static GType type = 0;
-	
+
 	if (!type) {
 		GTypeInfo type_info = {
 			sizeof (ESignatureClass),
@@ -61,10 +61,10 @@ e_signature_get_type (void)
 			0,
 			(GInstanceInitFunc) e_signature_init,
 		};
-		
+
 		type = g_type_register_static (G_TYPE_OBJECT, "ESignature", &type_info, 0);
 	}
-	
+
 	return type;
 }
 
@@ -72,9 +72,9 @@ static void
 e_signature_class_init (ESignatureClass *klass)
 {
 	GObjectClass *object_class = (GObjectClass *) klass;
-	
+
 	parent_class = g_type_class_ref (G_TYPE_OBJECT);
-	
+
 	/* virtual method override */
 	object_class->finalize = e_signature_finalize;
 }
@@ -89,11 +89,11 @@ static void
 e_signature_finalize (GObject *object)
 {
 	ESignature *sig = (ESignature *) object;
-	
+
 	g_free (sig->uid);
 	g_free (sig->name);
 	g_free (sig->filename);
-	
+
 	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
@@ -108,10 +108,10 @@ ESignature *
 e_signature_new (void)
 {
 	ESignature *signature;
-	
+
 	signature = g_object_new (E_TYPE_SIGNATURE, NULL);
 	signature->uid = e_uid_new ();
-	
+
 	return signature;
 }
 
@@ -127,13 +127,13 @@ ESignature *
 e_signature_new_from_xml (const char *xml)
 {
 	ESignature *signature;
-	
+
 	signature = g_object_new (E_TYPE_SIGNATURE, NULL);
 	if (!e_signature_set_from_xml (signature, xml)) {
 		g_object_unref (signature);
 		return NULL;
 	}
-	
+
 	return signature;
 }
 
@@ -143,17 +143,17 @@ xml_set_bool (xmlNodePtr node, const char *name, gboolean *val)
 {
 	gboolean bool;
 	char *buf;
-	
+
 	if ((buf = (char *)xmlGetProp (node, (const unsigned char *)name))) {
 		bool = (!strcmp (buf, "true") || !strcmp (buf, "yes"));
 		xmlFree (buf);
-		
+
 		if (bool != *val) {
 			*val = bool;
 			return TRUE;
 		}
 	}
-	
+
 	return FALSE;
 }
 
@@ -161,11 +161,11 @@ static gboolean
 xml_set_prop (xmlNodePtr node, const char *name, char **val)
 {
 	char *buf, *new_val;
-	
+
 	buf = (char *)xmlGetProp (node, (const unsigned char *)name);
 	new_val = g_strdup (buf);
 	xmlFree (buf);
-	
+
 	/* We can use strcmp here whether the value is UTF8 or
 	 * not, since we only care if the bytes changed.
 	 */
@@ -183,11 +183,11 @@ static gboolean
 xml_set_content (xmlNodePtr node, char **val)
 {
 	char *buf, *new_val;
-	
+
 	buf = (char *)xmlNodeGetContent (node);
         new_val = g_strdup (buf);
 	xmlFree (buf);
-	
+
 	/* We can use strcmp here whether the value is UTF8 or
 	 * not, since we only care if the bytes changed.
 	 */
@@ -216,19 +216,19 @@ e_signature_uid_from_xml (const char *xml)
 	xmlNodePtr node;
 	xmlDocPtr doc;
 	char *uid = NULL;
-	
+
 	if (!(doc = xmlParseDoc ((unsigned char *) xml)))
 		return NULL;
-	
+
 	node = doc->children;
 	if (strcmp ((char *)node->name, "signature") != 0) {
 		xmlFreeDoc (doc);
 		return NULL;
 	}
-	
+
 	xml_set_prop (node, "uid", &uid);
 	xmlFreeDoc (doc);
-	
+
 	return uid;
 }
 
@@ -250,22 +250,22 @@ e_signature_set_from_xml (ESignature *signature, const char *xml)
 	xmlDocPtr doc;
 	gboolean bool;
 	char *buf;
-	
+
 	if (!(doc = xmlParseDoc ((unsigned char *) xml)))
 		return FALSE;
-	
+
 	node = doc->children;
 	if (strcmp ((char *)node->name, "signature") != 0) {
 		xmlFreeDoc (doc);
 		return FALSE;
 	}
-	
+
 	if (!signature->uid)
 		xml_set_prop (node, "uid", &signature->uid);
-	
+
 	changed |= xml_set_prop (node, "name", &signature->name);
 	changed |= xml_set_bool (node, "auto", &signature->autogen);
-	
+
 	if (signature->autogen) {
 		/* we're done */
 		g_free (signature->filename);
@@ -273,10 +273,10 @@ e_signature_set_from_xml (ESignature *signature, const char *xml)
 		signature->script = FALSE;
 		signature->html = FALSE;
 		xmlFreeDoc (doc);
-		
+
 		return changed;
 	}
-	
+
 	buf = NULL;
 	xml_set_prop (node, "format", &buf);
 	if (buf && !strcmp (buf, "text/html"))
@@ -284,12 +284,12 @@ e_signature_set_from_xml (ESignature *signature, const char *xml)
 	else
 		bool = FALSE;
 	g_free (buf);
-	
+
 	if (signature->html != bool) {
 		signature->html = bool;
 		changed = TRUE;
 	}
-	
+
 	cur = node->children;
 	while (cur) {
 		if (!strcmp ((char *)cur->name, "filename")) {
@@ -305,12 +305,12 @@ e_signature_set_from_xml (ESignature *signature, const char *xml)
 			}
 			break;
 		}
-		
+
 		cur = cur->next;
 	}
-	
+
 	xmlFreeDoc (doc);
-	
+
 	return changed;
 }
 
@@ -330,19 +330,19 @@ e_signature_to_xml (ESignature *signature)
 	xmlNodePtr root, node;
 	xmlDocPtr doc;
 	int n;
-	
+
 	doc = xmlNewDoc ((const unsigned char *)"1.0");
-	
+
 	root = xmlNewDocNode (doc, NULL, (const unsigned char *)"signature", NULL);
 	xmlDocSetRootElement (doc, root);
-	
+
 	xmlSetProp (root, (const unsigned char *)"name", (unsigned char *)signature->name);
 	xmlSetProp (root, (const unsigned char *)"uid", (unsigned char *)signature->uid);
 	xmlSetProp (root, (const unsigned char *)"auto", (const unsigned char *)(signature->autogen ? "true" : "false"));
-	
+
 	if (!signature->autogen) {
 		xmlSetProp (root, (const unsigned char *)"format", (const unsigned char *)(signature->html ? "text/html" : "text/plain"));
-		
+
 		if (signature->filename) {
 			node = xmlNewTextChild (root, NULL, (const unsigned char *)"filename", (unsigned char *)signature->filename);
 			if (signature->script)
@@ -352,16 +352,16 @@ e_signature_to_xml (ESignature *signature)
 		/* this is to make Evolution-1.4 and older 1.5 versions happy */
 		xmlSetProp (root, (const unsigned char *)"format", (const unsigned char *)"text/html");
 	}
-	
+
 	xmlDocDumpMemory (doc, &xmlbuf, &n);
 	xmlFreeDoc (doc);
-	
+
 	/* remap to glib memory */
 	tmp = g_malloc (n + 1);
 	memcpy (tmp, xmlbuf, n);
 	tmp[n] = '\0';
 	xmlFree (xmlbuf);
-	
+
 	return tmp;
 }
 
diff --git a/e-util/e-signature.h b/e-util/e-signature.h
index a7e1d9d207..5de0d64a66 100644
--- a/e-util/e-signature.h
+++ b/e-util/e-signature.h
@@ -42,11 +42,11 @@ typedef struct _ESignatureClass ESignatureClass;
 
 struct _ESignature {
 	GObject parent_object;
-	
+
 	gboolean autogen;
 	gboolean script;
 	gboolean html;
-	
+
 	char *filename;
 	char *name;
 	char *uid;
@@ -54,7 +54,7 @@ struct _ESignature {
 
 struct _ESignatureClass {
 	GObjectClass parent_class;
-	
+
 };
 
 
diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c
index 6098efef03..3a2eaffe3c 100644
--- a/e-util/e-sorter-array.c
+++ b/e-util/e-sorter-array.c
@@ -242,7 +242,7 @@ e_sorter_array_class_init (ESorterArrayClass *klass)
 	sorter_class->model_to_sorted           = esa_model_to_sorted           ;
 	sorter_class->sorted_to_model           = esa_sorted_to_model           ;
 	sorter_class->get_model_to_sorted_array = esa_get_model_to_sorted_array ;
-	sorter_class->get_sorted_to_model_array = esa_get_sorted_to_model_array ;		
+	sorter_class->get_sorted_to_model_array = esa_get_sorted_to_model_array ;
 	sorter_class->needs_sorting             = esa_needs_sorting             ;
 }
 
diff --git a/e-util/e-sorter-array.h b/e-util/e-sorter-array.h
index 9d5f7fad1b..a695b0d394 100644
--- a/e-util/e-sorter-array.h
+++ b/e-util/e-sorter-array.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
+/*
  * e-sorter-array.h
  * Copyright 2000, 2001, Ximian, Inc.
  *
diff --git a/e-util/e-sorter.c b/e-util/e-sorter.c
index 992afe68f4..89e9eca459 100644
--- a/e-util/e-sorter.c
+++ b/e-util/e-sorter.c
@@ -60,7 +60,7 @@ ESorter *
 e_sorter_new (void)
 {
 	ESorter *es = g_object_new (E_SORTER_TYPE, NULL);
-	
+
 	return es;
 }
 
diff --git a/e-util/e-sorter.h b/e-util/e-sorter.h
index 732061dc1a..c43a93ff5c 100644
--- a/e-util/e-sorter.h
+++ b/e-util/e-sorter.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
+/*
  * e-sorter.h
  * Copyright 2000, 2001, Ximian, Inc.
  *
@@ -47,14 +47,14 @@ typedef struct {
 						 int         row);
 	gint      (*sorted_to_model)            (ESorter    *sorter,
 						 int         row);
-	  
+
 	void      (*get_model_to_sorted_array)  (ESorter    *sorter,
 						 int       **array,
 						 int        *count);
 	void      (*get_sorted_to_model_array)  (ESorter    *sorter,
 						 int       **array,
 						 int        *count);
-	  
+
 	gboolean  (*needs_sorting)              (ESorter    *sorter);
 } ESorterClass;
 
diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c
index b39b56df16..dfde0cf446 100644
--- a/e-util/e-text-event-processor-emacs-like.c
+++ b/e-util/e-text-event-processor-emacs-like.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
+/*
  * e-text-event-processor-emacs-like.c
  * Copyright 2000, 2001, Ximian, Inc.
  *
@@ -185,7 +185,7 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro
 			command.value = event->motion.position;
 		}
 		break;
-	case GDK_KEY_PRESS: 
+	case GDK_KEY_PRESS:
 		{
 			ETextEventProcessorEventKey key = event->key;
 			command.time = event->key.time;
@@ -236,7 +236,7 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro
 				else
 					command.position = E_TEP_FORWARD_CHARACTER;
 				break;
-	  
+
 			case GDK_BackSpace:
 				command.action = E_TEP_DELETE;
 				if (key.state & GDK_CONTROL_MASK)
@@ -272,7 +272,7 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro
 				command.action = E_TEP_COPY;
 				command.position = E_TEP_SELECTION;
 				g_signal_emit_by_name (tep, "command", &command);
-				
+
 				command.action = E_TEP_DELETE;
 				command.position = E_TEP_SELECTION;
 				break;
@@ -285,7 +285,7 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro
 					command.action = E_TEP_COPY;
 					command.position = E_TEP_SELECTION;
 					g_signal_emit_by_name (tep, "command", &command);
-				
+
 					command.action = E_TEP_DELETE;
 					command.position = E_TEP_SELECTION;
 				} else {
@@ -436,7 +436,7 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro
 				if ((key.state & GDK_CONTROL_MASK) && !(key.state & GDK_MOD1_MASK)) {
 					if ((key.keyval >= 'A') && (key.keyval <= 'Z'))
 						key.keyval -= 'A' - 'a';
-					
+
 					if ((key.keyval >= 'a') && (key.keyval <= 'z')) {
 						command.position = control_keys[(int) (key.keyval - 'a')].position;
 						if (control_keys[(int) (key.keyval - 'a')].action != E_TEP_MOVE)
@@ -453,16 +453,16 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro
 						command.action = E_TEP_COPY;
 						command.position = E_TEP_SELECTION;
 						g_signal_emit_by_name (tep, "command", &command);
-						
+
 						command.action = E_TEP_DELETE;
 						command.position = E_TEP_SELECTION;
 					}
-					
+
 					break;
 				} else if ((key.state & GDK_MOD1_MASK) && !(key.state & GDK_CONTROL_MASK)) {
 					if ((key.keyval >= 'A') && (key.keyval <= 'Z'))
 						key.keyval -= 'A' - 'a';
-					
+
 					if ((key.keyval >= 'a') && (key.keyval <= 'z')) {
 						command.position = alt_keys[(int) (key.keyval - 'a')].position;
 						if (alt_keys[(int) (key.keyval - 'a')].action != E_TEP_MOVE)
@@ -479,7 +479,7 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro
 					command.position = E_TEP_SELECTION;
 					command.value = strlen(key.string);
 					command.string = key.string;
-					
+
 				} else {
 					command.action = E_TEP_NOP;
 				}
diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h
index c6020cb993..9726ab3a06 100644
--- a/e-util/e-text-event-processor-emacs-like.h
+++ b/e-util/e-text-event-processor-emacs-like.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
+/*
  * e-text-event-processor-emacs-like.h
  * Copyright 2000, 2001, Ximian, Inc.
  *
@@ -48,7 +48,7 @@ typedef struct _ETextEventProcessorEmacsLikeClass  ETextEventProcessorEmacsLikeC
 struct _ETextEventProcessorEmacsLike
 {
 	ETextEventProcessor parent;
-	
+
 	/* object specific fields */
 	guint mouse_down : 1;
 };
diff --git a/e-util/e-text-event-processor-types.h b/e-util/e-text-event-processor-types.h
index 0966044806..ba68cae113 100644
--- a/e-util/e-text-event-processor-types.h
+++ b/e-util/e-text-event-processor-types.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
+/*
  * e-text-event-processor-types.h
  * Copyright 2000, 2001, Ximian, Inc.
  *
@@ -69,7 +69,7 @@ typedef enum {
 	E_TEP_INSERT,
 
 	E_TEP_CAPS,
-	
+
 	E_TEP_COPY,
 	E_TEP_PASTE,
 	E_TEP_GET_SELECTION,
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
index a46301db73..a1121adbad 100644
--- a/e-util/e-text-event-processor.c
+++ b/e-util/e-text-event-processor.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
+/*
  * e-text-event-processor.c
  * Copyright 2000, 2001, Ximian, Inc.
  *
diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h
index b2219923f7..f3b408fb3d 100644
--- a/e-util/e-text-event-processor.h
+++ b/e-util/e-text-event-processor.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
+/*
  * e-text-event-processor.h
  * Copyright 2000, 2001, Ximian, Inc.
  *
diff --git a/e-util/e-util-private.h b/e-util/e-util-private.h
index dfb8965cd1..69128c67b5 100644
--- a/e-util/e-util-private.h
+++ b/e-util/e-util-private.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
+/*
  * e-util-private.h: Private functions for Evolution (not just for libeutil)
  * Copyright 2005, Novell, Inc.
  *
diff --git a/e-util/e-util.c b/e-util/e-util.c
index c27e2a60d8..2515e78eb2 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
+/*
  * e-util.c
  * Copyright 2000, 2001, Ximian, Inc.
  *
@@ -62,9 +62,9 @@ e_str_without_underscores (const char *s)
 	char *new_string;
 	const char *sp;
 	char *dp;
-	
+
 	new_string = g_malloc (strlen (s) + 1);
-	
+
 	dp = new_string;
 	for (sp = s; *sp != '\0'; sp ++) {
 		if (*sp != '_') {
@@ -78,7 +78,7 @@ e_str_without_underscores (const char *s)
 		}
 	}
 	*dp = 0;
-	
+
 	return new_string;
 }
 
@@ -91,7 +91,7 @@ e_str_compare (gconstpointer x, gconstpointer y)
 		else
 			return x ? -1 : 1;
 	}
-	
+
 	return strcmp (x, y);
 }
 
@@ -128,7 +128,7 @@ e_collate_compare (gconstpointer x, gconstpointer y)
 		else
 			return x ? -1 : 1;
 	}
-	
+
 	return g_utf8_collate (x, y);
 }
 
@@ -154,7 +154,7 @@ e_write_file_uri (const gchar *filename, const gchar *data)
 		g_warning ("Couldn't save item");
 		return 1;
 	}
-	
+
 	while (length > 0) {
 		gnome_vfs_write(handle, data, length, &bytes);
 		if (bytes > 0) {
@@ -348,7 +348,7 @@ e_format_number_float (gfloat number)
 	gchar          *value;
 
 	locality = localeconv();
-	
+
 	int_part = floor (number);
 	str_intpart = do_format_number_as_float ((gdouble) int_part);
 
@@ -418,7 +418,7 @@ e_bsearch (gconstpointer key,
 						l = idx + 1;
 				}
 				*start = l;
-				
+
 				l = lsave;
 				u = usave;
 			}
@@ -508,7 +508,7 @@ e_strftime_fix_am_pm (gchar *str, gsize max, const gchar *fmt,
 	return(ret);
 }
 
-gsize 
+gsize
 e_utf8_strftime_fix_am_pm (gchar *str, gsize max, const gchar *fmt,
                            const struct tm *tm)
 {
@@ -551,7 +551,7 @@ e_utf8_strftime_fix_am_pm (gchar *str, gsize max, const gchar *fmt,
  * @nptr:    the string to convert to a numeric value.
  * @endptr:  if non-NULL, it returns the character after
  *           the last character used in the conversion.
- * 
+ *
  * Converts a string to a gdouble value.  This function detects
  * strings either in the standard C locale or in the current locale.
  *
@@ -562,7 +562,7 @@ e_utf8_strftime_fix_am_pm (gchar *str, gsize max, const gchar *fmt,
  *
  * To convert from a double to a string in a locale-insensitive way, use
  * @g_ascii_dtostr.
- * 
+ *
  * Return value: the gdouble value.
  **/
 gdouble
@@ -611,10 +611,10 @@ e_flexible_strtod (const gchar *nptr, gchar **endptr)
 
 		if (*p == '.') {
 			decimal_point_pos = p++;
-             
+
 			while (isxdigit ((guchar)*p))
 				p++;
-             
+
 			if (*p == 'p' || *p == 'P')
 				p++;
 			if (*p == '+' || *p == '-')
@@ -647,7 +647,7 @@ e_flexible_strtod (const gchar *nptr, gchar **endptr)
 		}
 	}
 	/* For the other cases, we need not convert the decimal point */
-  
+
 	if (!decimal_point_pos)
 		return strtod (nptr, endptr);
 
@@ -685,14 +685,14 @@ e_flexible_strtod (const gchar *nptr, gchar **endptr)
  * @buffer: A buffer to place the resulting string in
  * @buf_len: The length of the buffer.
  * @format: The printf-style format to use for the
- *          code to use for converting. 
+ *          code to use for converting.
  * @d: The double to convert
  *
  * Converts a double to a string, using the '.' as
  * decimal_point. To format the number you pass in
  * a printf-style formating string. Allowed conversion
- * specifiers are eEfFgG. 
- * 
+ * specifiers are eEfFgG.
+ *
  * If you want to generates enough precision that converting
  * the string back using @g_strtod gives the same machine-number
  * (on machines with IEEE compatible 64bit doubles) use the format
@@ -715,9 +715,9 @@ e_ascii_dtostr (gchar *buffer, gint buf_len, const gchar *format, gdouble d)
 	g_return_val_if_fail (buffer != NULL, NULL);
 	g_return_val_if_fail (format[0] == '%', NULL);
 	g_return_val_if_fail (strpbrk (format + 1, "'l%") == NULL, NULL);
- 
+
 	format_char = format[strlen (format) - 1];
-  
+
 	g_return_val_if_fail (format_char == 'e' || format_char == 'E' ||
 			      format_char == 'f' || format_char == 'F' ||
 			      format_char == 'g' || format_char == 'G',
@@ -830,7 +830,7 @@ get_font_options (void)
 	/* Antialiasing */
 	antialiasing = gconf_client_get_string (gconf,
 			"/desktop/gnome/font_rendering/antialiasing", NULL);
-	if (antialiasing == NULL) 
+	if (antialiasing == NULL)
 		cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_DEFAULT);
 	else {
 		if (strcmp (antialiasing, "grayscale") == 0)
diff --git a/e-util/e-util.h b/e-util/e-util.h
index bd23e2bb8a..c2983f454f 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
+/*
  * e-util.h
  * Copyright 2000, 2001, Ximian, Inc.
  *
diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c
index b9066c8edc..67a41abe43 100644
--- a/e-util/e-win32-reloc.c
+++ b/e-util/e-win32-reloc.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
+/*
  * e-win32-reloc.c: Support relocatable installation on Win32
  * Copyright 2005, Novell, Inc.
  *
@@ -94,8 +94,8 @@ replace_prefix (const char *runtime_prefix,
 static void
 setup (void)
 {
-	char *full_prefix;  
-	char *cp_prefix; 
+	char *full_prefix;
+	char *cp_prefix;
 
         G_LOCK (mutex);
         if (localedir != NULL) {
diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c
index 1a737626a8..1bd5a530d0 100644
--- a/e-util/e-xml-utils.c
+++ b/e-util/e-xml-utils.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
+/*
  * e-xml-utils.c
  * Copyright 2000, 2001, Ximian, Inc.
  *
@@ -128,7 +128,7 @@ e_xml_get_child_by_name_by_lang_list_with_score (const xmlNode *parent,
 		xmlFree (lang);
 		if (*best_lang_score == 0) {
 			return best_node;
-		} 
+		}
 	}
 
 	return best_node;
diff --git a/e-util/e-xml-utils.h b/e-util/e-xml-utils.h
index ee87d84cd9..b5bce7540a 100644
--- a/e-util/e-xml-utils.h
+++ b/e-util/e-xml-utils.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
+/*
  * e-xml-utils.h
  * Copyright 2000, 2001, Ximian, Inc.
  *