From 981f6cb4c15b7c1c4163bed64940c5d5b053d67d Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@novell.com>
Date: Fri, 22 May 2009 16:33:49 +0530
Subject: Fix EConfig bugs for Anjal's account setup.

---
 e-util/e-config.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'e-util')

diff --git a/e-util/e-config.c b/e-util/e-config.c
index 1da54b5436..a2d68e1740 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -532,11 +532,13 @@ ec_rebuild(EConfig *emp)
 					gnome_druid_page_edge_set_title((GnomeDruidPageEdge *)page, translated_label);
 					gnome_druid_insert_page((GnomeDruid *)druid, pagenode?(GnomeDruidPage *)pagenode->frame:NULL, (GnomeDruidPage *)page);
 				}
-				if (item->type == E_CONFIG_PAGE_FINISH) {
-					g_signal_connect(page, "back", G_CALLBACK(ec_druid_prev), wn);
-					g_signal_connect(page, "finish", G_CALLBACK(ec_druid_finish), wn);
-				} else
-					g_signal_connect(page, "next", G_CALLBACK(ec_druid_next), wn);
+				if (page) {
+					if (item->type == E_CONFIG_PAGE_FINISH) {
+						g_signal_connect(page, "back", G_CALLBACK(ec_druid_prev), wn);
+						g_signal_connect(page, "finish", G_CALLBACK(ec_druid_finish), wn);
+					} else
+						g_signal_connect(page, "next", G_CALLBACK(ec_druid_next), wn);
+				}
 				wn->frame = page;
 				wn->widget = page;
 			}
@@ -567,10 +569,11 @@ ec_rebuild(EConfig *emp)
 				page = item->factory(emp, item, root, wn->frame, wn->context->data);
 				if (emp->type == E_CONFIG_DRUID) {
 					if (page) {
-						g_return_if_fail (GNOME_IS_DRUID_PAGE_STANDARD(page));
-						connect = wn->frame != page;
-						wn->frame = page;
-						page = ((GnomeDruidPageStandard *)page)->vbox;
+						if (GNOME_IS_DRUID_PAGE_STANDARD(page)) {
+							connect = wn->frame != page;
+							wn->frame = page;
+							page = ((GnomeDruidPageStandard *)page)->vbox;
+						}
 					} else
 						wn->frame = page;
 				} else {
-- 
cgit v1.2.3


From f575a7626a769b0a99e080944749958d644d4aef Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 24 May 2009 11:54:43 -0400
Subject: Eliminate redundant E_ICON_SIZE_* enumeration.

---
 e-util/e-icon-factory.c | 81 +++++++++----------------------------------------
 e-util/e-icon-factory.h | 35 ++++++---------------
 2 files changed, 24 insertions(+), 92 deletions(-)

(limited to 'e-util')

diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c
index 7e9cf4cad7..299dfff6f5 100644
--- a/e-util/e-icon-factory.c
+++ b/e-util/e-icon-factory.c
@@ -166,27 +166,6 @@ load_icon (const char *icon_key, const char *icon_name, int size, int scale)
 	return icon_new (icon_key, pixbuf);
 }
 
-static GtkIconSize
-e_icon_size_to_gtk_icon_size (guint size)
-{
-	switch (size) {
-	case E_ICON_SIZE_MENU:
-		return GTK_ICON_SIZE_MENU;
-	case E_ICON_SIZE_BUTTON:
-		return GTK_ICON_SIZE_BUTTON;
-	case E_ICON_SIZE_SMALL_TOOLBAR:
-		return GTK_ICON_SIZE_SMALL_TOOLBAR;
-	case E_ICON_SIZE_LARGE_TOOLBAR:
-		return GTK_ICON_SIZE_LARGE_TOOLBAR;
-	case E_ICON_SIZE_DND:
-		return GTK_ICON_SIZE_DND;
-	case E_ICON_SIZE_DIALOG:
-		return GTK_ICON_SIZE_DIALOG;
-	default:
-		g_assert_not_reached ();
-	}
-}
-
 static void
 icon_theme_changed_cb (GtkIconTheme *icon_theme, gpointer user_data)
 {
@@ -250,48 +229,35 @@ e_icon_factory_shutdown (void)
 /**
  * e_icon_factory_get_icon_filename:
  * @icon_name: name of the icon
- * @size: MENU/SMALL_TOOLBAR/etc
+ * @size: size of the icon
  *
  * Looks up the icon to use based on name and size.
  *
  * Returns the requested icon pixbuf.
  **/
-char *
-e_icon_factory_get_icon_filename (const char *icon_name, int icon_size)
+gchar *
+e_icon_factory_get_icon_filename (const gchar *icon_name,
+                                  GtkIconSize icon_size)
 {
+	GtkIconTheme *icon_theme;
 	GtkIconInfo *icon_info;
-	char *filename;
+	gchar *filename = NULL;
 	gint width, height;
 
 	g_return_val_if_fail (icon_name != NULL, NULL);
-	g_return_val_if_fail (strcmp (icon_name, ""), NULL);
-
-	if (icon_size >= E_ICON_NUM_SIZES) {
-		g_critical (
-			"calling %s with unknown icon_size value (%d)",
-			G_STRFUNC, icon_size);
-		/* if ((icon_size = pixel_size_to_icon_size (icon_size)) == -1)*/
-			return NULL;
-	}
 
-	if (! gtk_icon_size_lookup_for_settings (gtk_settings_get_default (),
-	    	e_icon_size_to_gtk_icon_size (icon_size),
-		&width, &height))
-		return NULL;
+	icon_theme = gtk_icon_theme_get_default ();
 
-	d(g_message ("Size is %d", icon_size));
-	d(g_message ("looking up %s at %dx%d", icon_name, width, height));
+	if (!gtk_icon_size_lookup (icon_size, &width, &height))
+		return NULL;
 
-	g_static_mutex_lock (&mutex);
 	icon_info = gtk_icon_theme_lookup_icon (
 		icon_theme, icon_name, height, 0);
 	if (icon_info != NULL) {
 		filename = g_strdup (
 			gtk_icon_info_get_filename (icon_info));
 		gtk_icon_info_free (icon_info);
-	} else
-		filename = NULL;
-	g_static_mutex_unlock (&mutex);
+	}
 
 	return filename;
 }
@@ -300,7 +266,7 @@ e_icon_factory_get_icon_filename (const char *icon_name, int icon_size)
 /**
  * e_icon_factory_get_icon:
  * @icon_name: name of the icon
- * @icon_size: size of the icon (one of the E_ICON_SIZE_* enum values)
+ * @icon_size: size of the icon
  *
  * Returns the specified icon of the requested size (may perform
  * scaling to achieve this). If @icon_name is a full path, that file
@@ -311,38 +277,21 @@ e_icon_factory_get_icon_filename (const char *icon_name, int icon_size)
  * requested icon, then a "broken-image" icon is returned.
  **/
 GdkPixbuf *
-e_icon_factory_get_icon (const char *icon_name, int icon_size)
+e_icon_factory_get_icon (const gchar *icon_name,
+                         GtkIconSize icon_size)
 {
 	GdkPixbuf *pixbuf;
 	char *icon_key;
 	Icon *icon;
 	int size, width, height;
 
-	if (icon_size >= E_ICON_NUM_SIZES) {
-		g_critical (
-			"calling %s with unknown icon_size value (%d)",
-			G_STRFUNC, icon_size);
-		/*if ((icon_size = pixel_size_to_icon_size (icon_size)) == -1) */
-			return NULL;
-	}
+	g_return_val_if_fail (icon_name != NULL, NULL);
 
-	if (! gtk_icon_size_lookup_for_settings (gtk_settings_get_default (),
-	    	e_icon_size_to_gtk_icon_size (icon_size),
-		&width, &height))
+	if (!gtk_icon_size_lookup (icon_size, &width, &height))
 		return NULL;
 
-	d(g_message ("Size is %d", icon_size));
-	d(g_message ("looking up %s at %dx%d", icon_name, width, height));
-
 	size = height;
 
-	if (icon_name == NULL || !strcmp (icon_name, "")) {
-		if (size >= 24)
-			return gdk_pixbuf_scale_simple (broken24_pixbuf, size, size, GDK_INTERP_NEAREST);
-		else
-			return gdk_pixbuf_scale_simple (broken16_pixbuf, size, size, GDK_INTERP_NEAREST);
-	}
-
 	icon_key = g_alloca (strlen (icon_name) + 7);
 	sprintf (icon_key, "%dx%d/%s", size, size, icon_name);
 
diff --git a/e-util/e-icon-factory.h b/e-util/e-icon-factory.h
index f8d1fc2fc7..c864b1be8e 100644
--- a/e-util/e-icon-factory.h
+++ b/e-util/e-icon-factory.h
@@ -26,31 +26,14 @@
 
 #include <gtk/gtk.h>
 
-enum {
-	E_ICON_SIZE_MENU,
-	E_ICON_SIZE_BUTTON,
-	E_ICON_SIZE_SMALL_TOOLBAR,
-	E_ICON_SIZE_LARGE_TOOLBAR,
-	E_ICON_SIZE_DND,
-	E_ICON_SIZE_DIALOG,
-	E_ICON_NUM_SIZES
-};
-
-/* standard size for list/tree widgets (16x16) */
-#define E_ICON_SIZE_LIST E_ICON_SIZE_MENU
-
-/* standard size for status bar icons (16x16) */
-#define E_ICON_SIZE_STATUS E_ICON_SIZE_MENU
-
-
-
-void       e_icon_factory_init              (void);
-void       e_icon_factory_shutdown          (void);
-
-char      *e_icon_factory_get_icon_filename (const char *icon_name, int icon_size);
-
-GdkPixbuf *e_icon_factory_get_icon          (const char *icon_name, int icon_size);
-
-GdkPixbuf *e_icon_factory_pixbuf_scale      (GdkPixbuf *pixbuf, int width, int height);
+void		e_icon_factory_init		(void);
+void		e_icon_factory_shutdown		(void);
+gchar *		e_icon_factory_get_icon_filename(const gchar *icon_name,
+						 GtkIconSize icon_size);
+GdkPixbuf *	e_icon_factory_get_icon		(const gchar *icon_name,
+						 GtkIconSize icon_size);
+GdkPixbuf *	e_icon_factory_pixbuf_scale	(GdkPixbuf *pixbuf,
+						 gint width,
+						 gint height);
 
 #endif /* _E_ICON_FACTORY_H_ */
-- 
cgit v1.2.3


From a6c9a55391c484038a98f0326798949c52621c50 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Mon, 25 May 2009 13:42:03 -0400
Subject: Fix compiler warnings in e-util.

---
 e-util/e-bit-array.h                       |  3 +-
 e-util/e-error.c                           | 56 ++++++++++++++++--------------
 e-util/e-html-utils.c                      |  2 +-
 e-util/e-non-intrusive-error-dialog.h      |  8 ++---
 e-util/e-text-event-processor-emacs-like.c |  2 --
 e-util/e-text-event-processor-types.h      |  6 ++--
 e-util/e-text-event-processor.c            |  3 --
 e-util/e-util-labels.c                     | 18 ++++++----
 e-util/e-util-labels.h                     |  9 ++---
 e-util/gconf-bridge.c                      |  5 ---
 10 files changed, 54 insertions(+), 58 deletions(-)

(limited to 'e-util')

diff --git a/e-util/e-bit-array.h b/e-util/e-bit-array.h
index ea8ed89797..4504f5afc6 100644
--- a/e-util/e-bit-array.h
+++ b/e-util/e-bit-array.h
@@ -66,7 +66,7 @@ void       e_bit_array_clear               (EBitArray    *selection);
 gint       e_bit_array_selected_count      (EBitArray    *selection);
 void       e_bit_array_select_all          (EBitArray    *selection);
 void       e_bit_array_invert_selection    (EBitArray    *selection);
-int        e_bit_array_bit_count           (EBitArray    *selection);
+gint       e_bit_array_bit_count           (EBitArray    *selection);
 void       e_bit_array_change_one_row      (EBitArray    *selection,
 					    int           row,
 					    gboolean      grow);
@@ -91,7 +91,6 @@ void       e_bit_array_delete_single_mode  (EBitArray    *esm,
 void       e_bit_array_move_row            (EBitArray    *esm,
 					    int           old_row,
 					    int           new_row);
-gint       e_bit_array_bit_count           (EBitArray    *esm);
 
 gboolean   e_bit_array_cross_and           (EBitArray    *esm);
 gboolean   e_bit_array_cross_or            (EBitArray    *esm);
diff --git a/e-util/e-error.c b/e-util/e-error.c
index 7c1248bb7b..23e52bca8e 100644
--- a/e-util/e-error.c
+++ b/e-util/e-error.c
@@ -41,27 +41,27 @@
 
 struct _e_error_button {
 	struct _e_error_button *next;
-	char *stock;
-	char *label;
-	int response;
+	const gchar *stock;
+	const gchar *label;
+	gint response;
 };
 
 struct _e_error {
 	guint32 flags;
-	char *id;
-	int type;
-	int default_response;
-	char *title;
-	char *primary;
-	char *secondary;
-	char *help_uri;
+	const gchar *id;
+	gint type;
+	gint default_response;
+	const gchar *title;
+	const gchar *primary;
+	const gchar *secondary;
+	const gchar *help_uri;
 	gboolean scroll;
 	struct _e_error_button *buttons;
 };
 
 struct _e_error_table {
-	char *domain;
-	char *translation_domain;
+	const gchar *domain;
+	const gchar *translation_domain;
 	GHashTable *errors;
 };
 
@@ -84,8 +84,8 @@ static struct _e_error default_errors[] = {
 /* ********************************************************************** */
 
 static struct {
-	char *name;
-	int id;
+	const gchar *name;
+	gint id;
 } response_map[] = {
 	{ "GTK_RESPONSE_REJECT", GTK_RESPONSE_REJECT },
 	{ "GTK_RESPONSE_ACCEPT", GTK_RESPONSE_ACCEPT },
@@ -111,9 +111,9 @@ map_response(const char *name)
 }
 
 static struct {
-	const char *name;
-	const char *icon;
-	const char *title;
+	const gchar *name;
+	const gchar *icon;
+	const gchar *title;
 } type_map[] = {
 	{ "info", GTK_STOCK_DIALOG_INFO, N_("Evolution Information") },
 	{ "warning", GTK_STOCK_DIALOG_WARNING, N_("Evolution Warning") },
@@ -184,7 +184,7 @@ ee_load(const char *path)
 		table = g_malloc0(sizeof(*table));
 		table->domain = g_strdup(tmp);
 		table->errors = g_hash_table_new(g_str_hash, g_str_equal);
-		g_hash_table_insert(error_table, table->domain, table);
+		g_hash_table_insert(error_table, (gpointer) table->domain, table);
 
 		tmp2 = (char *)xmlGetProp(root, (const unsigned char *)"translation-domain");
 		if (tmp2) {
@@ -263,16 +263,20 @@ ee_load(const char *path)
 					}
 				} else if (!strcmp((char *)scan->name, "button")) {
 					struct _e_error_button *b;
+					gchar *label = NULL;
+					gchar *stock = NULL;
 
 					b = g_malloc0(sizeof(*b));
 					tmp = (char *)xmlGetProp(scan, (const unsigned char *)"stock");
 					if (tmp) {
-						b->stock = g_strdup(tmp);
+						stock = g_strdup(tmp);
+						b->stock = stock;
 						xmlFree(tmp);
 					}
 					tmp = (char *)xmlGetProp(scan, (const unsigned char *)"label");
 					if (tmp) {
-						b->label = g_strdup(dgettext(table->translation_domain, tmp));
+						label = g_strdup(dgettext(table->translation_domain, tmp));
+						b->label = label;
 						xmlFree(tmp);
 					}
 					tmp = (char *)xmlGetProp(scan, (const unsigned char *)"response");
@@ -281,10 +285,10 @@ ee_load(const char *path)
 						xmlFree(tmp);
 					}
 
-					if (b->stock == NULL && b->label == NULL) {
+					if (stock == NULL && label == NULL) {
 						g_warning("Error file '%s': missing button details in error '%s'", path, e->id);
-						g_free(b->stock);
-						g_free(b->label);
+						g_free(stock);
+						g_free(label);
 						g_free(b);
 					} else {
 						lastbutton->next = b;
@@ -293,7 +297,7 @@ ee_load(const char *path)
 				}
 			}
 
-			g_hash_table_insert(table->errors, e->id, e);
+			g_hash_table_insert(table->errors, (gpointer) e->id, e);
 		}
 	}
 
@@ -319,8 +323,8 @@ ee_load_tables(void)
 	table->domain = "builtin";
 	table->errors = g_hash_table_new(g_str_hash, g_str_equal);
 	for (i=0;i<sizeof(default_errors)/sizeof(default_errors[0]);i++)
-		g_hash_table_insert(table->errors, default_errors[i].id, &default_errors[i]);
-	g_hash_table_insert(error_table, table->domain, table);
+		g_hash_table_insert(table->errors, (gpointer) default_errors[i].id, &default_errors[i]);
+	g_hash_table_insert(error_table, (gpointer) table->domain, table);
 
 	/* look for installed error tables */
 	base = g_build_filename (EVOLUTION_PRIVDATADIR, "errors", NULL);
diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c
index d634f5f6b0..4cdb0eefa3 100644
--- a/e-util/e-html-utils.c
+++ b/e-util/e-html-utils.c
@@ -246,7 +246,7 @@ e_text_to_html_full (const char *input, unsigned int flags, guint32 color)
 					colored = TRUE;
 				}
 			} else if (colored) {
-				gchar *no_font = "</FONT>";
+				const gchar *no_font = "</FONT>";
 
 				out = check_size (&buffer, &buffer_size, out, 9);
 				out += sprintf (out, "%s", no_font);
diff --git a/e-util/e-non-intrusive-error-dialog.h b/e-util/e-non-intrusive-error-dialog.h
index e801d47a52..827e17f868 100644
--- a/e-util/e-non-intrusive-error-dialog.h
+++ b/e-util/e-non-intrusive-error-dialog.h
@@ -31,10 +31,10 @@
 G_BEGIN_DECLS
 
 struct _log_data {
-        int level;
-        char *key;
-        char *text;
-        char *stock_id;
+        gint level;
+        const gchar *key;
+        const gchar *text;
+        const gchar *stock_id;
         GdkPixbuf *pbuf;
 } ldata [] = {
         { E_LOG_ERROR, N_("Error"), N_("Errors"), GTK_STOCK_DIALOG_ERROR },
diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c
index 60da48d375..4b99d897db 100644
--- a/e-util/e-text-event-processor-emacs-like.c
+++ b/e-util/e-text-event-processor-emacs-like.c
@@ -29,8 +29,6 @@
 #include "e-text-event-processor-emacs-like.h"
 #include "e-util.h"
 
-static void e_text_event_processor_emacs_like_init		(ETextEventProcessorEmacsLike		 *card);
-static void e_text_event_processor_emacs_like_class_init	(ETextEventProcessorEmacsLikeClass	 *klass);
 static gint e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event);
 
 G_DEFINE_TYPE (ETextEventProcessorEmacsLike, e_text_event_processor_emacs_like, E_TEXT_EVENT_PROCESSOR_TYPE)
diff --git a/e-util/e-text-event-processor-types.h b/e-util/e-text-event-processor-types.h
index 9caf2abe6d..c4c0efa424 100644
--- a/e-util/e-text-event-processor-types.h
+++ b/e-util/e-text-event-processor-types.h
@@ -83,8 +83,8 @@ typedef enum {
 typedef struct {
 	ETextEventProcessorCommandPosition position;
 	ETextEventProcessorCommandAction action;
-	int value;
-	char *string;
+	gint value;
+	const gchar *string;
 	guint32 time;
 } ETextEventProcessorCommand;
 
@@ -102,7 +102,7 @@ typedef struct {
 	guint state;
 	guint keyval;
 	gint length;
-	gchar *string;
+	const gchar *string;
 } ETextEventProcessorEventKey;
 
 typedef struct {
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
index b515f33f57..48100de64a 100644
--- a/e-util/e-text-event-processor.c
+++ b/e-util/e-text-event-processor.c
@@ -27,9 +27,6 @@
 #include "e-text-event-processor.h"
 #include "e-util.h"
 
-static void e_text_event_processor_init		(ETextEventProcessor		 *card);
-static void e_text_event_processor_class_init	(ETextEventProcessorClass	 *klass);
-
 static void e_text_event_processor_set_property (GObject *object,
 						 guint prop_id,
 						 const GValue *value,
diff --git a/e-util/e-util-labels.c b/e-util/e-util-labels.c
index 85984da59c..a7d5913bbd 100644
--- a/e-util/e-util-labels.c
+++ b/e-util/e-util-labels.c
@@ -34,8 +34,14 @@
 #include "e-dialog-utils.h"
 #include "filter/filter-option.h"
 
-/* Note, the first element of each EUtilLabel must NOT be translated */
-EUtilLabel label_defaults[LABEL_DEFAULTS_NUM] = {
+typedef struct {
+	const gchar *tag;
+	const gchar *name;
+	const gchar *colour;
+} DefaultLabel;
+
+/* Note, the first element of each DefaultLabel must NOT be translated */
+DefaultLabel label_defaults[] = {
 	{ "$Labelimportant", N_("I_mportant"), "#EF2929" },  /* red */
 	{ "$Labelwork",      N_("_Work"),      "#F57900" },  /* orange */
 	{ "$Labelpersonal",  N_("_Personal"),  "#4E9A06" },  /* green */
@@ -84,7 +90,7 @@ e_util_labels_parse (GConfClient *client)
 		label = g_new (EUtilLabel, 1);
 
 		/* Needed for Backward Compatibility */
-		if (num < LABEL_DEFAULTS_NUM) {
+		if (num < G_N_ELEMENTS (label_defaults)) {
 			label->name = g_strdup ((buf && *buf) ? buf : _(label_defaults[num].name));
 			label->tag = g_strdup (label_defaults[num].tag);
 			num++;
@@ -106,7 +112,7 @@ e_util_labels_parse (GConfClient *client)
 	if (head)
 		g_slist_free (head);
 
-	while (num < LABEL_DEFAULTS_NUM) {
+	while (num < G_N_ELEMENTS (label_defaults)) {
 		/* complete the list with defaults */
 		label = g_new (EUtilLabel, 1);
 		label->tag = g_strdup (label_defaults[num].tag);
@@ -452,7 +458,7 @@ e_util_labels_is_system (const char *tag)
 	if (!tag)
 		return FALSE;
 
-	for (i = 0; i < LABEL_DEFAULTS_NUM; i++) {
+	for (i = 0; i < G_N_ELEMENTS (label_defaults); i++) {
 		if (strcmp (tag, label_defaults[i].tag) == 0)
 			return TRUE;
 	}
@@ -474,7 +480,7 @@ e_util_labels_get_new_tag (const char *old_tag)
 	if (!old_tag)
 		return NULL;
 
-	for (i = 0; i < LABEL_DEFAULTS_NUM; i++) {
+	for (i = 0; i < G_N_ELEMENTS (label_defaults); i++) {
 		/* default labels have same name as those old, only with prefix "$Label" */
 		if (!strcmp (old_tag, label_defaults[i].tag + 6))
 			return label_defaults[i].tag;
diff --git a/e-util/e-util-labels.h b/e-util/e-util-labels.h
index 26520ff226..ee06cccc99 100644
--- a/e-util/e-util-labels.h
+++ b/e-util/e-util-labels.h
@@ -27,16 +27,13 @@ struct _GtkWindow;
 struct _GConfClient;
 
 typedef struct {
-	char *tag;
-	char *name;
-	char *colour;
+	gchar *tag;
+	gchar *name;
+	gchar *colour;
 } EUtilLabel;
 
 #define E_UTIL_LABELS_GCONF_KEY "/apps/evolution/mail/labels"
 
-#define LABEL_DEFAULTS_NUM 5
-extern EUtilLabel label_defaults[LABEL_DEFAULTS_NUM];
-
 GSList *    e_util_labels_parse         (struct _GConfClient *client);
 void        e_util_labels_free          (GSList *labels);
 
diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c
index 81fe08ef14..ff880a12bd 100644
--- a/e-util/gconf-bridge.c
+++ b/e-util/gconf-bridge.c
@@ -107,11 +107,6 @@ typedef union {
 static void
 unbind (Binding *binding);
 
-#if !HAVE_DECL_GCONF_VALUE_COMPARE /* Not in headers in GConf < 2.13 */
-int gconf_value_compare (const GConfValue *value_a,
-                         const GConfValue *value_b);
-#endif
-
 static GConfBridge *bridge = NULL; /* Global GConfBridge object */
 
 /* Free up all resources allocated by the GConfBridge. Called on exit. */
-- 
cgit v1.2.3


From a361cff4042770c35b2ae9f5dcfb6153711d2c41 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Mon, 25 May 2009 23:17:51 -0400
Subject: Fix compiler warnings in shell.

---
 e-util/e-bconf-map.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'e-util')

diff --git a/e-util/e-bconf-map.h b/e-util/e-bconf-map.h
index 1d72119c8c..e6e16de6d4 100644
--- a/e-util/e-bconf-map.h
+++ b/e-util/e-bconf-map.h
@@ -83,13 +83,13 @@ enum {
 };
 
 typedef struct {
-	char *from;
-	char *to;
-	int type;
+	const gchar *from;
+	const gchar *to;
+	gint type;
 } e_gconf_map_t;
 
 typedef struct {
-	char *root;
+	const gchar *root;
 	e_gconf_map_t *map;
 } e_gconf_map_list_t;
 
-- 
cgit v1.2.3


From 16c8fefe966367fa5d9747d35895f8aa6e080657 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Mon, 25 May 2009 23:21:22 -0400
Subject: Fix compiler warnings in filter.

---
 e-util/e-xml-utils.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'e-util')

diff --git a/e-util/e-xml-utils.h b/e-util/e-xml-utils.h
index 59d11c63fe..ef8ae8ac8a 100644
--- a/e-util/e-xml-utils.h
+++ b/e-util/e-xml-utils.h
@@ -92,8 +92,6 @@ void      e_xml_set_string_prop_by_name              (xmlNode       *parent,
 gchar    *e_xml_get_translated_string_prop_by_name   (const xmlNode *parent,
                                                       const xmlChar *prop_name);
 
-int e_xml_save_file (const char *filename, xmlDocPtr doc);
-
 G_END_DECLS
 
 #endif /* __E_XML_UTILS__ */
-- 
cgit v1.2.3


From e4c6ad873bd50f7ad99fb8e9bbf5dd6c78ac76ed Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 26 May 2009 08:24:35 -0400
Subject: Fix compiler warnings in calendar.

---
 e-util/e-folder-map.c | 2 +-
 e-util/e-folder-map.h | 3 ++-
 e-util/e-logger.c     | 2 +-
 e-util/e-logger.h     | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'e-util')

diff --git a/e-util/e-folder-map.c b/e-util/e-folder-map.c
index 3475d61a70..157c4ca353 100644
--- a/e-util/e-folder-map.c
+++ b/e-util/e-folder-map.c
@@ -150,7 +150,7 @@ e_folder_map_dir (const char *dirname, const char *type, GSList **dir_list)
 }
 
 GSList *
-e_folder_map_local_folders (char *local_dir, char *type)
+e_folder_map_local_folders (const gchar *local_dir, const gchar *type)
 {
 	const char *name;
 	GDir *dir;
diff --git a/e-util/e-folder-map.h b/e-util/e-folder-map.h
index e61dc140ff..a939ea777f 100644
--- a/e-util/e-folder-map.h
+++ b/e-util/e-folder-map.h
@@ -28,7 +28,8 @@
 
 G_BEGIN_DECLS
 
-GSList *e_folder_map_local_folders (char *local_dir, char *type);
+GSList *	e_folder_map_local_folders	(const gchar *local_dir,
+						 const gchar *type);
 
 G_END_DECLS
 
diff --git a/e-util/e-logger.c b/e-util/e-logger.c
index 0a458b7444..3d3c88c384 100644
--- a/e-util/e-logger.c
+++ b/e-util/e-logger.c
@@ -198,7 +198,7 @@ e_logger_get_type (void)
 }
 
 ELogger *
-e_logger_create (gchar *component)
+e_logger_create (const gchar *component)
 {
 	g_return_val_if_fail (component != NULL, NULL);
 
diff --git a/e-util/e-logger.h b/e-util/e-logger.h
index f7dfd8017e..186d918f12 100644
--- a/e-util/e-logger.h
+++ b/e-util/e-logger.h
@@ -70,7 +70,7 @@ struct _ELoggerClass {
 };
 
 GType		e_logger_get_type		(void);
-ELogger *	e_logger_create			(gchar *component);
+ELogger *	e_logger_create			(const gchar *component);
 const gchar *	e_logger_get_component		(ELogger *logger);
 void		e_logger_log			(ELogger *logger,
 						 gint level,
-- 
cgit v1.2.3


From 0cf607076dfc2c481ca1164a04cecdb0661e6bd0 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 26 May 2009 10:58:25 -0400
Subject: Fix compiler warnings in mail.

---
 e-util/e-bconf-map.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'e-util')

diff --git a/e-util/e-bconf-map.h b/e-util/e-bconf-map.h
index e6e16de6d4..dfd015ec65 100644
--- a/e-util/e-bconf-map.h
+++ b/e-util/e-bconf-map.h
@@ -45,9 +45,9 @@ enum {
 };
 
 typedef struct _e_bconf_map {
-	char *from;
-	char *to;
-	int type;
+	const gchar *from;
+	const gchar *to;
+	gint type;
 	struct _e_bconf_map *child;
 } e_bconf_map_t;
 
-- 
cgit v1.2.3


From e4afd3f9fb962ea1295a0657ec9f83a427829171 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 26 May 2009 23:21:02 -0400
Subject: Remove trailing whitespace, again.

---
 e-util/e-bconf-map.c                       |  2 +-
 e-util/e-bconf-map.h                       |  2 +-
 e-util/e-binding.c                         |  2 +-
 e-util/e-binding.h                         |  2 +-
 e-util/e-bit-array.c                       |  2 +-
 e-util/e-bit-array.h                       |  2 +-
 e-util/e-categories-config.c               |  2 +-
 e-util/e-categories-config.h               |  2 +-
 e-util/e-config-listener.c                 |  2 +-
 e-util/e-config-listener.h                 |  2 +-
 e-util/e-config.c                          |  2 +-
 e-util/e-config.h                          |  2 +-
 e-util/e-corba-utils.c                     |  2 +-
 e-util/e-corba-utils.h                     |  2 +-
 e-util/e-cursor.c                          |  2 +-
 e-util/e-cursor.h                          |  2 +-
 e-util/e-dialog-utils.c                    |  2 +-
 e-util/e-dialog-utils.h                    |  2 +-
 e-util/e-dialog-widgets.c                  |  2 +-
 e-util/e-dialog-widgets.h                  |  2 +-
 e-util/e-error.c                           |  6 ++---
 e-util/e-error.h                           |  2 +-
 e-util/e-event.c                           |  2 +-
 e-util/e-event.h                           |  2 +-
 e-util/e-folder-map.c                      |  2 +-
 e-util/e-folder-map.h                      |  2 +-
 e-util/e-fsutils.c                         |  2 +-
 e-util/e-fsutils.h                         |  2 +-
 e-util/e-html-utils.c                      |  2 +-
 e-util/e-html-utils.h                      |  2 +-
 e-util/e-icon-factory.c                    |  2 +-
 e-util/e-icon-factory.h                    |  2 +-
 e-util/e-import.c                          |  2 +-
 e-util/e-import.h                          |  2 +-
 e-util/e-logger.c                          |  6 ++---
 e-util/e-logger.h                          |  2 +-
 e-util/e-menu.c                            |  2 +-
 e-util/e-menu.h                            |  2 +-
 e-util/e-mktemp.c                          |  2 +-
 e-util/e-mktemp.h                          |  2 +-
 e-util/e-non-intrusive-error-dialog.c      |  2 +-
 e-util/e-pilot-map.c                       |  2 +-
 e-util/e-pilot-map.h                       |  2 +-
 e-util/e-pilot-util.c                      |  2 +-
 e-util/e-pilot-util.h                      |  2 +-
 e-util/e-plugin-ui.c                       |  4 ++--
 e-util/e-plugin-ui.h                       |  2 +-
 e-util/e-plugin.c                          |  4 ++--
 e-util/e-plugin.h                          |  6 ++---
 e-util/e-popup.c                           |  2 +-
 e-util/e-popup.h                           |  2 +-
 e-util/e-print.c                           |  2 +-
 e-util/e-print.h                           |  2 +-
 e-util/e-profile-event.c                   |  2 +-
 e-util/e-profile-event.h                   |  2 +-
 e-util/e-request.c                         |  2 +-
 e-util/e-request.h                         |  2 +-
 e-util/e-signature-list.c                  |  2 +-
 e-util/e-signature-list.h                  |  2 +-
 e-util/e-signature.c                       |  2 +-
 e-util/e-signature.h                       |  2 +-
 e-util/e-sorter-array.c                    |  2 +-
 e-util/e-sorter-array.h                    |  2 +-
 e-util/e-sorter.c                          |  2 +-
 e-util/e-sorter.h                          |  2 +-
 e-util/e-text-event-processor-emacs-like.c |  2 +-
 e-util/e-text-event-processor-emacs-like.h |  2 +-
 e-util/e-text-event-processor-types.h      |  2 +-
 e-util/e-text-event-processor.c            |  2 +-
 e-util/e-text-event-processor.h            |  2 +-
 e-util/e-util-labels.c                     |  4 ++--
 e-util/e-util-labels.h                     |  2 +-
 e-util/e-util-private.h                    |  2 +-
 e-util/e-util.c                            |  8 +++----
 e-util/e-util.h                            |  2 +-
 e-util/e-win32-reloc.c                     |  2 +-
 e-util/e-xml-utils.c                       |  2 +-
 e-util/e-xml-utils.h                       |  2 +-
 e-util/gconf-bridge.c                      | 38 +++++++++++++++---------------
 e-util/gconf-bridge.h                      |  6 ++---
 80 files changed, 112 insertions(+), 112 deletions(-)

(limited to 'e-util')

diff --git a/e-util/e-bconf-map.c b/e-util/e-bconf-map.c
index 7d874b896b..9f97a441db 100644
--- a/e-util/e-bconf-map.c
+++ b/e-util/e-bconf-map.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-bconf-map.h b/e-util/e-bconf-map.h
index dfd015ec65..8c6ea6deec 100644
--- a/e-util/e-bconf-map.h
+++ b/e-util/e-bconf-map.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-binding.c b/e-util/e-binding.c
index 6a29166cc1..9d4e83fc3f 100644
--- a/e-util/e-binding.c
+++ b/e-util/e-binding.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/e-util/e-binding.h b/e-util/e-binding.h
index 676093bfad..12f4db8505 100644
--- a/e-util/e-binding.h
+++ b/e-util/e-binding.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c
index fdd3d3fe01..e2cf15af43 100644
--- a/e-util/e-bit-array.c
+++ b/e-util/e-bit-array.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-bit-array.h b/e-util/e-bit-array.h
index 4504f5afc6..34c8016094 100644
--- a/e-util/e-bit-array.h
+++ b/e-util/e-bit-array.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c
index 875b67974f..c01b98cde4 100644
--- a/e-util/e-categories-config.c
+++ b/e-util/e-categories-config.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-categories-config.h b/e-util/e-categories-config.h
index 9eff161375..bbd76f2a02 100644
--- a/e-util/e-categories-config.h
+++ b/e-util/e-categories-config.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-config-listener.c b/e-util/e-config-listener.c
index 83fb305347..7c1c6eb091 100644
--- a/e-util/e-config-listener.c
+++ b/e-util/e-config-listener.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-config-listener.h b/e-util/e-config-listener.h
index 655bc3c1ec..4449d8f22c 100644
--- a/e-util/e-config-listener.h
+++ b/e-util/e-config-listener.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-config.c b/e-util/e-config.c
index a2d68e1740..5d0a7090f7 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-config.h b/e-util/e-config.h
index 1ee7e29b58..b128005c64 100644
--- a/e-util/e-config.h
+++ b/e-util/e-config.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-corba-utils.c b/e-util/e-corba-utils.c
index 0288602a7e..f673370bfc 100644
--- a/e-util/e-corba-utils.c
+++ b/e-util/e-corba-utils.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-corba-utils.h b/e-util/e-corba-utils.h
index 979237929d..b6da7240e7 100644
--- a/e-util/e-corba-utils.h
+++ b/e-util/e-corba-utils.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-cursor.c b/e-util/e-cursor.c
index 7d547e38ac..c5f77c7d62 100644
--- a/e-util/e-cursor.c
+++ b/e-util/e-cursor.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-cursor.h b/e-util/e-cursor.h
index f0b78b3126..30ad722bbc 100644
--- a/e-util/e-cursor.h
+++ b/e-util/e-cursor.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c
index 0546430512..978033541a 100644
--- a/e-util/e-dialog-utils.c
+++ b/e-util/e-dialog-utils.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-dialog-utils.h b/e-util/e-dialog-utils.h
index 9d594122e2..6b9956ddf9 100644
--- a/e-util/e-dialog-utils.h
+++ b/e-util/e-dialog-utils.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c
index f1777ca55d..98e1be7a74 100644
--- a/e-util/e-dialog-widgets.c
+++ b/e-util/e-dialog-widgets.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-dialog-widgets.h b/e-util/e-dialog-widgets.h
index f5ff123a4f..b7f838539d 100644
--- a/e-util/e-dialog-widgets.h
+++ b/e-util/e-dialog-widgets.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-error.c b/e-util/e-error.c
index 23e52bca8e..f2067950bc 100644
--- a/e-util/e-error.c
+++ b/e-util/e-error.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -529,7 +529,7 @@ e_error_newv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap)
 		g_string_free (oerr, TRUE);
 	} else
 		perr = g_strdup (gtk_window_get_title (GTK_WINDOW (dialog)));
-	
+
 	if (e->secondary) {
 		ee_build_label(out, e->secondary, args, TRUE);
 		oerr = g_string_new("");
@@ -561,7 +561,7 @@ e_error_newv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap)
 	gtk_box_pack_start((GtkBox *)dialog->vbox, hbox, TRUE, TRUE, 0);
 	g_object_set_data_full ((GObject *) dialog, "primary", perr, g_free);
 	g_object_set_data_full ((GObject *) dialog, "secondary", serr, g_free);
-	
+
 	return (GtkWidget *)dialog;
 }
 
diff --git a/e-util/e-error.h b/e-util/e-error.h
index 321957839f..014f74ee88 100644
--- a/e-util/e-error.h
+++ b/e-util/e-error.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-event.c b/e-util/e-event.c
index 73111229f9..ab96701abc 100644
--- a/e-util/e-event.c
+++ b/e-util/e-event.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-event.h b/e-util/e-event.h
index c97f1b30bc..5b4e3f44ab 100644
--- a/e-util/e-event.h
+++ b/e-util/e-event.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-folder-map.c b/e-util/e-folder-map.c
index 157c4ca353..d74817ecfe 100644
--- a/e-util/e-folder-map.c
+++ b/e-util/e-folder-map.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-folder-map.h b/e-util/e-folder-map.h
index a939ea777f..3f41838882 100644
--- a/e-util/e-folder-map.h
+++ b/e-util/e-folder-map.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-fsutils.c b/e-util/e-fsutils.c
index 28b434f291..27480959c4 100644
--- a/e-util/e-fsutils.c
+++ b/e-util/e-fsutils.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-fsutils.h b/e-util/e-fsutils.h
index 91ad9b9c4a..76a03f5441 100644
--- a/e-util/e-fsutils.h
+++ b/e-util/e-fsutils.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c
index 4cdb0eefa3..4958f0806e 100644
--- a/e-util/e-html-utils.c
+++ b/e-util/e-html-utils.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-html-utils.h b/e-util/e-html-utils.h
index fa70e55f7f..55e67ba915 100644
--- a/e-util/e-html-utils.h
+++ b/e-util/e-html-utils.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c
index 299dfff6f5..5b1cd2f9bd 100644
--- a/e-util/e-icon-factory.c
+++ b/e-util/e-icon-factory.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-icon-factory.h b/e-util/e-icon-factory.h
index c864b1be8e..b8a4df972f 100644
--- a/e-util/e-icon-factory.h
+++ b/e-util/e-icon-factory.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-import.c b/e-util/e-import.c
index 9e8c8a3fa7..ccc44d7daa 100644
--- a/e-util/e-import.c
+++ b/e-util/e-import.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-import.h b/e-util/e-import.h
index 9a9994150b..4ca1ef1829 100644
--- a/e-util/e-import.h
+++ b/e-util/e-import.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-logger.c b/e-util/e-logger.c
index 3d3c88c384..19326d2d67 100644
--- a/e-util/e-logger.c
+++ b/e-util/e-logger.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -243,7 +243,7 @@ e_logger_log (ELogger *logger,
 	set_dirty (logger);
 }
 
-void 
+void
 e_logger_get_logs (ELogger *logger,
                    ELogFunction func,
                    gpointer data)
@@ -256,7 +256,7 @@ e_logger_get_logs (ELogger *logger,
 
 	/* Flush everything before we get the logs */
 	if (logger->priv->fp)
-		fflush (logger->priv->fp);	
+		fflush (logger->priv->fp);
 	fp = g_fopen (logger->priv->logfile, "r");
 
 	if (!fp) {
diff --git a/e-util/e-logger.h b/e-util/e-logger.h
index 186d918f12..b3bd4f8919 100644
--- a/e-util/e-logger.h
+++ b/e-util/e-logger.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-menu.c b/e-util/e-menu.c
index cfbb215712..e5472d6bbc 100644
--- a/e-util/e-menu.c
+++ b/e-util/e-menu.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-menu.h b/e-util/e-menu.h
index f844f80400..5df8f11b28 100644
--- a/e-util/e-menu.h
+++ b/e-util/e-menu.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c
index ade1abc0b4..682563907c 100644
--- a/e-util/e-mktemp.c
+++ b/e-util/e-mktemp.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-mktemp.h b/e-util/e-mktemp.h
index 48e72235ee..01dbd18119 100644
--- a/e-util/e-mktemp.h
+++ b/e-util/e-mktemp.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-non-intrusive-error-dialog.c b/e-util/e-non-intrusive-error-dialog.c
index 070c1e9bef..bb24a2360e 100644
--- a/e-util/e-non-intrusive-error-dialog.c
+++ b/e-util/e-non-intrusive-error-dialog.c
@@ -169,7 +169,7 @@ eni_error_level_value_changed (GtkComboBox *w, gpointer *data)
         g_object_unref (gconf_client);
 }
 
-void 
+void
 eni_show_logger(ELogger *logger, GtkWidget *top,const char *error_timeout_path, const char *error_level_path)
 {
 	GtkWidget *container;
diff --git a/e-util/e-pilot-map.c b/e-util/e-pilot-map.c
index 877d60ac41..b2338ccead 100644
--- a/e-util/e-pilot-map.c
+++ b/e-util/e-pilot-map.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-pilot-map.h b/e-util/e-pilot-map.h
index d49d62cbb2..46eaf54199 100644
--- a/e-util/e-pilot-map.h
+++ b/e-util/e-pilot-map.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-pilot-util.c b/e-util/e-pilot-util.c
index 2273064ac3..582c9458e1 100644
--- a/e-util/e-pilot-util.c
+++ b/e-util/e-pilot-util.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-pilot-util.h b/e-util/e-pilot-util.h
index 8559918eb3..0d7aebbd87 100644
--- a/e-util/e-pilot-util.h
+++ b/e-util/e-pilot-util.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-plugin-ui.c b/e-util/e-plugin-ui.c
index c3ee13fe60..840dd67a0e 100644
--- a/e-util/e-plugin-ui.c
+++ b/e-util/e-plugin-ui.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
@@ -29,7 +29,7 @@
 
 struct _EPluginUIHookPrivate {
 
-	/* Table of GtkUIManager ID's to UI definitions. 
+	/* Table of GtkUIManager ID's to UI definitions.
 	 *
 	 * For example:
 	 *
diff --git a/e-util/e-plugin-ui.h b/e-util/e-plugin-ui.h
index b8e795c4c4..cdefda5617 100644
--- a/e-util/e-plugin-ui.h
+++ b/e-util/e-plugin-ui.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index d43238be0a..7516fb3f09 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -459,7 +459,7 @@ ep_load(const char *filename, int load_level)
 						if (load_level == 1)
 							e_plugin_invoke (ep, "load_plugin_type_register_function", NULL);
 					}
-				} 
+				}
 			} else if (load_level == 2) {
 				ep = ep_load_plugin(root, pdoc);
 			}
diff --git a/e-util/e-plugin.h b/e-util/e-plugin.h
index 0b31409c96..54855d0b95 100644
--- a/e-util/e-plugin.h
+++ b/e-util/e-plugin.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -376,8 +376,8 @@ struct _EPluginTypeHookClass {
 GType e_plugin_type_hook_get_type(void);
 
 
-/* README: Currently there is only one flag. 
-   But we may need more in the future and hence makes 
+/* README: Currently there is only one flag.
+   But we may need more in the future and hence makes
    sense to keep as an enum */
 
 typedef enum _EPluginFlags {
diff --git a/e-util/e-popup.c b/e-util/e-popup.c
index 41428c3c5a..bcd152713c 100644
--- a/e-util/e-popup.c
+++ b/e-util/e-popup.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-popup.h b/e-util/e-popup.h
index 877f5dfce4..65c51ce65f 100644
--- a/e-util/e-popup.h
+++ b/e-util/e-popup.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-print.c b/e-util/e-print.c
index 4cc3b8155e..8faeafc0f5 100644
--- a/e-util/e-print.c
+++ b/e-util/e-print.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-print.h b/e-util/e-print.h
index 93cbe2d10d..9469b63636 100644
--- a/e-util/e-print.h
+++ b/e-util/e-print.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-profile-event.c b/e-util/e-profile-event.c
index 4fdd5d958a..ee98ad8b75 100644
--- a/e-util/e-profile-event.c
+++ b/e-util/e-profile-event.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-profile-event.h b/e-util/e-profile-event.h
index dd84671902..c20a5f1044 100644
--- a/e-util/e-profile-event.h
+++ b/e-util/e-profile-event.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-request.c b/e-util/e-request.c
index 1977b9b0fe..2175c75b2a 100644
--- a/e-util/e-request.c
+++ b/e-util/e-request.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-request.h b/e-util/e-request.h
index a84da2941a..ae822db83e 100644
--- a/e-util/e-request.h
+++ b/e-util/e-request.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c
index d2b575c15a..eaedddaf50 100644
--- a/e-util/e-signature-list.c
+++ b/e-util/e-signature-list.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-signature-list.h b/e-util/e-signature-list.h
index cfaa64c28a..8d8caed0a8 100644
--- a/e-util/e-signature-list.h
+++ b/e-util/e-signature-list.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-signature.c b/e-util/e-signature.c
index 2d0df59579..1cbed6b66b 100644
--- a/e-util/e-signature.c
+++ b/e-util/e-signature.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-signature.h b/e-util/e-signature.h
index cc5309c7c1..cc8591b421 100644
--- a/e-util/e-signature.h
+++ b/e-util/e-signature.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c
index 582ed959ad..060c3f441a 100644
--- a/e-util/e-sorter-array.c
+++ b/e-util/e-sorter-array.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-sorter-array.h b/e-util/e-sorter-array.h
index f31d9b06cc..a02f5d9635 100644
--- a/e-util/e-sorter-array.h
+++ b/e-util/e-sorter-array.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-sorter.c b/e-util/e-sorter.c
index 6176b58715..f63e5e1172 100644
--- a/e-util/e-sorter.c
+++ b/e-util/e-sorter.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-sorter.h b/e-util/e-sorter.h
index 365d66a461..d64851bc70 100644
--- a/e-util/e-sorter.h
+++ b/e-util/e-sorter.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c
index 4b99d897db..f44019165d 100644
--- a/e-util/e-text-event-processor-emacs-like.c
+++ b/e-util/e-text-event-processor-emacs-like.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h
index 87e3fa797d..99635e2341 100644
--- a/e-util/e-text-event-processor-emacs-like.h
+++ b/e-util/e-text-event-processor-emacs-like.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-text-event-processor-types.h b/e-util/e-text-event-processor-types.h
index c4c0efa424..6e9d155f8c 100644
--- a/e-util/e-text-event-processor-types.h
+++ b/e-util/e-text-event-processor-types.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
index 48100de64a..6496a63294 100644
--- a/e-util/e-text-event-processor.c
+++ b/e-util/e-text-event-processor.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h
index 1f88407823..a9d329c140 100644
--- a/e-util/e-text-event-processor.h
+++ b/e-util/e-text-event-processor.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-util-labels.c b/e-util/e-util-labels.c
index a7d5913bbd..ba1d0113a0 100644
--- a/e-util/e-util-labels.c
+++ b/e-util/e-util-labels.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -218,7 +218,7 @@ find_label (GSList *labels, const char *tag)
 
 	for (l = labels; l; l = l->next) {
 		EUtilLabel *label = l->data;
-	
+
 		if (label && label->tag && !strcmp (tag, label->tag))
 			return label;
 	}
diff --git a/e-util/e-util-labels.h b/e-util/e-util-labels.h
index ee06cccc99..725f740d89 100644
--- a/e-util/e-util-labels.h
+++ b/e-util/e-util-labels.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/e-util/e-util-private.h b/e-util/e-util-private.h
index cca11e2477..f7d84dea37 100644
--- a/e-util/e-util-private.h
+++ b/e-util/e-util-private.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-util.c b/e-util/e-util.c
index fc4f71f187..533dc2d740 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -1297,7 +1297,7 @@ e_file_lock_destroy ()
 	}
 }
 
-gboolean 
+gboolean
 e_file_lock_exists ()
 {
 	const char *fname = get_lock_filename ();
@@ -1334,7 +1334,7 @@ e_util_guess_mime_type (const char *filename, gboolean localfile)
 			fi = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, NULL);
 			if (fi) {
 				mime_type = g_content_type_get_mime_type (g_file_info_get_content_type (fi));
-	
+
 				g_object_unref (fi);
 			}
 
@@ -1460,7 +1460,7 @@ e_util_read_file (const char *filename, gboolean filename_is_uri, char **buffer,
 
 				if (err)
 					res = FALSE;
-				
+
 				if (res)
 					*buffer = buff;
 				else
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 480da24eac..e5126213f3 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c
index 1c8c5d3f18..04c70afd75 100644
--- a/e-util/e-win32-reloc.c
+++ b/e-util/e-win32-reloc.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c
index 653669b381..73dd415a6d 100644
--- a/e-util/e-xml-utils.c
+++ b/e-util/e-xml-utils.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-xml-utils.h b/e-util/e-xml-utils.h
index ef8ae8ac8a..c327d61e17 100644
--- a/e-util/e-xml-utils.h
+++ b/e-util/e-xml-utils.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c
index ff880a12bd..1b844977f9 100644
--- a/e-util/gconf-bridge.c
+++ b/e-util/gconf-bridge.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * (C) 2005 OpenedHand Ltd.
  *
  * Author: Jorn Baayen <jorn@openedhand.com>
@@ -29,7 +29,7 @@
 
 struct _GConfBridge {
         GConfClient *client;
-        
+
         GHashTable *bindings;
 };
 
@@ -43,7 +43,7 @@ typedef enum {
 typedef struct {
         BindingType type;
         guint id;
-        
+
         gboolean delayed_mode;
 
         char *key;
@@ -149,7 +149,7 @@ gconf_bridge_get (void)
  * gconf_bridge_get_client
  * @bridge: A #GConfBridge
  *
- * Returns the #GConfClient used by @bridge. This is the same #GConfClient 
+ * Returns the #GConfClient used by @bridge. This is the same #GConfClient
  * as returned by gconf_client_get_default().
  *
  * Return value: A #GConfClient.
@@ -183,7 +183,7 @@ prop_binding_sync_pref_to_prop (PropBinding *binding,
                                 GConfValue  *pref_value)
 {
         GValue src_value, value;
-        
+
         /* Make sure we don't enter an infinite synchronizing loop */
         g_signal_handler_block (binding->object, binding->prop_notify_id);
 
@@ -229,7 +229,7 @@ prop_binding_sync_pref_to_prop (PropBinding *binding,
                                    "transform a \"%s\" to a \"%s\".",
                                    g_type_name (src_value.g_type),
                                    g_type_name (value.g_type));
-                        
+
                         goto done;
                 }
 
@@ -239,7 +239,7 @@ prop_binding_sync_pref_to_prop (PropBinding *binding,
                 g_object_set_property (binding->object,
                                        binding->prop->name, &src_value);
         }
-        
+
 done:
         g_value_unset (&src_value);
         g_value_unset (&value);
@@ -397,7 +397,7 @@ prop_binding_pref_changed (GConfClient *client,
         prop_binding_sync_pref_to_prop (binding, gconf_value);
 }
 
-/* Performs a scheduled prop-to-pref sync for a prop binding in 
+/* Performs a scheduled prop-to-pref sync for a prop binding in
  * delay mode */
 static gboolean
 prop_binding_perform_scheduled_sync (PropBinding *binding)
@@ -407,7 +407,7 @@ prop_binding_perform_scheduled_sync (PropBinding *binding)
         binding->sync_timeout_id = 0;
 
         g_object_unref (binding->object);
-        
+
         return FALSE;
 }
 
@@ -451,7 +451,7 @@ prop_binding_object_destroyed (gpointer user_data,
         binding = (PropBinding *) user_data;
         binding->object = NULL; /* Don't do anything with the object
                                    at unbind() */
-        
+
         g_hash_table_remove (bridge->bindings,
                              GUINT_TO_POINTER (binding->id));
 }
@@ -516,7 +516,7 @@ gconf_bridge_bind_property_full (GConfBridge *bridge,
         binding->object = object;
         binding->prop = pspec;
         binding->sync_timeout_id = 0;
-        
+
         /* Watch GConf key */
         binding->val_notify_id =
                 gconf_client_notify_add (bridge->client, key,
@@ -557,7 +557,7 @@ prop_binding_unbind (PropBinding *binding)
         if (binding->delayed_mode && binding->sync_timeout_id > 0) {
                 /* Perform any scheduled syncs */
                 g_source_remove (binding->sync_timeout_id);
-                        
+
                 /* The object will still be around as we have
                  * a reference */
                 prop_binding_perform_scheduled_sync (binding);
@@ -696,7 +696,7 @@ window_binding_window_destroyed (gpointer user_data,
         binding = (WindowBinding *) user_data;
         binding->window = NULL; /* Don't do anything with the window
                                    at unbind() */
-        
+
         g_hash_table_remove (bridge->bindings,
                              GUINT_TO_POINTER (binding->id));
 }
@@ -708,7 +708,7 @@ window_binding_window_destroyed (gpointer user_data,
  * @window: A #GtkWindow
  * @bind_size: TRUE to bind the size of @window
  * @bind_pos: TRUE to bind the position of @window
- * 
+ *
  * On calling this function @window will be resized to the values
  * specified by "@key_prefix<!-- -->_width" and "@key_prefix<!-- -->_height"
  * and maximixed if "@key_prefix<!-- -->_maximized is TRUE if
@@ -784,7 +784,7 @@ gconf_bridge_bind_window (GConfBridge *bridge,
         if (bind_pos) {
                 char *key;
                 GConfValue *x_val, *y_val;
-                
+
                 key = g_strconcat (key_prefix, "_x", NULL);
                 x_val = gconf_client_get (bridge->client, key, NULL);
                 g_free (key);
@@ -879,7 +879,7 @@ list_store_binding_sync_pref_to_store (ListStoreBinding *binding,
                                 binding->row_inserted_id);
         g_signal_handler_block (binding->list_store,
                                 binding->row_deleted_id);
-        
+
         gtk_list_store_clear (binding->list_store);
 
         list = gconf_value_get_list (value);
@@ -996,7 +996,7 @@ list_store_binding_store_destroyed (gpointer user_data,
         binding = (ListStoreBinding *) user_data;
         binding->list_store = NULL; /* Don't do anything with the store
                                        at unbind() */
-        
+
         g_hash_table_remove (bridge->bindings,
                              GUINT_TO_POINTER (binding->id));
 }
@@ -1019,7 +1019,7 @@ list_store_binding_store_changed_cb (ListStoreBinding *binding)
  * @bridge: A #GConfBridge
  * @key: A GConf key to be bound
  * @list_store: A #GtkListStore
- * 
+ *
  * On calling this function single string column #GtkListStore @list_store
  * will be kept synchronized with the GConf string list value pointed to by
  * @key. On calling this function @list_store will be populated with the
@@ -1192,7 +1192,7 @@ gconf_bridge_unbind (GConfBridge *bridge,
 
         /* This will trigger the hash tables value destruction
          * function, which will take care of further cleanup */
-        g_hash_table_remove (bridge->bindings, 
+        g_hash_table_remove (bridge->bindings,
                              GUINT_TO_POINTER (binding_id));
 }
 
diff --git a/e-util/gconf-bridge.h b/e-util/gconf-bridge.h
index ba67f4f8e6..7edd2476dd 100644
--- a/e-util/gconf-bridge.h
+++ b/e-util/gconf-bridge.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * (C) 2005 OpenedHand Ltd.
  *
  * Author: Jorn Baayen <jorn@openedhand.com>
@@ -81,7 +81,7 @@ guint        gconf_bridge_bind_window            (GConfBridge  *bridge,
  * @bridge: A #GConfBridge
  * @key_prefix: The prefix of the GConf keys
  * @window: A #GtkWindow
- * 
+ *
  * On calling this function @window will be resized to the values specified by
  * "@key_prefix<!-- -->_width" and "@key_prefix<!-- -->_height".  The respective
  * GConf values will be updated when the window is resized. See
@@ -95,7 +95,7 @@ guint        gconf_bridge_bind_window            (GConfBridge  *bridge,
  * @bridge: A #GConfBridge
  * @key_prefix: The prefix of the GConf keys
  * @window: A #GtkWindow
- * 
+ *
  * On calling this function @window will be moved to the values specified by
  * "@key_prefix<!-- -->_x" and "@key_prefix<!-- -->_y". The respective GConf
  * values will be updated when the window is moved. See
-- 
cgit v1.2.3