Merge branch 'master' into kill-bonobo

Conflicts:
	a11y/widgets/ea-combo-button.c
	a11y/widgets/ea-combo-button.h
	addressbook/gui/component/addressbook-component.c
	addressbook/gui/component/addressbook-component.h
	addressbook/gui/component/addressbook-view.c
	addressbook/gui/component/addressbook-view.h
	addressbook/gui/component/component-factory.c
	addressbook/gui/widgets/e-addressbook-view.c
	addressbook/gui/widgets/eab-contact-display.c
	addressbook/gui/widgets/eab-gui-util.h
	addressbook/gui/widgets/eab-menu.c
	addressbook/gui/widgets/eab-menu.h
	addressbook/gui/widgets/eab-popup-control.c
	addressbook/gui/widgets/eab-popup-control.h
	addressbook/gui/widgets/eab-popup.c
	addressbook/gui/widgets/eab-popup.h
	calendar/gui/cal-search-bar.c
	calendar/gui/calendar-commands.c
	calendar/gui/calendar-component.c
	calendar/gui/comp-editor-factory.c
	calendar/gui/comp-editor-factory.h
	calendar/gui/control-factory.c
	calendar/gui/dialogs/comp-editor.c
	calendar/gui/e-cal-component-memo-preview.c
	calendar/gui/e-cal-component-memo-preview.h
	calendar/gui/e-calendar-table.c
	calendar/gui/e-memo-table.c
	calendar/gui/e-memos.c
	calendar/gui/e-tasks.c
	calendar/gui/gnome-cal.c
	calendar/gui/gnome-cal.h
	calendar/gui/itip-bonobo-control.c
	calendar/gui/itip-bonobo-control.h
	calendar/gui/main.c
	calendar/gui/memos-component.c
	calendar/gui/memos-control.c
	calendar/gui/memos-control.h
	calendar/gui/migration.c
	calendar/gui/migration.h
	calendar/gui/tasks-component.c
	calendar/gui/tasks-control.c
	calendar/importers/main.c
	composer/Makefile.am
	composer/e-composer-header-table.c
	composer/e-composer-header.c
	composer/e-composer-header.h
	composer/e-composer-name-header.c
	composer/e-composer-private.c
	composer/e-composer-text-header.c
	composer/e-msg-composer.c
	composer/e-msg-composer.h
	e-util/e-corba-utils.h
	e-util/e-logger.c
	e-util/e-logger.h
	e-util/e-util-labels.c
	e-util/e-util-labels.h
	em-format/em-format.c
	mail/Makefile.am
	mail/e-mail-shell-migrate.c
	mail/em-account-editor.c
	mail/em-account-editor.h
	mail/em-composer-prefs.c
	mail/em-composer-utils.c
	mail/em-composer-utils.h
	mail/em-folder-browser.c
	mail/em-folder-tree-model.c
	mail/em-folder-tree.c
	mail/em-folder-tree.h
	mail/em-folder-utils.c
	mail/em-folder-utils.h
	mail/em-folder-view.c
	mail/em-format-html-display.c
	mail/em-format-html.c
	mail/em-mailer-prefs.c
	mail/em-mailer-prefs.h
	mail/em-message-browser.c
	mail/em-message-browser.h
	mail/em-network-prefs.h
	mail/em-popup.c
	mail/em-utils.c
	mail/importers/Makefile.am
	mail/mail-component-factory.c
	mail/mail-component.c
	mail/mail-config-factory.c
	mail/mail-config-factory.h
	mail/mail-config.c
	mail/mail-dialogs.glade
	mail/mail-types.h
	plugins/calendar-weather/calendar-weather.c
	plugins/mail-account-disable/mail-account-disable.c
	plugins/select-one-source/select-one-source.c
	po/POTFILES.in
	shell/e-component-registry.c
	shell/e-component-registry.h
	shell/e-component-view.c
	shell/e-component-view.h
	shell/e-corba-config-page.c
	shell/e-corba-config-page.h
	shell/e-shell-constants.h
	shell/e-shell-settings-dialog.c
	shell/e-shell-settings-dialog.h
	shell/e-shell-window-commands.c
	shell/e-shell-window.c
	shell/e-shell.h
	shell/e-sidebar.c
	shell/e-sidebar.h
	shell/e-user-creatable-items-handler.c
	shell/e-user-creatable-items-handler.h
	shell/es-menu.c
	shell/es-menu.h
	shell/evolution-component.h
	shell/evolution-config-control.c
	shell/evolution-config-control.h
	shell/evolution-listener.c
	shell/evolution-listener.h
	shell/evolution-shell-component-utils.c
	shell/evolution-shell-component-utils.h
	shell/importer/evolution-importer-client.c
	shell/importer/evolution-importer-client.h
	shell/importer/evolution-importer-listener.c
	shell/importer/evolution-importer-listener.h
	shell/importer/evolution-importer.c
	shell/importer/evolution-importer.h
	shell/importer/evolution-intelligent-importer.c
	shell/importer/evolution-intelligent-importer.h
	shell/importer/intelligent.c
	shell/main.c
	shell/test/evolution-test-component.c
	shell/test/evolution-test-component.h
	widgets/menus/gal-view-instance.c
	widgets/menus/gal-view-menus.c
	widgets/menus/gal-view-menus.h
	widgets/misc/Makefile.am
	widgets/misc/e-activity-handler.c
	widgets/misc/e-activity-handler.h
	widgets/misc/e-charset-picker.c
	widgets/misc/e-combo-button.c
	widgets/misc/e-combo-button.h
	widgets/misc/e-config-page.h
	widgets/misc/e-dropdown-button.c
	widgets/misc/e-dropdown-button.h
	widgets/misc/e-filter-bar.c
	widgets/misc/e-info-label.c
	widgets/misc/e-info-label.h
	widgets/misc/e-multi-config-dialog.c
	widgets/misc/e-multi-config-dialog.h
	widgets/misc/e-search-bar.c
	widgets/misc/e-search-bar.h
	widgets/misc/e-task-bar.c
	widgets/misc/e-task-bar.h
	widgets/misc/e-task-widget.c
	widgets/misc/e-task-widget.h
	widgets/misc/test-dropdown-button.c
	widgets/misc/test-error.c
	widgets/misc/test-info-label.c
	widgets/table/e-table-example-1.c

122 files changed, 689 insertions, 580 deletions

diff --git a/plugins/addressbook-file/addressbook-file.c b/plugins/addressbook-file/addressbook-file.c
index 0a9ee8b79e..3bccf0a229 100644
--- a/plugins/addressbook-file/addressbook-file.c
+++ b/plugins/addressbook-file/addressbook-file.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/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c
index 08c1956303..ccf14beb30 100644
--- a/plugins/attachment-reminder/attachment-reminder.c
+++ b/plugins/attachment-reminder/attachment-reminder.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/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c
index 67280e54c4..c4c3c098ae 100644
--- a/plugins/audio-inline/audio-inline.c
+++ b/plugins/audio-inline/audio-inline.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:
@@ -198,7 +198,7 @@ org_gnome_audio_inline_play_clicked (GtkWidget *button, EMFormatHTMLPObject *pob
 		CamelDataWrapper *data;
 		GError *error = NULL;
 		int argc = 1;
-		char *argv [] = { "org_gnome_audio_inline", NULL };
+		const gchar *argv [] = { "org_gnome_audio_inline", NULL };
 
 		/* FIXME this is ugly, we should stream this directly to gstreamer */
 		po->filename = e_mktemp ("org-gnome-audio-inline-file-XXXXXX");
diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c
index f9745e8972..59c04a605b 100644
--- a/plugins/backup-restore/backup-restore.c
+++ b/plugins/backup-restore/backup-restore.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/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -83,7 +83,7 @@ sanity_check (const char *filename)
 	g_message ("Sanity check result %d:%d %d", WIFEXITED (result), WEXITSTATUS (result), result);
 
 	return WIFEXITED (result) && (WEXITSTATUS (result) == 0);
-#else	
+#else
 	return result;
 #endif
 }
@@ -125,7 +125,7 @@ epbr_perform_pre_backup_checks (char* dir)
 #ifdef G_OS_WIN32
 	return TRUE;
 #else
-	return (g_access (dir, W_OK) == 0); 
+	return (g_access (dir, W_OK) == 0);
 #endif
 }
 
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index 7d3c208a28..19e9e98bb1 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -11,13 +11,13 @@
  * 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)
  *
  */
- 
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -182,7 +182,7 @@ backup (const char *filename)
 
 	g_return_if_fail (filename && *filename);
 	quotedfname = g_shell_quote(filename);
-	
+
 	CANCEL (complete);
 	txt = _("Shutting down Evolution");
 	/* FIXME Will the versioned setting always work? */
@@ -226,10 +226,10 @@ restore (const char *filename)
 {
 	char *command;
 	char *quotedfname;
-	
+
 	g_return_if_fail (filename && *filename);
 	quotedfname = g_shell_quote(filename);
-	
+
 	/* FIXME Will the versioned setting always work? */
 	CANCEL (complete);
 	txt = _("Shutting down Evolution");
@@ -281,7 +281,7 @@ check (const char *filename)
 
 	g_return_if_fail (filename && *filename);
 	quotedfname = g_shell_quote(filename);
-	
+
 	command = g_strdup_printf ("tar ztf %s | grep -e \"^\\.evolution/$\"", quotedfname);
 	result = system (command);
 	g_free (command);
@@ -294,7 +294,7 @@ check (const char *filename)
 	result = system (command);
 	g_free (command);
 	g_free (quotedfname);
-	
+
 	g_message ("Second result %d", result);
 
 }
@@ -373,7 +373,7 @@ main (int argc, char **argv)
 	g_thread_init (NULL);
 
 	gtk_init_with_args (
-		&argc, &argv, NULL, options, GETTEXT_PACKAGE, &error);
+		&argc, &argv, NULL, options, (gchar *) GETTEXT_PACKAGE, &error);
 	if (error != NULL) {
 		g_printerr ("%s\n", error->message);
 		g_error_free (error);
@@ -401,8 +401,9 @@ main (int argc, char **argv)
 
 	if (gui_arg && !check_op) {
 		GtkWidget *widget, *container;
-		char *str = NULL, *txt;
-		const char *txt2;
+		const gchar *txt, *txt2;
+		gchar *str = NULL;
+		gchar *markup;
 
 		gtk_window_set_default_icon_name ("evolution");
 
@@ -454,34 +455,34 @@ main (int argc, char **argv)
 			txt2 = "Should not be here now, really...";
 		}
 
-		txt = g_strconcat ("<b><big>", txt, "</big></b>", NULL);
+		markup = g_strconcat ("<b><big>", txt, "</big></b>", NULL);
 		widget = gtk_label_new (NULL);
 		gtk_label_set_line_wrap (GTK_LABEL (widget), FALSE);
-		gtk_label_set_markup (GTK_LABEL (widget), txt);
+		gtk_label_set_markup (GTK_LABEL (widget), markup);
 		gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.0);
 		gtk_widget_show (widget);
-		g_free (txt);
+		g_free (markup);
 
 		gtk_table_attach (GTK_TABLE (container), widget, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
 
-		txt = g_strconcat (txt2, " ", _("This may take a while depending on the amount of data in your account."), NULL);
+		markup = g_strconcat (txt2, " ", _("This may take a while depending on the amount of data in your account."), NULL);
 		widget = gtk_label_new (NULL);
 		gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
-		gtk_label_set_markup (GTK_LABEL (widget), txt);
+		gtk_label_set_markup (GTK_LABEL (widget), markup);
 		gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
 		gtk_widget_show (widget);
-		g_free (txt);
+		g_free (markup);
 
 		gtk_table_attach (GTK_TABLE (container), widget, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
 
 		pbar = gtk_progress_bar_new ();
 
 		if (str) {
-			txt = g_strconcat ("<i>", str, "</i>", NULL);
+			markup = g_strconcat ("<i>", str, "</i>", NULL);
 			widget = gtk_label_new (NULL);
-			gtk_label_set_markup (GTK_LABEL (widget), txt);
+			gtk_label_set_markup (GTK_LABEL (widget), markup);
 			gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
-			g_free (txt);
+			g_free (markup);
 			g_free (str);
 			gtk_table_attach (GTK_TABLE (container), widget, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
 			gtk_table_set_row_spacing (GTK_TABLE (container), 2, 6);
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index c642dd9130..72098cab56 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.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:
@@ -45,7 +45,6 @@
 int e_plugin_lib_enable (EPluginLib *ep, int enable);
 void bbdb_handle_send (EPlugin *ep, EMEventTargetComposer *target);
 GtkWidget *bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data);
-GtkWidget *bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data);
 
 /* For internal use */
 struct bbdb_stuff {
@@ -240,7 +239,7 @@ bbdb_handle_send (EPlugin *ep, EMEventTargetComposer *target)
 	enable = gconf_client_get_bool (gconf, GCONF_KEY_ENABLE, NULL);
 	g_object_unref (G_OBJECT (gconf));
 
-	if (!enable) 
+	if (!enable)
 		return;
 
 	message = e_msg_composer_get_message(target->composer, 1);
diff --git a/plugins/bbdb/bbdb.h b/plugins/bbdb/bbdb.h
index 55c88709b0..62887a8ed0 100644
--- a/plugins/bbdb/bbdb.h
+++ b/plugins/bbdb/bbdb.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/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index 1a336bc7bb..d23749de66 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -6,7 +6,7 @@
  *  don't already have a buddy icon defined for a person.
  *
  *  This works today (25 October 2004), but is pretty sure to break
- *  later on as the Gaim buddylist file format shifts. 
+ *  later on as the Gaim buddylist file format shifts.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,7 +19,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:
@@ -56,11 +56,7 @@ typedef struct {
 	char *icon;
 } GaimBuddy;
 
-/* Defined in bbdb.c */
-EBook *bbdb_open_addressbook (int type);
-
 /* Forward declarations for this file. */
-void bbdb_sync_buddy_list (void);
 static gboolean bbdb_merge_buddy_to_contact (EBook *book, GaimBuddy *b, EContact *c);
 static GList *bbdb_get_gaim_buddy_list (void);
 static char *get_node_text (xmlNodePtr node);
@@ -456,7 +452,7 @@ parse_contact (xmlNodePtr contact, GList **buddies, GSList *blocked)
 
 	}
 
-	if (is_blocked) 
+	if (is_blocked)
 		free_gaim_body (gb);
 	else
 		*buddies = g_list_prepend (*buddies, gb);
diff --git a/plugins/bbdb/test-evobuddy.c b/plugins/bbdb/test-evobuddy.c
index f7739faea7..9d14aabebe 100644
--- a/plugins/bbdb/test-evobuddy.c
+++ b/plugins/bbdb/test-evobuddy.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/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c
index 848e4f4fb5..77aa377751 100644
--- a/plugins/bogo-junk-plugin/bf-junk-filter.c
+++ b/plugins/bogo-junk-plugin/bf-junk-filter.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:
@@ -77,7 +77,7 @@ void *em_junk_bf_validate_binary (EPlugin *ep, EMJunkHookTarget *target);
 void em_junk_bf_report_junk (EPlugin *ep, EMJunkHookTarget *target);
 void em_junk_bf_report_non_junk (EPlugin *ep, EMJunkHookTarget *target);
 void em_junk_bf_commit_reports (EPlugin *ep, EMJunkHookTarget *target);
-static gint pipe_to_bogofilter (CamelMimeMessage *msg, gchar **argv, GError **error);
+static gint pipe_to_bogofilter (CamelMimeMessage *msg, const gchar **argv, GError **error);
 
 /* eplugin stuff */
 int e_plugin_lib_enable (EPluginLib *ep, int enable);
@@ -93,7 +93,7 @@ init_db ()
 	CamelStream *stream = camel_stream_fs_new_with_name (WELCOME_MESSAGE, O_RDONLY, 0);
 	CamelMimeParser *parser = camel_mime_parser_new ();
 	CamelMimeMessage *msg = camel_mime_message_new ();
-	gchar *argv[] = {
+	const gchar *argv[] = {
 		em_junk_bf_binary,
 		"-n",
 		NULL,
@@ -103,7 +103,7 @@ init_db ()
 	camel_mime_parser_init_with_stream (parser, stream);
 	camel_mime_parser_scan_from (parser, FALSE);
 	camel_object_unref (stream);
-	
+
 	camel_mime_part_construct_from_parser ((CamelMimePart *) msg, parser);
 	camel_object_unref (parser);
 
@@ -113,13 +113,13 @@ init_db ()
 		argv[2] = "--unicode=yes";
 	}
 
-	pipe_to_bogofilter (msg, argv, NULL);	
+	pipe_to_bogofilter (msg, argv, NULL);
 	camel_object_unref (msg);
 
 }
 
 static gint
-pipe_to_bogofilter (CamelMimeMessage *msg, gchar **argv, GError **error)
+pipe_to_bogofilter (CamelMimeMessage *msg, const gchar **argv, GError **error)
 {
 	GPid child_pid;
 	gint bf_in;
@@ -130,7 +130,7 @@ pipe_to_bogofilter (CamelMimeMessage *msg, gchar **argv, GError **error)
 	gint res;
 	static gboolean only_once = FALSE;
 
-retry:	
+retry:
 	if (camel_debug_start ("junk")) {
 		int i;
 
@@ -142,7 +142,7 @@ retry:
 	}
 
 	if (!g_spawn_async_with_pipes (NULL,
-	                               argv,
+	                               (gchar **) argv,
 	                               NULL,
 	                               G_SPAWN_DO_NOT_REAP_CHILD |
 	                                   G_SPAWN_STDOUT_TO_DEV_NULL,
@@ -184,7 +184,7 @@ retry:
 			sleep (1);
 			waitres = waitpid (child_pid, &status, WNOHANG);
 			g_set_error (error, EM_JUNK_ERROR, -2, _("Bogofilter child process does not respond, killing..."));
-		} else 
+		} else
 			g_set_error (error, EM_JUNK_ERROR, -3, _("Wait for Bogofilter child process interrupted, terminating..."));
 	}
 
@@ -209,7 +209,7 @@ retry:
 			goto retry;
 		}
 		g_set_error (error, EM_JUNK_ERROR, res, _("Pipe to Bogofilter failed, error code: %d."), res);
-	
+
 	}
 
 	return res;
@@ -249,7 +249,7 @@ em_junk_bf_check_junk (EPlugin *ep, EMJunkHookTarget *target)
 	CamelMimeMessage *msg = target->m;
 	int rv;
 
-	gchar *argv[] = {
+	const gchar *argv[] = {
 		em_junk_bf_binary,
 		NULL,
 		NULL
@@ -273,7 +273,7 @@ em_junk_bf_report_junk (EPlugin *ep, EMJunkHookTarget *target)
 {
 	CamelMimeMessage *msg = target->m;
 
-	gchar *argv[] = {
+	const gchar *argv[] = {
 		em_junk_bf_binary,
 		"-s",
 		NULL,
@@ -294,7 +294,7 @@ em_junk_bf_report_non_junk (EPlugin *ep, EMJunkHookTarget *target)
 {
 	CamelMimeMessage *msg = target->m;
 
-	gchar *argv[] = {
+	const gchar *argv[] = {
 		em_junk_bf_binary,
 		"-n",
 		NULL,
@@ -318,7 +318,7 @@ em_junk_bf_commit_reports (EPlugin *ep, EMJunkHookTarget *target)
 void *
 em_junk_bf_validate_binary (EPlugin *ep, EMJunkHookTarget *target)
 {
-	return g_file_test (em_junk_bf_binary, G_FILE_TEST_EXISTS) ? "1" : NULL;
+	return g_file_test (em_junk_bf_binary, G_FILE_TEST_EXISTS) ? (void *) "1" : NULL;
 }
 
 int
@@ -374,7 +374,7 @@ org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFac
 	check = gtk_check_button_new_with_mnemonic (_("Convert message text to _Unicode"));
 
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), em_junk_bf_unicode);
-	g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (convert_unicode_cb), "/apps/evolution/mail/junk/bogofilter/unicode");
+	g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (convert_unicode_cb), (gpointer) "/apps/evolution/mail/junk/bogofilter/unicode");
 	gtk_table_attach((GtkTable *)data->parent, check, 0, 1, i, i+1, 0, 0, 0, 0);
 	gtk_widget_show (check);
 	return (GtkWidget *)check;
diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c
index 5df807a691..1dd5ae35b5 100644
--- a/plugins/caldav/caldav-source.c
+++ b/plugins/caldav/caldav-source.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:
@@ -79,6 +79,29 @@ e_plugin_lib_enable (EPluginLib *ep, int enable)
 	return 0;
 }
 
+/* replaces all '@' with '%40' in str; returns newly allocated string */
+static char *
+replace_at_sign (const char *str)
+{
+	char *res, *at;
+
+	if (!str)
+		return NULL;
+
+	res = g_strdup (str);
+	while (at = strchr (res, '@'), at) {
+		char *tmp = g_malloc0 (sizeof (char) * (1 + strlen (res) + 2));
+
+		strncpy (tmp, res, at - res);
+		strcat (tmp, "%40");
+		strcat (tmp, at + 1);
+
+		g_free (res);
+		res = tmp;
+	}
+
+	return res;
+}
 
 /*****************************************************************************/
 /* the location field for caldav sources */
@@ -87,17 +110,27 @@ e_plugin_lib_enable (EPluginLib *ep, int enable)
 static gchar *
 print_uri_noproto (EUri *uri)
 {
-	gchar *uri_noproto;
+	gchar *uri_noproto, *user, *pass;
+
+	if (uri->user)
+		user = replace_at_sign (uri->user);
+	else
+		user = NULL;
+
+	if (uri->passwd)
+		pass = replace_at_sign (uri->passwd);
+	else
+		pass = NULL;
 
 	if (uri->port != 0)
 		uri_noproto = g_strdup_printf (
 			"%s%s%s%s%s%s%s:%d%s%s%s",
-			uri->user ? uri->user : "",
+			user ? user : "",
 			uri->authmech ? ";auth=" : "",
 			uri->authmech ? uri->authmech : "",
-			uri->passwd ? ":" : "",
-			uri->passwd ? uri->passwd : "",
-			uri->user ? "@" : "",
+			pass ? ":" : "",
+			pass ? pass : "",
+			user ? "@" : "",
 			uri->host ? uri->host : "",
 			uri->port,
 			uri->path ? uri->path : "",
@@ -106,16 +139,20 @@ print_uri_noproto (EUri *uri)
 	else
 		uri_noproto = g_strdup_printf (
 			"%s%s%s%s%s%s%s%s%s%s",
-			uri->user ? uri->user : "",
+			user ? user : "",
 			uri->authmech ? ";auth=" : "",
 			uri->authmech ? uri->authmech : "",
-			uri->passwd ? ":" : "",
-			uri->passwd ? uri->passwd : "",
-			uri->user ? "@" : "",
+			pass ? ":" : "",
+			pass ? pass : "",
+			user ? "@" : "",
 			uri->host ? uri->host : "",
 			uri->path ? uri->path : "",
 			uri->query ? "?" : "",
 			uri->query ? uri->query : "");
+
+	g_free (user);
+	g_free (pass);
+
 	return uri_noproto;
 }
 
diff --git a/plugins/calendar-file/calendar-file.c b/plugins/calendar-file/calendar-file.c
index 33fef89cc4..6670d23293 100644
--- a/plugins/calendar-file/calendar-file.c
+++ b/plugins/calendar-file/calendar-file.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/plugins/copy-tool/copy-tool.c b/plugins/copy-tool/copy-tool.c
index 052722f4eb..1f33ba71db 100644
--- a/plugins/copy-tool/copy-tool.c
+++ b/plugins/copy-tool/copy-tool.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/plugins/default-mailer/default-mailer.c b/plugins/default-mailer/default-mailer.c
index f52bd30855..8d383639ff 100644
--- a/plugins/default-mailer/default-mailer.c
+++ b/plugins/default-mailer/default-mailer.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/plugins/default-source/default-source.c b/plugins/default-source/default-source.c
index 132203cd38..a3611cc730 100644
--- a/plugins/default-source/default-source.c
+++ b/plugins/default-source/default-source.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/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am
index ca934e5e78..c9467fe925 100644
--- a/plugins/email-custom-header/Makefile.am
+++ b/plugins/email-custom-header/Makefile.am
@@ -3,7 +3,6 @@ INCLUDES = -I. 						\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/widgets/misc			\
 	-I$(top_builddir)/mail                          \
-	-I$(top_srcdir)/camel                           \
 	-I$(top_builddir)/composer			\
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"          \
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index 1e88303e50..31039bcf44 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.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:
@@ -92,7 +92,7 @@ e_plugin_lib_enable (EPluginLib *ep, int enable)
         return 0;
 }
 
-static void 
+static void
 epech_get_widgets_data (CustomHeaderOptionsDialog *mch)
 {
 	EmailCustomHeaderOptionsDialogPrivate *priv;
@@ -115,8 +115,8 @@ epech_get_widgets_data (CustomHeaderOptionsDialog *mch)
 	return;
 }
 
-static gboolean 
-epech_get_widgets (CustomHeaderOptionsDialog *mch) 
+static gboolean
+epech_get_widgets (CustomHeaderOptionsDialog *mch)
 {
 	EmailCustomHeaderOptionsDialogPrivate *priv;
 	priv = mch->priv;
@@ -127,39 +127,39 @@ epech_get_widgets (CustomHeaderOptionsDialog *mch)
 	if (!priv->main)
 		return FALSE;
 
-	priv->page  = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox");	
-	priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options");	
+	priv->page  = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox");
+	priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options");
 #undef EMAIL_CUSTOM_HEADER
 
 	return (priv->page
 		&&priv->header_table);
 }
 
-static void 
+static void
 epech_fill_widgets_with_data (CustomHeaderOptionsDialog *mch)
 {
 	EmailCustomHeaderOptionsDialogPrivate *priv;
 	HeaderValueComboBox *sub_combo_box_fill;
-	gint set_index_row,set_index_column;	
+	gint set_index_row,set_index_column;
 
 	priv = mch->priv;
 	priv->help_section = g_strdup ("usage-mail");
 
-	for (set_index_row = 0,set_index_column = 0; 
+	for (set_index_row = 0,set_index_column = 0;
 		set_index_column < priv->email_custom_header_details->len;set_index_column++) {
 		sub_combo_box_fill = &g_array_index(priv->combo_box_header_value, HeaderValueComboBox,set_index_column);
 
 		if (priv->flag == 0) {
 			gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box,0);
 		} else {
-			gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box, 
+			gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box,
                         	g_array_index(priv->header_index_type, gint, set_index_column));
 		}
 	}
 }
 
 CustomHeaderOptionsDialog *
-epech_dialog_new (void) 
+epech_dialog_new (void)
 {
 	CustomHeaderOptionsDialog *mch;
 
@@ -168,7 +168,7 @@ epech_dialog_new (void)
 	return mch;
 }
 
-GType 
+GType
 epech_dialog_get_type (void)
 {
 	static GType type = 0;
@@ -189,12 +189,12 @@ epech_dialog_get_type (void)
 		type = g_type_register_static (G_TYPE_OBJECT,
 				"CustomHeaderOptionsDialogType",
 				&info, 0);
-	} 
+	}
 
 	return type;
 }
 
-static void 
+static void
 epech_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data)
 {
 	EmailCustomHeaderOptionsDialogPrivate *priv;
@@ -203,14 +203,14 @@ epech_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data)
 	mch = func_data;
 	priv = mch->priv;
 
-	switch (state) {			
+	switch (state) {
 		case GTK_RESPONSE_OK:
-			epech_get_widgets_data (mch); 
+			epech_get_widgets_data (mch);
 		case GTK_RESPONSE_CANCEL:
 			gtk_widget_hide (priv->main);
 			gtk_widget_destroy (priv->main);
 			g_object_unref (priv->xml);
-			break;	     
+			break;
 		case GTK_RESPONSE_HELP:
 			e_display_help (
 				GTK_WINDOW (priv->main),
@@ -221,9 +221,9 @@ epech_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data)
 	g_signal_emit (G_OBJECT (func_data), signals[MCH_RESPONSE], 0, state);
 }
 
-static gboolean 
+static gboolean
 epech_dialog_run (CustomHeaderOptionsDialog *mch, GtkWidget *parent)
-{	
+{
 	EmailCustomHeaderOptionsDialogPrivate *priv;
 	GtkWidget *toplevel;
 	gchar *filename;
@@ -260,12 +260,12 @@ epech_dialog_run (CustomHeaderOptionsDialog *mch, GtkWidget *parent)
 	return TRUE;
 }
 
-static void 
+static void
 epech_get_header_list (CustomHeaderOptionsDialog *mch)
 {
 	GConfClient *client;
 
-	client = gconf_client_get_default (); 
+	client = gconf_client_get_default ();
 	g_return_if_fail (GCONF_IS_CLIENT (client));
 	gconf_client_add_dir (client, GCONF_KEY_CUSTOM_HEADER, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
 	epech_load_from_gconf (client, "/apps/evolution/eplugin/email_custom_header/customHeader", mch);
@@ -273,7 +273,7 @@ epech_get_header_list (CustomHeaderOptionsDialog *mch)
 	return;
 }
 
-static void 
+static void
 epech_load_from_gconf (GConfClient *client,const char *path,CustomHeaderOptionsDialog *mch)
 {
 	EmailCustomHeaderOptionsDialogPrivate *priv;
@@ -319,7 +319,7 @@ epech_load_from_gconf (GConfClient *client,const char *path,CustomHeaderOptionsD
 	temp_header_details.number_of_header = pos;
 }
 
-static void 
+static void
 epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 {
 	EmailCustomHeaderOptionsDialogPrivate *priv;
@@ -331,9 +331,9 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 	gint header_section_id,sub_type_index,row,column,label_row;
 	gint i;
 	gchar *str;
-	static gchar *security_field = N_("Security:");
+	static const gchar *security_field = N_("Security:");
 	static struct _security_values {
-		char *value, *str;
+		const gchar *value, *str;
 	} security_values[] = {
 		{ "Personal", N_("Personal") } ,
 		{ "Unclassified", N_("Unclassified") },
@@ -345,9 +345,9 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 	};
 
 	priv = mch->priv;
-	priv->combo_box_header_value = g_array_new (TRUE, FALSE, sizeof (HeaderValueComboBox)); 
+	priv->combo_box_header_value = g_array_new (TRUE, FALSE, sizeof (HeaderValueComboBox));
 
-	for (header_section_id = 0,label_row = 0,row = 0,column = 1; 
+	for (header_section_id = 0,label_row = 0,row = 0,column = 1;
 		header_section_id < priv->email_custom_header_details->len; header_section_id++,row++,column++) {
 
 		/* To create an empty label widget. Text will be added dynamically. */
@@ -369,7 +369,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 		g_array_append_val(priv->combo_box_header_value, sub_combo_box);
 	}
 
-	for (sub_index = 0,row_combo = 0,column_combo = 1; sub_index < priv->combo_box_header_value->len; 
+	for (sub_index = 0,row_combo = 0,column_combo = 1; sub_index < priv->combo_box_header_value->len;
                 sub_index++,row_combo++,column_combo++) {
 		temp = &g_array_index(priv->email_custom_header_details, EmailCustomHeaderDetails,sub_index);
 
@@ -380,7 +380,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 			(GtkAttachOptions) (GTK_FILL), 0, 0);
 
 		for (sub_type_index = 0; sub_type_index < temp->number_of_subtype_header; sub_type_index++) {
-			temp_header_value_ptr = &g_array_index(temp->sub_header_type_value, CustomSubHeader,sub_type_index); 
+			temp_header_value_ptr = &g_array_index(temp->sub_header_type_value, CustomSubHeader,sub_type_index);
 			str = (temp_header_value_ptr->sub_header_string_value)->str;
 			for (i = 0; security_values[i].value != NULL; i++) {
 				if (strcmp (str, security_values[i].value) == 0) {
@@ -397,7 +397,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 	}
 }
 
-static void 
+static void
 epech_dialog_class_init (GObjectClass *object)
 {
 	CustomHeaderOptionsDialogClass *klass;
@@ -420,7 +420,7 @@ epech_dialog_class_init (GObjectClass *object)
 			G_TYPE_INT);
 }
 
-static void 
+static void
 epech_dialog_init (GObject *object)
 {
 	CustomHeaderOptionsDialog *mch;
@@ -435,7 +435,7 @@ epech_dialog_init (GObject *object)
 	priv->header_table = NULL;
 }
 
-static void 
+static void
 epech_dialog_finalize (GObject *object)
 {
 	CustomHeaderOptionsDialog *mch = (CustomHeaderOptionsDialog *)object;
@@ -450,11 +450,11 @@ epech_dialog_finalize (GObject *object)
 		mch->priv = NULL;
 	}
 
-	if (parent_class->finalize) 
+	if (parent_class->finalize)
 		(* parent_class->finalize) (object);
 }
 
-static void 
+static void
 epech_dialog_dispose (GObject *object)
 {
 	CustomHeaderOptionsDialog *mch = (CustomHeaderOptionsDialog *) object;
@@ -463,9 +463,9 @@ epech_dialog_dispose (GObject *object)
 
 	if (parent_class->dispose)
 		(* parent_class->dispose) (object);
-}	
+}
 
-static void 
+static void
 epech_append_to_custom_header (CustomHeaderOptionsDialog *dialog, gint state, gpointer data)
 {
 	EMsgComposer *composer;
@@ -487,15 +487,15 @@ epech_append_to_custom_header (CustomHeaderOptionsDialog *dialog, gint state, gp
 				temp_header_value_ptr = &g_array_index(temp_header_ptr->sub_header_type_value, CustomSubHeader,sub_type_index);
 
 				if (sub_type_index == g_array_index(priv->header_index_type, gint, index_subtype)){
-					e_msg_composer_modify_header (composer, (temp_header_ptr->header_type_value)->str, 
-						(temp_header_value_ptr->sub_header_string_value)->str);		             
+					e_msg_composer_modify_header (composer, (temp_header_ptr->header_type_value)->str,
+						(temp_header_value_ptr->sub_header_string_value)->str);
 				}
 			}
 		}
 	}
 }
 
-static void 
+static void
 epech_custom_header_options_commit (EMsgComposer *comp, gpointer user_data)
 {
         EMsgComposer *composer;
@@ -503,7 +503,7 @@ epech_custom_header_options_commit (EMsgComposer *comp, gpointer user_data)
         CustomHeaderOptionsDialog *current_dialog = NULL;
 
         composer = (EMsgComposer *) user_data;
-        
+
         if (!user_data || !EMAIL_CUSTOM_HEADER_OPTIONS_IS_DIALOG (user_data))
 		return;
 
@@ -515,16 +515,16 @@ epech_custom_header_options_commit (EMsgComposer *comp, gpointer user_data)
 
         if (current_dialog) {
 		g_free (current_dialog);
-		current_dialog = NULL;	
+		current_dialog = NULL;
         }
 
 	if (new_email_custom_header_window) {
 		g_free (new_email_custom_header_window);
-		new_email_custom_header_window = NULL;           
+		new_email_custom_header_window = NULL;
 	}
 }
 
-static gint 
+static gint
 epech_check_existing_composer_window(gconstpointer compowindow, gconstpointer other_compowindow)
 {
 	if ((compowindow) && (other_compowindow)){
@@ -570,7 +570,7 @@ static void action_email_custom_header_cb (GtkAction *action, EMsgComposer *comp
                         new_email_custom_header_window->epech_window =  menuitem->window;
                         new_email_custom_header_window->epech_dialog = dialog;
                         g_object_set_data_full ((GObject *) composer, "compowindow", new_email_custom_header_window, destroy_compo_data);
-		}        
+		}
 	}
 
 	epech_dialog_run (dialog, GTK_WIDGET (composer));
@@ -944,7 +944,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
 	g_signal_connect(G_OBJECT(model), "row-changed", G_CALLBACK(header_isempty), cd);
 
 	/* Populate tree view with values from gconf */
-	header_list = gconf_client_get_list (client,GCONF_KEY_CUSTOM_HEADER,GCONF_VALUE_STRING, NULL);	
+	header_list = gconf_client_get_list (client,GCONF_KEY_CUSTOM_HEADER,GCONF_VALUE_STRING, NULL);
 
 	for (list = header_list; list; list = g_slist_next (list)) {
 		gchar **parse_header_list;
@@ -954,7 +954,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
                 parse_header_list = g_strsplit_set (buffer, "=,", -1);
                 str_colon = g_strconcat (parse_header_list[0], "", NULL);
                 gtk_list_store_set (cd->store, &iter, HEADER_KEY_COLUMN, str_colon, -1);
-		
+
 		for (index = 0; parse_header_list[index+1] ; ++index) {
                         str1_colon = g_strconcat (parse_header_list[index+1], "", NULL);
                         gtk_list_store_set (cd->store, &iter, HEADER_VALUE_COLUMN, str1_colon, -1);
diff --git a/plugins/email-custom-header/email-custom-header.h b/plugins/email-custom-header/email-custom-header.h
index f828a53061..30e0f7061a 100644
--- a/plugins/email-custom-header/email-custom-header.h
+++ b/plugins/email-custom-header/email-custom-header.h
@@ -1,6 +1,6 @@
 /*
  * Evolution Email custom header options
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -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/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c
index ccfb6afb71..2c08341ef3 100644
--- a/plugins/exchange-operations/exchange-account-setup.c
+++ b/plugins/exchange-operations/exchange-account-setup.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:
@@ -59,25 +59,25 @@ void org_gnome_exchange_commit (EPlugin *epl, EConfigHookItemFactoryData *data);
 GtkWidget* org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactoryData *data);
 
 CamelServiceAuthType camel_exchange_ntlm_authtype = {
-        /* i18n: "Secure Password Authentication" is an Outlookism */
-        N_("Secure Password"),
+	/* i18n: "Secure Password Authentication" is an Outlookism */
+	(gchar *) N_("Secure Password"),
 
-        /* i18n: "NTLM" probably doesn't translate */
-        N_("This option will connect to the Exchange server using "
-           "secure password (NTLM) authentication."),
+	/* i18n: "NTLM" probably doesn't translate */
+	(gchar *) N_("This option will connect to the Exchange server "
+	"using secure password (NTLM) authentication."),
 
-        "NTLM",
-        TRUE
+	(gchar *) "NTLM",
+	TRUE
 };
 
 CamelServiceAuthType camel_exchange_password_authtype = {
-        N_("Plaintext Password"),
+	(gchar *) N_("Plaintext Password"),
 
-        N_("This option will connect to the Exchange server using "
-           "standard plaintext password authentication."),
+	(gchar *) N_("This option will connect to the Exchange server "
+	"using standard plaintext password authentication."),
 
-        "Basic",
-        TRUE
+	(gchar *) "Basic",
+	TRUE
 };
 
 
@@ -239,9 +239,9 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 								    &offline_status);
 	if (offline_status == OFFLINE_MODE) {
 		e_error_run (NULL, ERROR_DOMAIN ":exchange-settings-offline", NULL);
-	
+
 		return NULL;
-	}	
+	}
 
 	oof_data = g_new0 (OOFData, 1);
 
@@ -637,7 +637,7 @@ want_mailbox_toggled (GtkWidget *toggle, EConfig *config)
 		const char *mailbox;
 
 		gtk_widget_set_sensitive (entry, is_active);
-		
+
 		target = (EMConfigTargetAccount *)config->target;
 		mailbox = gtk_entry_get_text (GTK_ENTRY (entry));
 
@@ -898,14 +898,14 @@ org_gnome_exchange_commit (EPlugin *epl, EConfigHookItemFactoryData *data)
 	}
 
 	camel_url_free (url);
-	
+
 	exchange_config_listener_get_offline_status (exchange_global_config_listener,
 								    &offline_status);
-	
+
 	if (offline_status == OFFLINE_MODE) {
                 return;
 	}
-	
+
 	/* Set oof data in exchange account */
 	set_oof_info ();
 	destroy_oof_data ();
@@ -1122,10 +1122,10 @@ org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactor
 	if (!account)
 		return NULL;
 
-	exchange_account_is_offline (account, &mode);  
-	if (mode == OFFLINE_MODE)  
-		return NULL;  
-	
+	exchange_account_is_offline (account, &mode);
+	if (mode == OFFLINE_MODE)
+		return NULL;
+
 	folder_name = (char*) camel_folder_get_name (cml_folder);
 	if (!folder_name)
 		folder_name = g_strdup ("name");
diff --git a/plugins/exchange-operations/exchange-calendar.c b/plugins/exchange-operations/exchange-calendar.c
index ef0eaaef79..58af042c0c 100644
--- a/plugins/exchange-operations/exchange-calendar.c
+++ b/plugins/exchange-operations/exchange-calendar.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/plugins/exchange-operations/exchange-change-password.c b/plugins/exchange-operations/exchange-change-password.c
index e35ee38dee..539bd24d3a 100644
--- a/plugins/exchange-operations/exchange-change-password.c
+++ b/plugins/exchange-operations/exchange-change-password.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/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/plugins/exchange-operations/exchange-change-password.h b/plugins/exchange-operations/exchange-change-password.h
index e2c40c0186..e320d89cf9 100644
--- a/plugins/exchange-operations/exchange-change-password.h
+++ b/plugins/exchange-operations/exchange-change-password.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/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c
index 308e73daaf..5ff53fb171 100644
--- a/plugins/exchange-operations/exchange-config-listener.c
+++ b/plugins/exchange-operations/exchange-config-listener.c
@@ -14,7 +14,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)
  */
@@ -89,7 +89,7 @@ static void account_changed (EAccountList *account_listener,
 			     EAccount     *account);
 static void account_removed (EAccountList *account_listener,
 			     EAccount     *account);
-#if LDEAD
+#ifdef LDEAD
 static void exchange_add_autocompletion_folders (GConfClient *gc_client,
 						 ExchangeAccount *account);
 #endif
@@ -229,7 +229,7 @@ add_defaults_for_account (ExchangeConfigListener *config_listener,
 	EAccount *eaccount;
 	gboolean save = FALSE;
 
-#if LDEAD
+#ifdef LDEAD
 	exchange_add_autocompletion_folders (config_listener->priv->gconf, account);
 #endif
 
@@ -1230,7 +1230,7 @@ exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl
 	g_object_unref (a_source_list);
 }
 
-#if LDEAD
+#ifdef LDEAD
 /**
  * exchange_add_autocompletion_folders:
  *
diff --git a/plugins/exchange-operations/exchange-config-listener.h b/plugins/exchange-operations/exchange-config-listener.h
index d0048ee4a9..b5ceca2a27 100644
--- a/plugins/exchange-operations/exchange-config-listener.h
+++ b/plugins/exchange-operations/exchange-config-listener.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/plugins/exchange-operations/exchange-contacts.c b/plugins/exchange-operations/exchange-contacts.c
index f04c9d6076..1955f58eba 100644
--- a/plugins/exchange-operations/exchange-contacts.c
+++ b/plugins/exchange-operations/exchange-contacts.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:
@@ -503,7 +503,7 @@ e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target)
 		if (authtype) {
 			e_source_set_property (source, "auth-type", authtype);
 			g_free (authtype);
-			authtype=NULL;			
+			authtype=NULL;
 		}
 		e_source_set_property (source, "auth", "plain/password");
 		if (rename) {
diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c
index 66a7e71014..7de3948814 100644
--- a/plugins/exchange-operations/exchange-delegates-user.c
+++ b/plugins/exchange-operations/exchange-delegates-user.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:
@@ -301,12 +301,13 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			CamelMessageInfo *info;
 			char *self_address, *delegate_mail_subject;
 			char *role_name;
-			char *role_name_final = "";
+			GString *role_name_final;
 
 			const char *recipient_address;
 			const char *delegate_exchange_dn;
 			const char *msg_part1 = NULL, *msg_part2 = NULL;
 
+			role_name_final = g_string_new ("");
 
 			self_address = g_strdup (exchange_account_get_email_id (account));
 
@@ -339,11 +340,13 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 				combobox = glade_xml_get_widget (xml, widget_names[i]);
 				role = e_dialog_combo_box_get (combobox, exchange_perm_map);
 				role_name = g_strdup (map_to_full_role_name(role));
-				role_name_final = g_strconcat (role_name_final, "<tr><td>" , folder_names_for_display[i],
-					":</td><td>", role_name, "</td> </tr>", NULL);
+				g_string_append_printf (
+					role_name_final,
+					"<tr><td>%s:</td><td>%s</td></tr>",
+					folder_names_for_display[i], role_name);
 			}
 
-			camel_stream_printf (stream, "%s</table>", role_name_final);
+			camel_stream_printf (stream, "%s</table>", role_name_final->str);
 
 			if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check)) == TRUE) {
 				/* To translators: This message is included if the delegatee has been given access
@@ -360,7 +363,7 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 							 "to see my private items."));
 			camel_data_wrapper_construct_from_stream (delegate_mail_text, stream);
 			g_free (role_name);
-			g_free (role_name_final);
+			g_string_free (role_name_final, TRUE);
 			camel_object_unref (stream);
 
 			part = camel_mime_part_new ();
diff --git a/plugins/exchange-operations/exchange-delegates-user.h b/plugins/exchange-operations/exchange-delegates-user.h
index 56217981a8..251a09de9d 100644
--- a/plugins/exchange-operations/exchange-delegates-user.h
+++ b/plugins/exchange-operations/exchange-delegates-user.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/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c
index b1c94afb1c..4038ef0baf 100644
--- a/plugins/exchange-operations/exchange-delegates.c
+++ b/plugins/exchange-operations/exchange-delegates.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/plugins/exchange-operations/exchange-delegates.h b/plugins/exchange-operations/exchange-delegates.h
index b0c6833ff7..77fc354c60 100644
--- a/plugins/exchange-operations/exchange-delegates.h
+++ b/plugins/exchange-operations/exchange-delegates.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/plugins/exchange-operations/exchange-folder-permission.c b/plugins/exchange-operations/exchange-folder-permission.c
index ad36853cf1..63874c793a 100644
--- a/plugins/exchange-operations/exchange-folder-permission.c
+++ b/plugins/exchange-operations/exchange-folder-permission.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:
@@ -59,7 +59,7 @@ void org_gnome_exchange_menu_cal_permissions (EPlugin *ep, ECalMenuTargetSelect
 gchar *selected_exchange_folder_uri = NULL;
 
 static EPopupItem popup_items[] = {
-	{ E_POPUP_ITEM, "30.emc.10", N_("Permissions..."), org_folder_permissions_cb, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }
+	{ E_POPUP_ITEM, (gchar *) "30.emc.10", (gchar *) N_("Permissions..."), org_folder_permissions_cb, NULL, (gchar *) "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }
 };
 
 static void
diff --git a/plugins/exchange-operations/exchange-folder-size-display.c b/plugins/exchange-operations/exchange-folder-size-display.c
index 4d3082e805..ff3634341a 100644
--- a/plugins/exchange-operations/exchange-folder-size-display.c
+++ b/plugins/exchange-operations/exchange-folder-size-display.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/plugins/exchange-operations/exchange-folder-size-display.h b/plugins/exchange-operations/exchange-folder-size-display.h
index 9c10b93b5f..95c795686d 100644
--- a/plugins/exchange-operations/exchange-folder-size-display.h
+++ b/plugins/exchange-operations/exchange-folder-size-display.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/plugins/exchange-operations/exchange-folder-subscription.c b/plugins/exchange-operations/exchange-folder-subscription.c
index 05229c0838..2f72552983 100644
--- a/plugins/exchange-operations/exchange-folder-subscription.c
+++ b/plugins/exchange-operations/exchange-folder-subscription.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:
@@ -94,10 +94,10 @@ setup_name_selector (GladeXML *glade_xml, ENameSelector **name_selector_ret)
 }
 
 static void
-setup_folder_name_combo (GladeXML *glade_xml, gchar *fname)
+setup_folder_name_combo (GladeXML *glade_xml, const gchar *fname)
 {
 	GtkComboBox *combo;
-	char *strings[] = {
+	const gchar *strings[] = {
 		"Calendar",
 		"Inbox",
 		"Contacts",
@@ -286,7 +286,7 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
 }
 
 gboolean
-create_folder_subscription_dialog (ExchangeAccount *account, gchar *fname)
+create_folder_subscription_dialog (ExchangeAccount *account, const gchar *fname)
 {
 	ENameSelector *name_selector;
 	GladeXML *glade_xml;
diff --git a/plugins/exchange-operations/exchange-folder-subscription.h b/plugins/exchange-operations/exchange-folder-subscription.h
index 26b4bc3642..15323cad09 100644
--- a/plugins/exchange-operations/exchange-folder-subscription.h
+++ b/plugins/exchange-operations/exchange-folder-subscription.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)
@@ -22,6 +22,6 @@
 #define __EXCHANGE_FOLDER_SUBSCRIPTION_H__
 
 gboolean
-create_folder_subscription_dialog (ExchangeAccount *account, gchar *fname);
+create_folder_subscription_dialog (ExchangeAccount *account, const gchar *fname);
 
 #endif
diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c
index b2b53d1bb3..3362f0ae83 100644
--- a/plugins/exchange-operations/exchange-folder.c
+++ b/plugins/exchange-operations/exchange-folder.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:
@@ -44,7 +44,7 @@
 #include "addressbook/gui/widgets/eab-popup.h"
 #include "exchange-folder-subscription.h"
 
-void org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target, gchar *fname);
+void org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target, const gchar *fname);
 void org_gnome_exchange_inbox_subscription (EPlugin *ep, EMMenuTargetSelect *target);
 void org_gnome_exchange_addressbook_subscription (EPlugin *ep, EMMenuTargetSelect *target);
 void org_gnome_exchange_calendar_subscription (EPlugin *ep, EMMenuTargetSelect *target);
@@ -64,7 +64,7 @@ static void exchange_get_folder (char *uri, CamelFolder *folder, void *data);
 
 
 static EPopupItem popup_inbox_items[] = {
-	{ E_POPUP_ITEM, "29.inbox_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_inbox_unsubscribe, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }
+	{ E_POPUP_ITEM, (gchar *) "29.inbox_unsubscribe", (gchar *) N_("Unsubscribe Folder..."), org_gnome_exchange_folder_inbox_unsubscribe, NULL, (gchar *) "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }
 };
 
 void
@@ -233,7 +233,7 @@ org_gnome_exchange_check_inbox_subscribed (EPlugin *ep, EMPopupTargetFolder *tar
 }
 
 static EPopupItem popup_items[] = {
-	{ E_POPUP_ITEM, "29.calendar_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_unsubscribe, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }
+	{ E_POPUP_ITEM, (gchar *) "29.calendar_unsubscribe", (gchar *) N_("Unsubscribe Folder..."), org_gnome_exchange_folder_unsubscribe, NULL, (gchar *) "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }
 };
 
 void
@@ -243,7 +243,7 @@ popup_free (EPopup *ep, GSList *items, void *data)
 }
 
 static EPopupItem popup_ab_items[] = {
-	{ E_POPUP_ITEM, "29.address_book_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_ab_unsubscribe, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }
+	{ E_POPUP_ITEM, (gchar *) "29.address_book_unsubscribe", (gchar *) N_("Unsubscribe Folder..."), org_gnome_exchange_folder_ab_unsubscribe, NULL, (gchar *) "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }
 };
 
 void
@@ -541,7 +541,7 @@ org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, void *data)
 
 
 void
-org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target, gchar *fname)
+org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target, const gchar *fname)
 {
 	ExchangeAccount *account = NULL;
 	gint mode;
@@ -573,24 +573,27 @@ org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target,
 void
 org_gnome_exchange_calendar_subscription (EPlugin *ep, EMMenuTargetSelect *target)
 {
-	gchar *folder_name = N_("Calendar");
+	const gchar *folder_name = N_("Calendar");
 	org_gnome_exchange_folder_subscription (ep, target, folder_name);
 }
+
 void
 org_gnome_exchange_addressbook_subscription (EPlugin *ep, EMMenuTargetSelect *target)
 {
-	gchar *folder_name = N_("Contacts");
+	const gchar *folder_name = N_("Contacts");
 	org_gnome_exchange_folder_subscription (ep, target, folder_name);
 }
+
 void
 org_gnome_exchange_tasks_subscription (EPlugin *ep, EMMenuTargetSelect *target)
 {
-	gchar *folder_name = N_("Tasks");
+	const gchar *folder_name = N_("Tasks");
 	org_gnome_exchange_folder_subscription (ep, target, folder_name);
 }
+
 void
 org_gnome_exchange_inbox_subscription (EPlugin *ep, EMMenuTargetSelect *target)
 {
-	gchar *folder_name = N_("Inbox");
+	const gchar *folder_name = N_("Inbox");
 	org_gnome_exchange_folder_subscription (ep, target, folder_name);
 }
diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c
index 7b801b13e5..74d3af258e 100644
--- a/plugins/exchange-operations/exchange-mail-send-options.c
+++ b/plugins/exchange-operations/exchange-mail-send-options.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/plugins/exchange-operations/exchange-operations.c b/plugins/exchange-operations/exchange-operations.c
index 94240c051a..553a41695e 100644
--- a/plugins/exchange-operations/exchange-operations.c
+++ b/plugins/exchange-operations/exchange-operations.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:
@@ -30,24 +30,26 @@
 
 ExchangeConfigListener *exchange_global_config_listener=NULL;
 
-static char *error_ids[] = { "config-error",
-			     "password-weak-error",
-			     "password-change-error",
-			     "password-change-success",
-			     "account-offline",
-			     "password-incorrect",
-			     "account-domain-error",
-			     "account-mailbox-na",
-			     "account-version-error",
-			     "account-wss-error",
-			     "account-no-mailbox",
-			     "account-resolve-error",
-			     "account-connect-error",
-			     "password-expired",
-			     "account-unknown-error",
-			     "account-quota-error",
-			     "account-quota-send-error",
-			     "account-quota-warn" };
+static const gchar *error_ids[] = {
+	"config-error",
+	"password-weak-error",
+	"password-change-error",
+	"password-change-success",
+	"account-offline",
+	"password-incorrect",
+	"account-domain-error",
+	"account-mailbox-na",
+	"account-version-error",
+	"account-wss-error",
+	"account-no-mailbox",
+	"account-resolve-error",
+	"account-connect-error",
+	"password-expired",
+	"account-unknown-error",
+	"account-quota-error",
+	"account-quota-send-error",
+	"account-quota-warn"
+};
 
 static void
 free_exchange_listener (void)
diff --git a/plugins/exchange-operations/exchange-operations.h b/plugins/exchange-operations/exchange-operations.h
index 156339f437..c453b0b978 100644
--- a/plugins/exchange-operations/exchange-operations.h
+++ b/plugins/exchange-operations/exchange-operations.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/plugins/exchange-operations/exchange-permissions-dialog.c b/plugins/exchange-operations/exchange-permissions-dialog.c
index ddcec2d592..a83d54c517 100644
--- a/plugins/exchange-operations/exchange-permissions-dialog.c
+++ b/plugins/exchange-operations/exchange-permissions-dialog.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/plugins/exchange-operations/exchange-permissions-dialog.h b/plugins/exchange-operations/exchange-permissions-dialog.h
index aa8d9bb043..18bdcd4371 100644
--- a/plugins/exchange-operations/exchange-permissions-dialog.h
+++ b/plugins/exchange-operations/exchange-permissions-dialog.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/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c
index 6ca64049ca..a9858d324a 100644
--- a/plugins/exchange-operations/exchange-send-options.c
+++ b/plugins/exchange-operations/exchange-send-options.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/plugins/exchange-operations/exchange-send-options.h b/plugins/exchange-operations/exchange-send-options.h
index 35ce50030f..b7bb9dd58b 100644
--- a/plugins/exchange-operations/exchange-send-options.h
+++ b/plugins/exchange-operations/exchange-send-options.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/plugins/exchange-operations/exchange-user-dialog.c b/plugins/exchange-operations/exchange-user-dialog.c
index e1de8f4797..9285b9680e 100644
--- a/plugins/exchange-operations/exchange-user-dialog.c
+++ b/plugins/exchange-operations/exchange-user-dialog.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)
  */
diff --git a/plugins/exchange-operations/exchange-user-dialog.h b/plugins/exchange-operations/exchange-user-dialog.h
index 453d4ca832..6bf191bc6e 100644
--- a/plugins/exchange-operations/exchange-user-dialog.h
+++ b/plugins/exchange-operations/exchange-user-dialog.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/plugins/face/Makefile.am b/plugins/face/Makefile.am
index afe36942c9..6ac6dd9850 100644
--- a/plugins/face/Makefile.am
+++ b/plugins/face/Makefile.am
@@ -3,7 +3,6 @@ INCLUDES = -I. 						\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/widgets/misc			\
 	-I$(top_builddir)/mail                          \
-	-I$(top_srcdir)/camel                           \
 	-I$(top_builddir)/composer			\
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"          \
diff --git a/plugins/face/face.c b/plugins/face/face.c
index ca3af16ab4..1b772863a4 100644
--- a/plugins/face/face.c
+++ b/plugins/face/face.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/plugins/folder-unsubscribe/folder-unsubscribe.c b/plugins/folder-unsubscribe/folder-unsubscribe.c
index d2d83b6ec6..308aea35f0 100644
--- a/plugins/folder-unsubscribe/folder-unsubscribe.c
+++ b/plugins/folder-unsubscribe/folder-unsubscribe.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/plugins/google-account-setup/google-contacts-source.c b/plugins/google-account-setup/google-contacts-source.c
index 00b7ebc2a5..23314a44cc 100644
--- a/plugins/google-account-setup/google-contacts-source.c
+++ b/plugins/google-account-setup/google-contacts-source.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)
diff --git a/plugins/google-account-setup/google-contacts-source.h b/plugins/google-account-setup/google-contacts-source.h
index 54c21d18a6..289ea0b40f 100644
--- a/plugins/google-account-setup/google-contacts-source.h
+++ b/plugins/google-account-setup/google-contacts-source.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/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c
index c296ab687f..97d87c666d 100644
--- a/plugins/google-account-setup/google-source.c
+++ b/plugins/google-account-setup/google-source.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:
@@ -420,7 +420,7 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo)
 	g_return_if_fail (username != NULL && *username != '\0');
 
 	tmp = g_strdup_printf (_("Enter password for user %s to access list of subscribed calendars."), username);
-	password = e_passwords_ask_password (_("Enter password"), "Calendar", "", tmp, 
+	password = e_passwords_ask_password (_("Enter password"), "Calendar", "", tmp,
 			E_PASSWORDS_REMEMBER_NEVER | E_PASSWORDS_REPROMPT | E_PASSWORDS_SECRET | E_PASSWORDS_DISABLE_REMEMBER,
 			NULL, parent);
 	g_free (tmp);
diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c
index 0cee4317a7..3d1fb15214 100644
--- a/plugins/groupwise-account-setup/camel-gw-listener.c
+++ b/plugins/groupwise-account-setup/camel-gw-listener.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:
@@ -176,7 +176,7 @@ add_esource (const char *conf_key, GwAccountInfo *info,  const char *source_name
 	ESource *source;
         GConfClient* client;
 	GSList *ids, *temp ;
-	char *source_selection_key;
+	const gchar *source_selection_key;
 	char *relative_uri;
 	const char *soap_port;
 	const char * use_ssl;
@@ -224,7 +224,7 @@ add_esource (const char *conf_key, GwAccountInfo *info,  const char *source_name
 
 		e_source_set_property (source, "refresh", str);
 		g_free (str);
-	} else 
+	} else
 		e_source_set_property (source, "refresh", NULL);
 
 	e_source_set_property (source, "offline_sync", offline_sync ? "1" : "0" );
@@ -274,7 +274,7 @@ remove_esource (const char *conf_key, const char *group_name, char* source_name,
 	GConfClient* client;
 	GSList *ids;
 	GSList *node_tobe_deleted;
-	char *source_selection_key;
+	const gchar *source_selection_key;
 
         client = gconf_client_get_default();
         list = e_source_list_new_for_gconf (client, conf_key);
@@ -349,7 +349,7 @@ modify_esource (const char* conf_key, GwAccountInfo *old_account_info, EAccount
 	const char *poa_address;
 	const char *new_poa_address;
 	const char* new_group_name = a->name;
-	
+
 	url = camel_url_new (old_account_info->source_url, NULL);
 	poa_address = url->host;
 	if (!poa_address || strlen (poa_address) ==0)
@@ -387,13 +387,13 @@ modify_esource (const char* conf_key, GwAccountInfo *old_account_info, EAccount
 					e_source_set_property (source, "port", camel_url_get_param (new_url,"soap_port"));
 					e_source_set_property (source, "use_ssl",  camel_url_get_param (url, "use_ssl"));
 					e_source_set_property (source, "offline_sync",  camel_url_get_param (url, "offline_sync") ? "1" : "0");
-				
+
 					if (a->source->auto_check) {
 						char *str = g_strdup_printf ("%d", a->source->auto_check_time);
-					
+
 						e_source_set_property (source, "refresh", str);
 						g_free (str);
-					} else 
+					} else
 						e_source_set_property (source, "refresh", NULL);
 
 					e_source_list_sync (list, NULL);
@@ -424,7 +424,7 @@ add_calendar_tasks_sources (GwAccountInfo *info)
 	add_esource ("/apps/evolution/calendar/sources", info, _("Calendar"), url, NULL, FALSE);
 	add_esource ("/apps/evolution/tasks/sources", info, _("Tasks"), url, NULL, FALSE);
 	add_esource ("/apps/evolution/memos/sources", info, _("Notes"), url, NULL, TRUE);
- 
+
 	camel_url_free (url);
 
 
diff --git a/plugins/groupwise-account-setup/camel-gw-listener.h b/plugins/groupwise-account-setup/camel-gw-listener.h
index 16a3fbe83b..9682a6877b 100644
--- a/plugins/groupwise-account-setup/camel-gw-listener.h
+++ b/plugins/groupwise-account-setup/camel-gw-listener.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/plugins/groupwise-account-setup/groupwise-account-setup.c b/plugins/groupwise-account-setup/groupwise-account-setup.c
index fca171aab5..aee5e90623 100644
--- a/plugins/groupwise-account-setup/groupwise-account-setup.c
+++ b/plugins/groupwise-account-setup/groupwise-account-setup.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:
@@ -51,7 +51,7 @@ set_esource_props (const char *path, EAccount *a, GConfClient *client, const cha
 {
 	ESourceList *list;
         GSList *groups;
-	
+
         list = e_source_list_new_for_gconf (client, path);
 	groups = e_source_list_peek_groups (list);
 
@@ -67,7 +67,7 @@ set_esource_props (const char *path, EAccount *a, GConfClient *client, const cha
 
 				if (a->source->auto_check) {
 					char *str = g_strdup_printf ("%d",a->source->auto_check_time);
-				
+
 					e_source_set_property (source, "refresh", str);
 					g_free (str);
 				} else
diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am
index 42b68c58ec..57b37fd522 100644
--- a/plugins/groupwise-features/Makefile.am
+++ b/plugins/groupwise-features/Makefile.am
@@ -2,7 +2,6 @@ INCLUDES =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/widgets/misc			\
-	-I$(top_srcdir)/camel                           \
 	-I$(top_builddir)/composer                      \
 	-I$(top_builddir)/mail                          \
 	$(EVOLUTION_MAIL_CFLAGS)			\
diff --git a/plugins/groupwise-features/addressbook-groupwise.c b/plugins/groupwise-features/addressbook-groupwise.c
index c5959249df..b6519c636e 100644
--- a/plugins/groupwise-features/addressbook-groupwise.c
+++ b/plugins/groupwise-features/addressbook-groupwise.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/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c
index bfe295447f..29c5ed2855 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.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/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c
index 4cee3919f4..3e7d522c19 100644
--- a/plugins/groupwise-features/junk-mail-settings.c
+++ b/plugins/groupwise-features/junk-mail-settings.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:
@@ -114,7 +114,7 @@ junk_mail_settings (EPopup *ep, EPopupItem *item, void *data)
 }
 
 static EPopupItem popup_items[] = {
-{ E_POPUP_ITEM, "50.emfv.05", N_("Junk Mail Settings..."), junk_mail_settings, NULL, NULL, 0, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY}
+	{ E_POPUP_ITEM, (gchar *) "50.emfv.05", (gchar *) N_("Junk Mail Settings..."), junk_mail_settings, NULL, NULL, 0, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY}
 };
 
 static void
diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c
index bff2abc35a..3d66a1c518 100644
--- a/plugins/groupwise-features/junk-settings.c
+++ b/plugins/groupwise-features/junk-settings.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:
@@ -48,7 +48,6 @@ static void free_all(JunkSettings *js);
 static void get_junk_list (JunkSettings *js);
 static void disable_clicked (GtkRadioButton *button, JunkSettings *js);
 static void enable_clicked (GtkRadioButton *button, JunkSettings *js);
-GType junk_settings_get_type (void);
 
 static GtkVBoxClass *parent_class = NULL;
 
@@ -243,24 +242,32 @@ commit_changes (JunkSettings *js)
 	if (E_IS_GW_CONNECTION (js->cnc)) {
 		if(js->flag_for_ok == 2 && js->enabled){  /* just turn off the bits*/
 			use_junk = use_pab = use_block = persistence = 0;
-			if (e_gw_connection_modify_junk_settings (js->cnc, use_junk, use_pab, use_block, persistence) == E_GW_CONNECTION_STATUS_OK);
+			if (e_gw_connection_modify_junk_settings (js->cnc, use_junk, use_pab, use_block, persistence) == E_GW_CONNECTION_STATUS_OK) {
+				;
+			}
 
 		}
 		if (js->flag_for_ok == 0 && !js->enabled) {
 			use_block = use_pab =0;
 			use_junk = 1;
 			persistence = 14; /* We are setting the default persistence*/
-			if (e_gw_connection_modify_junk_settings (js->cnc, use_junk, use_pab, use_block, persistence) == E_GW_CONNECTION_STATUS_OK);
+			if (e_gw_connection_modify_junk_settings (js->cnc, use_junk, use_pab, use_block, persistence) == E_GW_CONNECTION_STATUS_OK) {
+				;
+			}
 		}
 
 		while (new_list) {
 			entry = new_list->data;
-			if (e_gw_connection_create_junk_entry (js->cnc, entry->match, "email", "junk") == E_GW_CONNECTION_STATUS_OK);
+			if (e_gw_connection_create_junk_entry (js->cnc, entry->match, "email", "junk") == E_GW_CONNECTION_STATUS_OK) {
+				;
+			}
 			new_list = new_list->next;
 		}
 		while (remove_list) {
 			entry = remove_list->data;
-			if (e_gw_connection_remove_junk_entry (js->cnc, entry->id) == E_GW_CONNECTION_STATUS_OK);
+			if (e_gw_connection_remove_junk_entry (js->cnc, entry->id) == E_GW_CONNECTION_STATUS_OK) {
+				;
+			}
 			remove_list = remove_list->next;
 		}
 
diff --git a/plugins/groupwise-features/junk-settings.h b/plugins/groupwise-features/junk-settings.h
index 9e3f60ce1a..43322de018 100644
--- a/plugins/groupwise-features/junk-settings.h
+++ b/plugins/groupwise-features/junk-settings.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/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c
index 928a780124..cf039931a5 100644
--- a/plugins/groupwise-features/mail-retract.c
+++ b/plugins/groupwise-features/mail-retract.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:
@@ -50,8 +50,8 @@ static void retract_mail_settings (EPopup *ep, EPopupItem *item, void *data)
 	if (cnc && E_IS_GW_CONNECTION(cnc)) {
 		id = (char *)item->user_data;
 
-		confirm_dialog = gtk_dialog_new_with_buttons (_("Message Retract"), NULL, 
-				GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, 
+		confirm_dialog = gtk_dialog_new_with_buttons (_("Message Retract"), NULL,
+				GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
 				GTK_STOCK_YES, GTK_RESPONSE_YES,
 				GTK_STOCK_NO, GTK_RESPONSE_NO, NULL);
 
@@ -78,13 +78,13 @@ static void retract_mail_settings (EPopup *ep, EPopupItem *item, void *data)
 				gtk_dialog_run (GTK_DIALOG(dialog));
 				gtk_widget_destroy (dialog);
 			}
-		} 
+		}
 	}
 }
 
 static EPopupItem popup_items[] = {
-{ E_POPUP_BAR,  "20.emfv.03" },
-{ E_POPUP_ITEM, "20.emfv.04", N_("Retract Mail"), retract_mail_settings, NULL, NULL, 0, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY}
+	{ E_POPUP_BAR,  (gchar *) "20.emfv.03" },
+	{ E_POPUP_ITEM, (gchar *) "20.emfv.04", (gchar *) N_("Retract Mail"), retract_mail_settings, NULL, NULL, 0, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY}
 };
 
 static void popup_free (EPopup *ep, GSList *items, void *data)
diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c
index 0e0663c801..7954f9e1a4 100644
--- a/plugins/groupwise-features/mail-send-options.c
+++ b/plugins/groupwise-features/mail-send-options.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/plugins/groupwise-features/mail-send-options.h b/plugins/groupwise-features/mail-send-options.h
index 943614e995..71cacbff01 100644
--- a/plugins/groupwise-features/mail-send-options.h
+++ b/plugins/groupwise-features/mail-send-options.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/plugins/groupwise-features/org-gnome-process-meeting.error.xml b/plugins/groupwise-features/org-gnome-process-meeting.error.xml
new file mode 100644
index 0000000000..82bf25b0d3
--- /dev/null
+++ b/plugins/groupwise-features/org-gnome-process-meeting.error.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<error-list domain="org.gnome.evolution.process_meeting">
+
+<error id="recurrence-accept" type="question" default="GTK_RESPONSE_YES">
+<_primary>This is a recurring meeting</_primary>
+<!--Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting") -->
+<_secondary>Would you like to accept it?</_secondary>
+ <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+ <button label="This instance" response="GTK_RESPONSE_NO"/>
+ <button label="All instances" response="GTK_RESPONSE_YES"/>
+</error>
+
+<error id="recurrence-decline" type="question" default="GTK_RESPONSE_YES">
+<_primary>This is a recurring meeting</_primary>
+<!--Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting") -->
+<_secondary>Would you like to decline it?</_secondary>
+ <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+ <button label="This instance" response="GTK_RESPONSE_NO"/>
+ <button label="All instances" response="GTK_RESPONSE_YES"/>
+</error>
+
+<error id="resend" type="question" default="GTK_RESPONSE_YES">
+<_primary>Do you want to resend the meeting ?</_primary>
+<_secondary>This will create a new meeting using the existing meeting details.</_secondary>
+ <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+ <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
+</error>
+
+<error id="resend-recurrence" type="question" default="GTK_RESPONSE_YES">
+<_primary>Do you want to resend the recurring meeting ?</_primary>
+<_secondary>This will create a new meeting with the existing meeting details. The recurrence rule needs to be re-entered.</_secondary>
+ <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+ <button label="This instance" response="GTK_RESPONSE_NO"/>
+ <button label="All instances" response="GTK_RESPONSE_YES"/>
+</error>
+
+<error id="resend-retract" type="question" default="GTK_RESPONSE_YES">
+<_primary>Do you want to retract the original item ?</_primary>
+<_secondary>The original will be removed from the recipient's mailbox.</_secondary>
+ <button stock="gtk-no" response="GTK_RESPONSE_NO"/>
+ <button stock="gtk-yes" response="GTK_RESPONSE_YES"/>
+</error>
+
+</error-list>
diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c
index bc046c0a05..67123decf4 100644
--- a/plugins/groupwise-features/process-meeting.c
+++ b/plugins/groupwise-features/process-meeting.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:
@@ -50,9 +50,9 @@ static void on_decline_meeting (EPopup *ep, EPopupItem *pitem, void *data);
 static void on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data);
 
 static EPopupItem popup_items[] = {
-{ E_POPUP_ITEM, "41.accept", N_("Accept"), on_accept_meeting, NULL, GTK_STOCK_APPLY, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_ACCEPTABLE},
-{ E_POPUP_ITEM, "42.accept", N_("Accept Tentatively"), on_accept_meeting_tentative, NULL, GTK_STOCK_DIALOG_QUESTION, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_ACCEPTABLE},
-{ E_POPUP_ITEM, "43.decline", N_("Decline"), on_decline_meeting, NULL, GTK_STOCK_CANCEL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING}
+	{ E_POPUP_ITEM, (gchar *) "41.accept", (gchar *) N_("Accept"), on_accept_meeting, NULL, (gchar *) GTK_STOCK_APPLY, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_ACCEPTABLE},
+	{ E_POPUP_ITEM, (gchar *) "42.accept", (gchar *) N_("Accept Tentatively"), on_accept_meeting_tentative, NULL, (gchar *) GTK_STOCK_DIALOG_QUESTION, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_ACCEPTABLE},
+	{ E_POPUP_ITEM, (gchar *) "43.decline", (gchar *) N_("Decline"), on_decline_meeting, NULL, (gchar *) GTK_STOCK_CANCEL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING}
 };
 
 static void
@@ -319,10 +319,10 @@ typedef struct {
 } ThreadData;
 
 static EPopupItem retract_popup_items[] = {
-{ E_POPUP_ITEM, "49.resend", N_("Rese_nd Meeting..."), on_resend_meeting, NULL, GTK_STOCK_EDIT, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING}
+	{ E_POPUP_ITEM, (gchar *) "49.resend", (gchar *) N_("Rese_nd Meeting..."), on_resend_meeting, NULL, (gchar *) GTK_STOCK_EDIT, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING}
 };
 
-void 
+void
 org_gnome_retract_resend (EPlugin *ep, ECalPopupTargetSelect *target)
 {
 	GSList *menus = NULL;
@@ -348,7 +348,7 @@ org_gnome_retract_resend (EPlugin *ep, ECalPopupTargetSelect *target)
 
 	if (! g_strrstr (uri, "groupwise://"))
 		return ;
-	
+
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 
@@ -394,7 +394,7 @@ add_retract_data (ECalComponent *comp, const char *retract_comment, CalObjModTyp
 	icalcomponent_add_property (icalcomp, icalprop);
 }
 
-static void 
+static void
 free_thread_data (ThreadData *data)
 {
 	if (data == NULL)
@@ -420,10 +420,10 @@ retract_object (gpointer val)
 	GError *error = NULL;
 
 	add_retract_data (data->comp, NULL, data->mod);
-	
+
 	icalcomp = e_cal_component_get_icalcomponent (data->comp);
 	icalcomponent_set_method (icalcomp, ICAL_METHOD_CANCEL);
-	
+
 	if (!e_cal_send_objects (data->client, icalcomp, &users,
 						&mod_comp, &error))	{
 		/* FIXME report error  */
@@ -434,15 +434,15 @@ retract_object (gpointer val)
 
 	if (mod_comp)
 		icalcomponent_free (mod_comp);
-				
+
 	if (users) {
 		g_list_foreach (users, (GFunc) g_free, NULL);
 		g_list_free (users);
 	}
-	
+
 	rid = e_cal_component_get_recurid_as_string (data->comp);
 	e_cal_component_get_uid (data->comp, &uid);
-			
+
 	if (!e_cal_remove_object_with_mod (data->client, uid,
 				rid, data->mod, &error)) {
 		g_warning ("Unable to remove the item \n");
@@ -461,7 +461,7 @@ object_created_cb (CompEditor *ce, gpointer data)
 	GThread *thread = NULL;
 	int response;
 	GError *error = NULL;
-	
+
 	gtk_widget_hide (GTK_WIDGET (ce));
 
 	response = e_error_run (NULL, "org.gnome.evolution.process_meeting:resend-retract", NULL);
@@ -507,18 +507,18 @@ on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data)
 
 		response = e_error_run (NULL, msg, NULL);
 		if (response == GTK_RESPONSE_YES) {
-			mod = CALOBJ_MOD_ALL;	
+			mod = CALOBJ_MOD_ALL;
 		} else if (response == GTK_RESPONSE_CANCEL) {
 			g_object_unref (comp);
 			return;
 		}
-		
+
 		data = g_new0 (ThreadData, 1);
 		data->client = g_object_ref (event->comp_data->client);
 		data->comp = comp;
 		data->mod = mod;
-		
-		if (resend) 
+
+		if (resend)
 		{
 			guint flags = 0;
 			char *new_uid = NULL;
@@ -535,7 +535,7 @@ on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data)
 			e_cal_component_set_uid (new_comp, new_uid);
 			icalcomp = icalcomponent_new_clone (e_cal_component_get_icalcomponent (new_comp));
 			ce = e_calendar_view_open_event_with_flags (cal_view, data->client, icalcomp, flags);
-			
+
 			g_signal_connect (ce, "object_created", G_CALLBACK (object_created_cb), data);
 			g_object_unref (new_comp);
 			g_free (new_uid);
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index 012a0df6e1..94435bf983 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.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:
@@ -178,7 +178,8 @@ proxy_login_new (void)
 static int
 proxy_get_password (EAccount *account, char **user_name, char **password)
 {
-	char *uri, *failed_auth, *key, *prompt;
+	const gchar *failed_auth;
+	char *uri, *key, *prompt;
 	CamelURL *url;
 	const char *poa_address, *use_ssl = NULL, *soap_port;
 
@@ -222,7 +223,8 @@ proxy_login_get_cnc (EAccount *account, GtkWindow *password_dlg_parrent)
 {
 	EGwConnection *cnc;
 	CamelURL *url;
-	char *uri = NULL, *failed_auth = NULL, *key = NULL, *prompt = NULL, *password = NULL;
+	const gchar *failed_auth;
+	char *uri = NULL, *key = NULL, *prompt = NULL, *password = NULL;
 	const char *use_ssl = NULL, *soap_port;
 	gboolean remember;
 
@@ -508,7 +510,7 @@ static EPopupItem popup_items[] = {
 /* To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
  * feature by which one person can send/read mails/appointments using another person's identity
  * without knowing his password, for example if that other person is on vacation */
-{ E_POPUP_ITEM, "20.emc.04", N_("_Proxy Login..."), org_gnome_proxy_account_login, NULL, NULL, 0, EM_POPUP_FOLDER_STORE }
+	{ E_POPUP_ITEM, (gchar *) "20.emc.04", (gchar *) N_("_Proxy Login..."), org_gnome_proxy_account_login, NULL, NULL, 0, EM_POPUP_FOLDER_STORE }
 };
 
 static void
diff --git a/plugins/groupwise-features/proxy-login.h b/plugins/groupwise-features/proxy-login.h
index b36d31563b..24717f8cc7 100644
--- a/plugins/groupwise-features/proxy-login.h
+++ b/plugins/groupwise-features/proxy-login.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/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index 60be390eb3..7ab0095dbf 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.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:
@@ -459,7 +459,8 @@ static EGwConnection *
 proxy_get_cnc (EAccount *account, GtkWindow *parent_window)
 {
 	EGwConnection *cnc;
-	char *uri, *failed_auth, *key, *prompt, *password = NULL;
+	const gchar *failed_auth;
+	char *uri, *key, *prompt, *password = NULL;
 	CamelURL *url;
 	const char *poa_address, *use_ssl, *soap_port;
 	gboolean remember;
diff --git a/plugins/groupwise-features/proxy.h b/plugins/groupwise-features/proxy.h
index 8c8d30368c..c2bd933db4 100644
--- a/plugins/groupwise-features/proxy.h
+++ b/plugins/groupwise-features/proxy.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:
@@ -52,7 +52,6 @@ struct _proxyDialogClass {
 
 GType proxy_dialog_get_type (void);
 proxyDialog *proxy_dialog_new (void);
-void proxy_commit(GtkWidget *button, EConfigHookItemFactoryData *data);
 GtkWidget * org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data);
 static void proxy_add_account (GtkWidget *button, EAccount *account);
 static void proxy_remove_account (GtkWidget *button, EAccount *account);
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index ed8e6093a2..33f1dd2cb4 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.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:
@@ -55,7 +55,8 @@ static EGwConnection *
 get_cnc (GtkWindow *parent_window)
 {
 	EGwConnection *cnc;
-	char *uri, *failed_auth, *key, *prompt, *password = NULL;
+	const gchar *failed_auth;
+	char *uri, *key, *prompt, *password = NULL;
 	CamelURL *url;
 	const char *poa_address, *use_ssl, *soap_port;
 	gboolean remember;
@@ -393,7 +394,9 @@ get_source (ESourceList *list)
 }
 
 static void
-add_return_value (EGwSendOptionsReturnNotify track, ESource *source, char *notify)
+add_return_value (EGwSendOptionsReturnNotify track,
+                  ESource *source,
+                  const gchar *notify)
 {
 	char *value;
 
diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c
index 3a850b2a55..74ca71fbb4 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.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:
@@ -337,7 +337,7 @@ new_folder_response (EMFolderSelector *emfs, int response, EMFolderTreeModel *mo
 }
 
 static EPopupItem popup_items[] = {
-{ E_POPUP_ITEM, "20.emc.001", N_("New _Shared Folder..."), create_shared_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }
+	{ E_POPUP_ITEM, (gchar *) "20.emc.001", (gchar *) N_("New _Shared Folder..."), create_shared_folder, NULL, (gchar *) "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }
 };
 
 static void
@@ -497,7 +497,7 @@ get_cnc (CamelStore *store)
 }
 
 gchar *
-get_container_id(EGwConnection *cnc, gchar *fname)
+get_container_id(EGwConnection *cnc, const gchar *fname)
 {
 	GList *container_list = NULL;
 	gchar *id = NULL;
diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c
index 9b3062b1c3..382cf75124 100644
--- a/plugins/groupwise-features/share-folder.c
+++ b/plugins/groupwise-features/share-folder.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:
@@ -49,7 +49,6 @@ static void free_user_node(EShUsers *user);
 static void free_node(SharedUser *user);
 static void free_all(ShareFolder *sf);
 static SharedUser * find_node(GList *list, gchar *email);
-static void free_all(ShareFolder *sf);
 static void get_container_list (ShareFolder *sf);
 static void user_selected(GtkTreeSelection *selection, ShareFolder *sf);
 static void not_shared_clicked (GtkRadioButton *button, ShareFolder *sf);
@@ -58,7 +57,6 @@ static void add_clicked(GtkButton *button, ShareFolder *sf);
 static void remove_clicked(GtkButton *button, ShareFolder *sf);
 static void not_ok_clicked(GtkButton *button, ShareFolder *sf);
 static void not_cancel_clicked(GtkButton *button, GtkWidget *window);
-static void not_cancel_clicked(GtkButton *button, GtkWidget *window);
 static void share_folder_construct (ShareFolder *sf);
 GType share_folder_get_type (void);
 
@@ -453,18 +451,24 @@ share_folder (ShareFolder *sf)
 
 		} else {
 			if (new_list) {
-				if (e_gw_connection_share_folder (sf->cnc, sf->container_id, new_list, sf->sub, sf->mesg, 0) == E_GW_CONNECTION_STATUS_OK);
+				if (e_gw_connection_share_folder (sf->cnc, sf->container_id, new_list, sf->sub, sf->mesg, 0) == E_GW_CONNECTION_STATUS_OK) {
+					;
+				}
 			}
 
 			if (update_list) {
 				sf->sub = "Shared Folder rights updated";
 
-				if (e_gw_connection_share_folder (sf->cnc, sf->container_id, update_list, sf->sub, sf->mesg, 2) == E_GW_CONNECTION_STATUS_OK);
+				if (e_gw_connection_share_folder (sf->cnc, sf->container_id, update_list, sf->sub, sf->mesg, 2) == E_GW_CONNECTION_STATUS_OK) {
+					;
+				}
 			}
 		}
 		if (remove_list) {
 			sf->sub = "Shared Folder removed";
-			if (e_gw_connection_share_folder (sf->cnc, sf->container_id, remove_list, sf->sub, sf->mesg, 1) == E_GW_CONNECTION_STATUS_OK);
+			if (e_gw_connection_share_folder (sf->cnc, sf->container_id, remove_list, sf->sub, sf->mesg, 1) == E_GW_CONNECTION_STATUS_OK) {
+				;
+			}
 		}
 
 	}
diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h
index 3acf595053..fadf37bcfb 100644
--- a/plugins/groupwise-features/share-folder.h
+++ b/plugins/groupwise-features/share-folder.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:
@@ -93,7 +93,7 @@ struct _ShareFolder {
 	gboolean is_shared;
 	EGwConnection *cnc;
 	gchar *container_id;
-	gchar *sub;
+	const gchar *sub;
 	gchar *mesg;
 	GList *container_list;
 	GtkTreeIter iter;
@@ -109,7 +109,7 @@ struct _ShareFolderClass {
 GType share_folderget_type (void);
 struct _ShareFolder * share_folder_new (EGwConnection *ccnc, gchar *id);
 void share_folder(struct _ShareFolder *sf);
-gchar * get_container_id (EGwConnection *cnc, gchar *fname);
+gchar * get_container_id (EGwConnection *cnc, const gchar *fname);
 EGwConnection * get_cnc (CamelStore *store);
 
 #ifdef __cplusplus
diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c
index 65b66962c5..a465752c95 100644
--- a/plugins/groupwise-features/status-track.c
+++ b/plugins/groupwise-features/status-track.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:
@@ -238,7 +238,7 @@ track_status (EPopup *ep, EPopupItem *item, void *data)
 }
 
 static EPopupItem popup_items[] = {
-{ E_POPUP_ITEM, "20.emfv.02", N_("Track Message Status..."), track_status, NULL, NULL, 0, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY}
+	{ E_POPUP_ITEM, (gchar * ) "20.emfv.02", (gchar *) N_("Track Message Status..."), track_status, NULL, NULL, 0, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY}
 };
 
 static void
diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c
index ee40a7bdb7..1094bec34b 100644
--- a/plugins/hula-account-setup/camel-hula-listener.c
+++ b/plugins/hula-account-setup/camel-hula-listener.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/plugins/hula-account-setup/camel-hula-listener.h b/plugins/hula-account-setup/camel-hula-listener.h
index 3dfdff3b2b..9a0c3642eb 100644
--- a/plugins/hula-account-setup/camel-hula-listener.h
+++ b/plugins/hula-account-setup/camel-hula-listener.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/plugins/hula-account-setup/hula-account-setup.c b/plugins/hula-account-setup/hula-account-setup.c
index 6518d100c7..84a7a4127c 100644
--- a/plugins/hula-account-setup/hula-account-setup.c
+++ b/plugins/hula-account-setup/hula-account-setup.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/plugins/imap-features/Makefile.am b/plugins/imap-features/Makefile.am
index b0f34f1ed7..cf7dbd79c9 100644
--- a/plugins/imap-features/Makefile.am
+++ b/plugins/imap-features/Makefile.am
@@ -1,7 +1,6 @@
 INCLUDES =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/mail				\
-	-I$(top_srcdir)/libedataserver			\
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(CAMEL_IMAP_CFLAGS)				\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c
index f3fb94967d..7fa7d4685d 100644
--- a/plugins/imap-features/imap-headers.c
+++ b/plugins/imap-features/imap-headers.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:
@@ -259,7 +259,7 @@ org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data)
 	GtkTreeViewColumn *column;
 	GtkTreeIter first, iter;
 	gboolean use_imap = g_getenv ("USE_IMAP") != NULL;
-	
+
 	ui = g_new0 (EPImapFeaturesData, 1);
 
 	target_account = (EMConfigTargetAccount *)data->config->target;
diff --git a/plugins/ipod-sync/evolution-ipod-sync.c b/plugins/ipod-sync/evolution-ipod-sync.c
index e0f4246220..487d9f14c5 100644
--- a/plugins/ipod-sync/evolution-ipod-sync.c
+++ b/plugins/ipod-sync/evolution-ipod-sync.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/plugins/ipod-sync/evolution-ipod-sync.h b/plugins/ipod-sync/evolution-ipod-sync.h
index 6fbf1e985c..662b16eff0 100644
--- a/plugins/ipod-sync/evolution-ipod-sync.h
+++ b/plugins/ipod-sync/evolution-ipod-sync.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/plugins/ipod-sync/format-handler.h b/plugins/ipod-sync/format-handler.h
index d061f4ce86..145bcb7d6d 100644
--- a/plugins/ipod-sync/format-handler.h
+++ b/plugins/ipod-sync/format-handler.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/plugins/ipod-sync/ical-format.c b/plugins/ipod-sync/ical-format.c
index 576c8651aa..49c042f705 100644
--- a/plugins/ipod-sync/ical-format.c
+++ b/plugins/ipod-sync/ical-format.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:
@@ -99,7 +99,7 @@ do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSourc
 
 		if (stream)
 			g_object_unref (stream);
-	} 
+	}
 
 	if (error) {
 		display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (target->selector)), error->message);
diff --git a/plugins/ipod-sync/ipod-sync.c b/plugins/ipod-sync/ipod-sync.c
index f2d597becc..1f589bfdc0 100644
--- a/plugins/ipod-sync/ipod-sync.c
+++ b/plugins/ipod-sync/ipod-sync.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:
@@ -256,7 +256,7 @@ org_gnome_sync_memos (EPlugin *ep, ECalPopupTargetSource *target)
 {
 	if (!ipod_check_status(FALSE))
 		return;
-	
+
 	destination_save_cal (ep, target, E_CAL_SOURCE_TYPE_JOURNAL);
 }
 
diff --git a/plugins/ipod-sync/ipod.c b/plugins/ipod-sync/ipod.c
index 26e3d49475..5f399f23e6 100644
--- a/plugins/ipod-sync/ipod.c
+++ b/plugins/ipod-sync/ipod.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/plugins/ipod-sync/sync.c b/plugins/ipod-sync/sync.c
index 42f3bdfa0b..8fe83d1b5a 100644
--- a/plugins/ipod-sync/sync.c
+++ b/plugins/ipod-sync/sync.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)
@@ -425,7 +425,7 @@ export_memos (void)
 	g_string_free (data, TRUE);
 
 	free_uri_list (uris);
-	
+
 	pulse ();
 }
 
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 04049ef6d5..293c4e3fca 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.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:
@@ -629,8 +629,8 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 		e_cal_free_object_list (objects);
 	}
 
-
-	if (!pitip->current_ecal && e_cal_get_object (ecal, fd->uid, fd->rid, &icalcomp, NULL)) {
+	/* search for a master object if the detached object doesn't exist in the calendar */
+	if (!pitip->current_ecal && (e_cal_get_object (ecal, fd->uid, fd->rid, &icalcomp, NULL) || (fd->rid && e_cal_get_object (ecal, fd->uid, NULL, &icalcomp, NULL)))) {
 		if ((pitip->method == ICAL_METHOD_PUBLISH || pitip->method ==  ICAL_METHOD_REQUEST) &&
 		    (icalcomponent_get_first_component (icalcomp, ICAL_VALARM_COMPONENT) ||
 		    icalcomponent_get_first_component (icalcomp, ICAL_XAUDIOALARM_COMPONENT) ||
@@ -695,7 +695,7 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 
 		itip_view_remove_lower_info_item (ITIP_VIEW (pitip->view), pitip->progress_info_id);
 		pitip->progress_info_id = 0;
-		
+
 		/*
 		 * Only allow replies if backend doesn't do that automatically.
                  * Only enable it for forwarded invitiations (PUBLISH) or direct
@@ -834,7 +834,7 @@ find_server (struct _itip_puri *pitip, ECalComponent *comp)
 
 	if (current_source) {
 		l = sources_conflict;
-		
+
 		pitip->progress_info_id = itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS,
 				_("Opening the calendar. Please wait.."));
 	} else {
@@ -1243,8 +1243,8 @@ remove_delegate (struct _itip_puri *pitip, const char *delegate, const char *del
 
 }
 
-static void 
-update_x (ECalComponent *pitip_comp, ECalComponent *comp) 
+static void
+update_x (ECalComponent *pitip_comp, ECalComponent *comp)
 {
 	icalcomponent *itip_icalcomp = e_cal_component_get_icalcomponent (pitip_comp);
 	icalcomponent *icalcomp = e_cal_component_get_icalcomponent (comp);
@@ -1278,7 +1278,9 @@ update_attendee_status (struct _itip_puri *pitip)
 	org_icalcomp = e_cal_component_get_icalcomponent (pitip->comp);
 
 	rid = e_cal_component_get_recurid_as_string (pitip->comp);
-	if (e_cal_get_object (pitip->current_ecal, uid, rid, &icalcomp, NULL)) {
+
+	/* search for a master object if the detached object doesn't exist in the calendar */
+	if (e_cal_get_object (pitip->current_ecal, uid, rid, &icalcomp, NULL) || (rid && e_cal_get_object (pitip->current_ecal, uid, NULL, &icalcomp, NULL))) {
 		GSList *attendees;
 
 		comp = e_cal_component_new ();
@@ -2051,7 +2053,7 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
 	gboolean have_alarms = FALSE;
 
 	info = (struct _itip_puri *) em_format_find_puri((EMFormat *)efh, pobject->classid);
-	
+
 	/* Accounts */
 	info->accounts = itip_addresses_get ();
 
@@ -2439,10 +2441,10 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target)
 
 	if (((CamelStreamMem *) mem)->buffer->len == 0)
 		puri->vcalendar = NULL;
-	else 
+	else
 		puri->vcalendar = g_strndup ((char *)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len);
 	camel_object_unref (mem);
-	
+
 
 	camel_stream_printf (target->stream, "<table border=0 width=\"100%%\" cellpadding=3><tr>");
 	camel_stream_printf (target->stream, "<td valign=top><object classid=\"%s\"></object></td><td width=100%% valign=top>", classid);
@@ -2585,8 +2587,9 @@ itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
 	gtk_box_pack_start (GTK_BOX (inner_vbox), label, FALSE, FALSE, 0);
 
-	if (!e_cal_get_sources (&source_list, E_CAL_SOURCE_TYPE_EVENT, NULL))
+	if (!e_cal_get_sources (&source_list, E_CAL_SOURCE_TYPE_EVENT, NULL)) {
 	    /* FIXME Error handling */;
+	}
 
 	scrolledwin = gtk_scrolled_window_new (NULL, NULL);
 
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 32fa3104cc..30dbe135cc 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.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:
@@ -737,7 +737,7 @@ set_info_items (GtkWidget *info_box, GSList *info_items)
 		}
 
 		label = gtk_label_new (item->message);
-		gtk_label_set_selectable (GTK_LABEL (label), TRUE);		
+		gtk_label_set_selectable (GTK_LABEL (label), TRUE);
 		gtk_widget_show (label);
 		gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 6);
 
@@ -780,7 +780,10 @@ button_clicked_cb (GtkWidget *widget, gpointer data)
 }
 
 static void
-set_one_button (ItipView *view, char *label, char *stock_id, ItipViewResponse response)
+set_one_button (ItipView *view,
+                const gchar *label,
+                const gchar *stock_id,
+                ItipViewResponse response)
 {
 	ItipViewPrivate *priv;
 	GtkWidget *button;
@@ -1031,7 +1034,7 @@ itip_view_init (ItipView *view)
 	priv->start_header = gtk_label_new (_("Start time:"));
 	priv->start_label = gtk_label_new (NULL);
 	gtk_label_set_selectable (GTK_LABEL (priv->start_header), TRUE);
-	gtk_label_set_selectable (GTK_LABEL (priv->start_label), TRUE);	
+	gtk_label_set_selectable (GTK_LABEL (priv->start_label), TRUE);
 	gtk_misc_set_alignment (GTK_MISC (priv->start_header), 0, 0.5);
 	gtk_misc_set_alignment (GTK_MISC (priv->start_label), 0, 0.5);
 	gtk_widget_show (priv->start_header);
@@ -1075,7 +1078,7 @@ itip_view_init (ItipView *view)
 
 	/* Description */
 	priv->description_label = gtk_label_new (NULL);
-	gtk_label_set_selectable (GTK_LABEL (priv->description_label), TRUE);	
+	gtk_label_set_selectable (GTK_LABEL (priv->description_label), TRUE);
 	gtk_label_set_line_wrap (GTK_LABEL (priv->description_label), TRUE);
 	gtk_misc_set_alignment (GTK_MISC (priv->description_label), 0, 0.5);
 	gtk_box_pack_start (GTK_BOX (vbox), priv->description_label, FALSE, FALSE, 0);
@@ -1109,12 +1112,12 @@ itip_view_init (ItipView *view)
 	gtk_box_pack_start (GTK_BOX (priv->rsvp_box), hbox, FALSE, FALSE, 0);
 
 	label = gtk_label_new (NULL);
-	gtk_label_set_selectable (GTK_LABEL (label), TRUE);	
+	gtk_label_set_selectable (GTK_LABEL (label), TRUE);
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
 	priv->rsvp_comment_header = gtk_label_new (_("Comment:"));
-	gtk_label_set_selectable (GTK_LABEL (priv->rsvp_comment_header), TRUE);	
+	gtk_label_set_selectable (GTK_LABEL (priv->rsvp_comment_header), TRUE);
 	gtk_widget_set_sensitive (priv->rsvp_comment_header, FALSE);
 	gtk_widget_show (priv->rsvp_comment_header);
 	gtk_box_pack_start (GTK_BOX (hbox), priv->rsvp_comment_header, FALSE, FALSE, 0);
@@ -2171,8 +2174,8 @@ void
 itip_view_set_show_free_time_check (ItipView *view, gboolean show)
 {
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	if (show)
 		gtk_widget_show (view->priv->free_time_check);
 	else {
@@ -2193,8 +2196,8 @@ void
 itip_view_set_show_keep_alarm_check (ItipView *view, gboolean show)
 {
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	if (show)
 		gtk_widget_show (view->priv->keep_alarm_check);
 	else
@@ -2216,8 +2219,8 @@ void
 itip_view_set_show_inherit_alarm_check (ItipView *view, gboolean show)
 {
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	if (show)
 		gtk_widget_show (view->priv->inherit_alarm_check);
 	else {
diff --git a/plugins/itip-formatter/itip-view.h b/plugins/itip-formatter/itip-view.h
index 736119ae04..88d01204fb 100644
--- a/plugins/itip-formatter/itip-view.h
+++ b/plugins/itip-formatter/itip-view.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/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index 5bb65cef18..466648d80f 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.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:
@@ -398,8 +398,8 @@ do_properties (GtkMenuItem *item, gpointer user_data)
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
 
 	dialog = gtk_dialog_new_with_buttons (_("Mail Notification Properties"),
-						NULL, 
-						GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, 
+						NULL,
+						GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
 						GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
 						NULL);
 
@@ -427,7 +427,7 @@ popup_menu_status (GtkStatusIcon *status_icon, guint button, guint activate_time
 	#endif
 	gtk_widget_show (item);
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-	
+
 	item = gtk_separator_menu_item_new ();
 	gtk_widget_show (item);
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
@@ -443,11 +443,11 @@ popup_menu_status (GtkStatusIcon *status_icon, guint button, guint activate_time
 }
 
 #ifdef HAVE_LIBNOTIFY
-static void 
+static void
 notifyActionCallback (NotifyNotification *n, gchar *label, gpointer a)
 {
 	g_static_mutex_lock (&mlock);
-	
+
 	gtk_status_icon_set_visible (status_icon, FALSE);
 	g_object_unref (status_icon);
 
@@ -457,7 +457,7 @@ notifyActionCallback (NotifyNotification *n, gchar *label, gpointer a)
 	}
 
 	status_icon = NULL;
-	status_count = 0;	
+	status_count = 0;
 	g_static_mutex_unlock (&mlock);
 }
 #endif
@@ -833,11 +833,11 @@ get_cfg_widget (void)
 	gtk_widget_show (check);
 	gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, FALSE, 0);
 
-#ifdef HAVE_DBUS	
+#ifdef HAVE_DBUS
 	cfg = get_config_widget_dbus ();
 	if (cfg)
 		gtk_box_pack_start (GTK_BOX (vbox), cfg, FALSE, FALSE, 0);
-#endif 
+#endif
 	cfg = get_config_widget_status ();
 	if (cfg)
 		gtk_box_pack_start (GTK_BOX (vbox), cfg, FALSE, FALSE, 0);
@@ -868,7 +868,7 @@ org_gnome_mail_new_notify (EPlugin *ep, EMEventTargetFolder *t)
 
 	g_static_mutex_lock (&mlock);
 
-#ifdef HAVE_DBUS	
+#ifdef HAVE_DBUS
 	if (is_part_enabled (GCONF_KEY_ENABLED_DBUS))
 		new_notify_dbus (t);
 #endif
@@ -908,7 +908,7 @@ int
 e_plugin_lib_enable (EPluginLib *ep, int enable)
 {
 	if (enable) {
-#ifdef HAVE_DBUS		
+#ifdef HAVE_DBUS
 		if (is_part_enabled (GCONF_KEY_ENABLED_DBUS))
 			enable_dbus (enable);
 #endif
@@ -922,7 +922,7 @@ e_plugin_lib_enable (EPluginLib *ep, int enable)
 	} else {
 #ifdef HAVE_DBUS
 		enable_dbus (enable);
-#endif 
+#endif
 		enable_status (enable);
 		enable_sound (enable);
 
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index 44a7d8b868..5560a4cabd 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.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:
@@ -372,7 +372,7 @@ do_mail_to_event (AsyncData *data)
 		dt.tzid = NULL;
 
 		tt2 = tt;
-		icaltime_adjust (&tt2, 1, 0, 0, 0);		
+		icaltime_adjust (&tt2, 1, 0, 0, 0);
 		dt2.value = &tt2;
 		dt2.tzid = NULL;
 
@@ -581,7 +581,7 @@ mail_to_event (ECalSourceType source_type, gboolean with_attendees, GPtrArray *u
 			}
 		}
 	}
-	
+
 	if (!source) {
 		GtkWidget *dialog;
 
diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c
index 9dd5c1c57e..7dc1895389 100644
--- a/plugins/mailing-list-actions/mailing-list-actions.c
+++ b/plugins/mailing-list-actions/mailing-list-actions.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/plugins/mark-all-read/Makefile.am b/plugins/mark-all-read/Makefile.am
index dbd18dce83..f3db1bdc6c 100644
--- a/plugins/mark-all-read/Makefile.am
+++ b/plugins/mark-all-read/Makefile.am
@@ -1,6 +1,5 @@
 INCLUDES =						\
 	-I$(top_srcdir)\
-	-I$(top_srcdir)/camel                           \
 	$(EVOLUTION_MAIL_CFLAGS)
 
 @EVO_PLUGIN_RULE@
diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c
index 618c6b63f6..8b62add8e7 100644
--- a/plugins/mark-all-read/mark-all-read.c
+++ b/plugins/mark-all-read/mark-all-read.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/plugins/mono/mono-plugin.c b/plugins/mono/mono-plugin.c
index 5dd92e8609..0bc95619ce 100644
--- a/plugins/mono/mono-plugin.c
+++ b/plugins/mono/mono-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/>
  *
  *
  * Authors:
@@ -108,18 +108,18 @@ epm_invoke(EPlugin *ep, const char *name, void *data)
 		if (p->klass) {
 			d(printf("looking up method '%s' in class\n", name));
 			/* class method */
-			
+
 			d = mono_method_desc_new(name, FALSE);
 			/*if (d == NULL) {
 				g_warning("Can't create method descriptor for '%s'", name);
 				return NULL;
 			}*/
-			
+
 			gpointer iter = NULL;
 			MonoMethod* mono_method;
 
 			d(printf ("\n\a About to get methods in klass\n\a"));
-			       
+
 			while ((mono_method = mono_class_get_methods (p->klass, &iter))) {
 				g_print ("\n\a Method name is : <%s>\n\a", mono_method_get_name(mono_method));
 			}
diff --git a/plugins/mono/mono-plugin.h b/plugins/mono/mono-plugin.h
index 3c11072e83..9dd8facdb3 100644
--- a/plugins/mono/mono-plugin.h
+++ b/plugins/mono/mono-plugin.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/plugins/plugin-manager/plugin-manager.c b/plugins/plugin-manager/plugin-manager.c
index a23508d3c1..7a669668a7 100644
--- a/plugins/plugin-manager/plugin-manager.c
+++ b/plugins/plugin-manager/plugin-manager.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:
@@ -307,7 +307,7 @@ action_plugin_manager_cb (GtkAction *action,
 		GtkTreeIter iter;
 		GtkWidget *cfg_widget;
 
-		if (!g_getenv ("EVO_SHOW_ALL_PLUGINS")) { 
+		if (!g_getenv ("EVO_SHOW_ALL_PLUGINS")) {
 			/* hide ourselves always */
 			if (ep->flags & E_PLUGIN_FLAGS_SYSTEM_PLUGIN)
 				continue;
@@ -331,7 +331,7 @@ action_plugin_manager_cb (GtkAction *action,
 				    COL_PLUGIN_DATA, ep,
 				    COL_PLUGIN_CFG_WIDGET, cfg_widget,
 				    -1);
-				    
+
 	}
 
 	/* setup the treeview */
diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c
index ed4b6dc363..13453b20f1 100644
--- a/plugins/prefer-plain/prefer-plain.c
+++ b/plugins/prefer-plain/prefer-plain.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/plugins/profiler/profiler.c b/plugins/profiler/profiler.c
index 6f52759e82..08787fc1fc 100644
--- a/plugins/profiler/profiler.c
+++ b/plugins/profiler/profiler.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/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index 8cbf80eb50..4bfe66b41f 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -98,7 +98,7 @@ void org_credativ_evolution_readpst_cancel (EImport *ei, EImportTarget *target,
 int e_plugin_lib_enable (EPluginLib *ep, int enable);
 
 
-/* em-folder-selection-button.h is private, even though other internal evo plugins use it! 
+/* em-folder-selection-button.h is private, even though other internal evo plugins use it!
    so declare the functions here
    TODO: sort out whether this should really be private
 */
@@ -123,7 +123,7 @@ struct _PstImporter {
 	CamelException ex;
 
 	pst_file pst;
-	
+
 	CamelOperation *cancel;
 	CamelFolder *folder;
 	gchar *parent_uri;
@@ -152,7 +152,7 @@ org_credativ_evolution_readpst_supported (EPlugin *epl, EImportTarget *target)
 	}
 
 	s = (EImportTargetURI *)target;
-	
+
 	if (s->uri_src == NULL) {
 		return TRUE;
 	}
@@ -170,7 +170,7 @@ org_credativ_evolution_readpst_supported (EPlugin *epl, EImportTarget *target)
 		ret = n == sizeof (pst_signature) && memcmp (signature, pst_signature, sizeof (pst_signature)) == 0;
 		close (fd);
 	}
-	
+
 	return ret;
 }
 
@@ -214,8 +214,8 @@ folder_selected (EMFolderSelectionButton *button, EImportTargetURI *target)
 
 /**
  * Suggest a folder to import data into
- * @param target 
- * @return 
+ * @param target
+ * @return
  */
 static gchar*
 get_suggested_foldername (EImportTargetURI *target)
@@ -244,7 +244,7 @@ get_suggested_foldername (EImportTargetURI *target)
 	if (pst_init (&pst, filename) == 0) {
 		rootname = get_pst_rootname (&pst, filename);
 	}
-	
+
 	g_free (filename);
 
 	if (rootname != NULL) {
@@ -271,7 +271,7 @@ get_suggested_foldername (EImportTargetURI *target)
 				break;
 			}
 		}
-		
+
 		if (folder != NULL) {
 			pst_error_msg ("Error searching for an unused folder name. uri=%s", foldername);
 		}
@@ -301,17 +301,17 @@ org_credativ_evolution_readpst_getwidget (EImport *ei, EImportTarget *target, EI
 	gtk_toggle_button_set_active ((GtkToggleButton *) w, TRUE);
 	g_signal_connect (w, "toggled", G_CALLBACK (checkbox_mail_toggle_cb), target);
 	gtk_box_pack_start ((GtkBox *) hbox, w, FALSE, FALSE, 0);
-	
+
 	w = em_folder_selection_button_new (_("Select folder"), _("Select folder to import into"));
 	foldername = get_suggested_foldername ((EImportTargetURI *) target);
 	((EImportTargetURI *) target)->uri_dest = g_strdup (foldername);
 	em_folder_selection_button_set_selection ((EMFolderSelectionButton *) w, foldername);
 	g_signal_connect (w, "selected", G_CALLBACK (folder_selected), target);
 	gtk_box_pack_end ((GtkBox *) hbox, w, FALSE, FALSE, 0);
-	
+
 	w = gtk_label_new (_("Destination folder:"));
 	gtk_box_pack_end ((GtkBox *) hbox, w, FALSE, TRUE, 6);
-	
+
 	gtk_box_pack_start ((GtkBox *) framebox, hbox, FALSE, FALSE, 0);
 
 	/* Address book */
@@ -320,19 +320,19 @@ org_credativ_evolution_readpst_getwidget (EImport *ei, EImportTarget *target, EI
 	/*gtk_widget_set_sensitive ((GtkWidget *)w, FALSE);*/ /* Disable until implemented */
 	g_signal_connect (w, "toggled", G_CALLBACK (checkbox_addr_toggle_cb), target);
 	gtk_box_pack_start ((GtkBox *) framebox, w, FALSE, FALSE, 0);
-	
+
 	/* Appointments */
 	w = gtk_check_button_new_with_mnemonic (_("A_ppointments"));
 	gtk_toggle_button_set_active ((GtkToggleButton *) w, FALSE);
 	g_signal_connect (w, "toggled", G_CALLBACK (checkbox_appt_toggle_cb), target);
 	gtk_box_pack_start ((GtkBox *)framebox, w, FALSE, FALSE, 0);
-	
+
 	/* Tasks */
 	w = gtk_check_button_new_with_mnemonic (_("_Tasks"));
 	gtk_toggle_button_set_active ((GtkToggleButton *)w, FALSE);
 	g_signal_connect (w, "toggled", G_CALLBACK (checkbox_task_toggle_cb), target);
 	gtk_box_pack_start ((GtkBox *)framebox, w, FALSE, FALSE, 0);
-	
+
 	/* Journal */
 	w = gtk_check_button_new_with_mnemonic (_("_Journal entries"));
 	gtk_toggle_button_set_active ((GtkToggleButton *)w, FALSE);
@@ -360,24 +360,24 @@ open_ecal (ECalSourceType type, char *name)
 	ESource *primary;
 	ESourceList *source_list;
 	ECal *cal;
-	
+
 	if ((e_cal_get_sources (&source_list, type, NULL)) == 0) {
 		g_warning ("Could not get any sources of type %s.", name);
 		return NULL;
-	}		
-	
+	}
+
 	primary = e_source_list_peek_source_any (source_list);
-	
+
 	if ((cal = e_cal_new (primary, type)) == NULL) {
 		g_warning ("Could not create %s.", name);
 		g_object_unref (source_list);
 		return NULL;
 	}
-	
+
 	e_cal_open (cal, TRUE, NULL);
 	g_object_unref (primary);
 	g_object_unref (source_list);
-	
+
 	return cal;
 }
 
@@ -385,18 +385,18 @@ static void
 pst_import_import (PstImporter *m)
 {
 	CamelOperation *oldcancel = NULL;
-	
+
 	oldcancel = camel_operation_register (m->status);
-	
+
 	if (GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-addr"))) {
 		/* Hack - grab the first address book we can find
 		   TODO - add a selection mechanism in get_widget */
 		ESource *primary;
 		ESourceList *source_list;
-	
+
 		if (e_book_get_addressbooks (&source_list, NULL)) {
 			primary = e_source_list_peek_source_any (source_list);
-		
+
 			if ((m->addressbook = e_book_new (primary,NULL))) {
 				e_book_open (m->addressbook, TRUE, NULL);
 				g_object_unref (primary);
@@ -406,8 +406,8 @@ pst_import_import (PstImporter *m)
 			}
 		} else {
 			g_warning ("Could not get address books.");
-		}		
-	}	
+		}
+	}
 
 	if (GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-appt"))) {
 		m->calendar = open_ecal (E_CAL_SOURCE_TYPE_EVENT, "calendar");
@@ -420,10 +420,10 @@ pst_import_import (PstImporter *m)
 	if (GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-journal"))) {
 		m->journal = open_ecal (E_CAL_SOURCE_TYPE_JOURNAL, "journal");
 	}
-	
+
 	pst_import_file (m);
 
-/* FIXME: Crashes often in here.	
+/* FIXME: Crashes often in here.
 	if (m->addressbook) {
 		g_object_unref (m->addressbook);
 	}
@@ -478,7 +478,7 @@ pst_import_file (PstImporter *m)
 	}
 
 	camel_operation_progress_count (NULL, 2);
-	
+
 	if ((d_ptr = pst_getTopOfFolders (&m->pst, item)) == NULL) {
 		pst_error_msg ("Top of folders record not found. Cannot continue");
 		return;
@@ -505,7 +505,7 @@ pst_import_folders (PstImporter *m, pst_desc_ll *topitem)
 
 	/* Walk through folder tree */
 	while (d_ptr != NULL && (camel_operation_cancel_check (NULL) == FALSE)) {
-		
+
 		pst_process_item (m, d_ptr);
 
 		if (d_ptr->child != NULL) {
@@ -555,9 +555,9 @@ pst_process_item (PstImporter *m, pst_desc_ll *d_ptr)
 	if (item->message_store != NULL) {
 		pst_error_msg ("A second message_store has been found - ignored");
 		pst_freeItem (item);
-		return;		
+		return;
 	}
-	
+
 	if (item->folder != NULL) {
 		pst_process_folder (m, item);
 		camel_operation_start (NULL, _("Importing `%s'"), item->file_as);
@@ -567,7 +567,7 @@ pst_process_item (PstImporter *m, pst_desc_ll *d_ptr)
 		} else {
 			camel_operation_progress (NULL, 100);
 		}
-		
+
 		if (item->email != NULL &&
 			(item->type == PST_TYPE_NOTE || item->type == PST_TYPE_REPORT)) {
 
@@ -599,12 +599,12 @@ pst_process_item (PstImporter *m, pst_desc_ll *d_ptr)
 			}
 
 		}
-		
+
 		m->current_item++;
 	}
 
 	pst_freeItem (item);
-	
+
 	if (d_ptr->next == NULL) {
 		camel_operation_end (NULL);
 	}
@@ -660,7 +660,7 @@ pst_process_folder (PstImporter *m, pst_item *item)
 	gchar *uri;
 	g_free (m->folder_name);
 	g_free (m->folder_uri);
-	
+
 	if (item->file_as != NULL) {
 		m->folder_name = foldername_to_utf8 (item->file_as);
 	} else {
@@ -670,7 +670,7 @@ pst_process_folder (PstImporter *m, pst_item *item)
 
 	uri = g_strjoin ("/", m->parent_uri, m->folder_name, NULL);
 	m->folder_uri = uri;
-	
+
 	if (m->folder) {
 		camel_object_unref (m->folder);
 		m->folder = NULL;
@@ -721,7 +721,7 @@ pst_create_folder (PstImporter *m)
 	}
 
 	m->folder = mail_tool_uri_to_folder (m->folder_uri, CAMEL_STORE_FOLDER_CREATE, &m->base.ex);
-	
+
 }
 
 /**
@@ -757,7 +757,7 @@ attachment_to_part (PstImporter *m, pst_item_attach *attach)
 		char *buf = NULL;
 		size_t size;
 		size = pst_attach_to_mem (&m->pst, attach, &buf);
-		
+
 		camel_mime_part_set_content (part, (char*) buf, size, mimetype);
 		free(buf);
 	}
@@ -773,7 +773,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 	CamelMultipart *mp;
 	CamelMimePart *part;
 	CamelMessageInfo *info;
-	
+
 	if (m->folder == NULL) {
 		pst_create_folder (m);
 	}
@@ -784,7 +784,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 
 	if (item->email->subject != NULL) {
 		gchar *subj;
-		
+
 		subj = string_to_utf8 (item->email->subject->subj);
 		if (subj == NULL) {
 			g_warning ("Could not convert email subject to utf8: %s", item->email->subject->subj);
@@ -796,7 +796,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 	}
 
 	addr = camel_internet_address_new ();
-	
+
 	if (item->email->outlook_sender_name != NULL && item->email->outlook_sender != NULL) {
 		camel_internet_address_add (addr, item->email->outlook_sender_name, item->email->outlook_sender);
 	} else if (item->email->outlook_sender_name != NULL) {
@@ -807,7 +807,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 		/* Evo prints a warning if no from is set, so supply an empty address */
 		camel_internet_address_add (addr, "", "");
 	}
-	
+
 	camel_mime_message_set_from (msg, addr);
 	camel_object_unref (addr);
 
@@ -830,7 +830,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 			g_warning ("Error reading headers, skipped");
 
 	} else {
-	 
+
 		if (item->email->sentto_address != NULL) {
 			addr = camel_internet_address_new ();
 
@@ -849,9 +849,9 @@ pst_process_email (PstImporter *m, pst_item *item)
 			camel_object_unref (addr);
 		}
 	}
-	
+
 	mp = camel_multipart_new ();
-	
+
 	if (item->attach != NULL) {
 
 		camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (mp), "multipart/mixed");
@@ -909,7 +909,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 	} else if (item->email->body) {
 		camel_mime_part_set_content (CAMEL_MIME_PART (msg), item->email->body, strlen (item->email->body), "text/plain");
 	} else {
-		g_warning ("Email without body. Subject:%s", 
+		g_warning ("Email without body. Subject:%s",
 				(item->email->subject->subj ? item->email->subject->subj : "(empty)"));
 		camel_mime_part_set_content (CAMEL_MIME_PART (msg), "\n", 1, "text/plain");
 	}
@@ -925,7 +925,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 
 	if(item->email->flag && 0x08)
 		camel_message_info_set_flags (info, CAMEL_MESSAGE_DRAFT, ~0);
-	
+
 	camel_folder_append_message (m->folder, msg, info, NULL, &m->ex);
 	camel_message_info_free (info);
 	camel_object_unref (msg);
@@ -962,34 +962,34 @@ static void
 contact_set_address (EContact *contact, EContactField id, char *address, char *city, char *country, char *po_box, char *postal_code, char *state, char *street)
 {
 	EContactAddress *eaddress;
-	
+
 	if (address || city || country || po_box || postal_code || state || street) {
 		eaddress = g_new0 (EContactAddress, 1);
 		if (po_box) {
 			eaddress->po = g_strdup (po_box);
 		}
-		//eaddress->ext = 
-		
+		//eaddress->ext =
+
 		if (street) {
 			eaddress->street = g_strdup (street);
 		}
-		
+
 		if (city) {
 			eaddress->locality = g_strdup (city);
 		}
-		
+
 		if (state) {
 			eaddress->region = g_strdup (state);
 		}
-		
+
 		if (postal_code) {
 			eaddress->code = g_strdup (postal_code);
 		}
-		
+
 		if (country) {
 			eaddress->country = g_strdup (country);
 		}
-		
+
 		e_contact_set (contact, id, eaddress);
 	}
 }
@@ -1002,14 +1002,14 @@ contact_set_date (EContact *contact, EContactField id, FILETIME *date)
 		struct tm tm;
 		EContactDate *bday;
 		bday = e_contact_date_new ();
-		
+
 		t1 = fileTimeToUnixTime (date, 0);
 		gmtime_r (&t1, &tm);
-		
+
 		bday->year = tm.tm_year + 1900;
 		bday->month = tm.tm_mon + 1;
 		bday->day = tm.tm_mday;
-		
+
 		e_contact_set (contact, id, bday);
 	}
 }
@@ -1021,7 +1021,7 @@ pst_process_contact (PstImporter *m, pst_item *item)
 	EContact *ec;
 	c = item->contact;
 	GString *notes;
-	
+
 	notes = g_string_sized_new (2048);
 
 	ec = e_contact_new ();
@@ -1055,27 +1055,27 @@ pst_process_contact (PstImporter *m, pst_item *item)
 	} else {
 		contact_set_string (ec, E_CONTACT_FULL_NAME, c->fullname);
 	}
-	
+
 	/* unknown_field (ec, notes, "initials", c->initials); */
-	
+
 	contact_set_string (ec, E_CONTACT_NICKNAME, c->nickname);
-	
+
 	contact_set_string (ec, E_CONTACT_ORG, c->company_name);
 	contact_set_string (ec, E_CONTACT_ORG_UNIT, c->department);
 	contact_set_string (ec, E_CONTACT_TITLE, c->job_title);
 
-	contact_set_address (ec,E_CONTACT_ADDRESS_WORK, 
-			    c->business_address, c->business_city, c->business_country, 
+	contact_set_address (ec,E_CONTACT_ADDRESS_WORK,
+			    c->business_address, c->business_city, c->business_country,
 			    c->business_po_box, c->business_postal_code, c->business_state, c->business_street);
-	
-	contact_set_address (ec,E_CONTACT_ADDRESS_HOME, 
-			    c->home_address, c->home_city, c->home_country, 
+
+	contact_set_address (ec,E_CONTACT_ADDRESS_HOME,
+			    c->home_address, c->home_city, c->home_country,
 			    c->home_po_box, c->home_postal_code, c->home_state, c->home_street);
-			
-	contact_set_address (ec,E_CONTACT_ADDRESS_OTHER, 
-			    c->other_address, c->other_city, c->other_country, 
+
+	contact_set_address (ec,E_CONTACT_ADDRESS_OTHER,
+			    c->other_address, c->other_city, c->other_country,
 			    c->other_po_box, c->other_postal_code, c->other_state, c->other_street);
-	
+
 	contact_set_string (ec, E_CONTACT_PHONE_ASSISTANT, c->assistant_phone);
 	contact_set_string (ec, E_CONTACT_PHONE_BUSINESS_FAX, c->business_fax);
 	contact_set_string (ec, E_CONTACT_PHONE_BUSINESS, c->business_phone);
@@ -1100,11 +1100,11 @@ pst_process_contact (PstImporter *m, pst_item *item)
 	unknown_field (ec, notes, "billing_information", c->billing_information);
 	contact_set_date (ec, E_CONTACT_BIRTH_DATE, c->birthday);
 	/* contact_set_string (ec, E_CONTACT_CATEGORIES, c->??); */
-	
+
 	contact_set_string (ec, E_CONTACT_EMAIL_1 , c->address1);
 	contact_set_string (ec, E_CONTACT_EMAIL_2 , c->address2);
 	contact_set_string (ec, E_CONTACT_EMAIL_3 , c->address3);
-	
+
 	/*unknown_field (ec, notes, "address1_desc" , c->address1_desc);
 	unknown_field (ec, notes, "address1_transport" , c->address1_transport);
 	unknown_field (ec, notes, "address2_desc" , c->address2_desc);
@@ -1120,9 +1120,9 @@ pst_process_contact (PstImporter *m, pst_item *item)
 	unknown_field (ec, notes, "customer_id", c->customer_id);
 	unknown_field (ec, notes, "hobbies", c->hobbies);
 	unknown_field (ec, notes, "followup", c->followup);
-		
+
 	contact_set_string (ec, E_CONTACT_FREEBUSY_URL , c->free_busy_address);
-	
+
 	unknown_field (ec, notes, "keyword", c->keyword);
 	unknown_field (ec, notes, "language", c->language);
 	unknown_field (ec, notes, "location", c->location);
@@ -1134,7 +1134,7 @@ pst_process_contact (PstImporter *m, pst_item *item)
 	unknown_field (ec, notes, "mileage", c->mileage);
 	unknown_field (ec, notes, "org_id", c->org_id);
 	contact_set_string (ec, E_CONTACT_ROLE, c->profession);
-	
+
 	contact_set_string (ec, E_CONTACT_SPOUSE , c->spouse_name);
 
 	if (c->personal_homepage) {
@@ -1145,7 +1145,7 @@ pst_process_contact (PstImporter *m, pst_item *item)
 	} else if (c->business_homepage) {
 		contact_set_string (ec, E_CONTACT_HOMEPAGE_URL , c->business_homepage);
 	}
-	
+
 	if (item->comment) {
 		g_string_append_printf (notes, "%s\n", item->comment);
 	}
@@ -1156,7 +1156,7 @@ pst_process_contact (PstImporter *m, pst_item *item)
 
 	contact_set_string (ec, E_CONTACT_NOTE, notes->str);
 	g_string_free (notes, TRUE);
-	
+
 	e_book_add_contact (m->addressbook, ec, NULL);
 	g_object_unref (ec);
 
@@ -1188,7 +1188,7 @@ char *rfc2445_datetime_format (FILETIME *ft) {
 	if (buffer == NULL) {
 		buffer = malloc (30); // should be enough
 	}
-	
+
 	stm = fileTimeToStructTM (ft);
 	strftime (buffer, 30, "%Y%m%dT%H%M%SZ", stm);
 	return buffer;
@@ -1219,7 +1219,7 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta
 		part = attachment_to_part(m, attach);
 
 		orig_filename = camel_mime_part_get_filename(part);
-		
+
 		if (orig_filename == NULL) {
 			g_warning("Ignoring unnamed attachment");
 			attach = attach->next;
@@ -1229,10 +1229,10 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta
 		tmp = camel_file_util_safe_filename (orig_filename);
 		filename = g_strdup_printf ("%s-%s", uid, tmp);
 		path = g_build_filename (store_dir, filename, NULL);
-		
+
 		g_free (tmp);
 		g_free (filename);
-	
+
 		dirname = g_path_get_dirname(path);
 		if (g_mkdir_with_parents(dirname, 0777) == -1) {
 			g_warning("Could not create directory %s: %s", dirname, g_strerror(errno));
@@ -1241,7 +1241,7 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta
 			continue;
 		}
 		g_free(dirname);
-	
+
 		if (g_access(path, F_OK) == 0) {
 			if (g_access(path, W_OK) != 0) {
 				g_warning("Could not write file %s - file exists", path);
@@ -1249,21 +1249,21 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta
 				continue;
 			}
 		}
-		
+
 		if (g_stat(path, &st) != -1 && !S_ISREG(st.st_mode)) {
 			g_warning("Could not write file %s - not a file", path);
 			attach = attach->next;
 			continue;
 		}
-		
+
 		if (!(stream = camel_stream_fs_new_with_name (path, O_WRONLY | O_CREAT | O_TRUNC, 0666))) {
 			g_warning ("Could not create stream for file %s - %s", path, g_strerror (errno));
 			attach = attach->next;
 			continue;
 		}
-	
+
 		content = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	
+
 		if (camel_data_wrapper_decode_to_stream (content, stream) == -1
 			|| camel_stream_flush (stream) == -1)
 		{
@@ -1272,18 +1272,18 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta
 			attach = attach->next;
 			continue;
 		}
-					
+
 		camel_object_unref (stream);
-		
+
 		uri = g_filename_to_uri (path, NULL, NULL);
 		list = g_slist_append (list, g_strdup (uri));
 		g_free (uri);
-		
+
 		camel_object_unref (part);
 		g_free (path);
 
 		attach = attach->next;
-		
+
 	}
 
 	g_free (store_dir);
@@ -1296,13 +1296,13 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char
 {
 	pst_item_appointment *a;
 	pst_item_email *e;
-	
+
 	a = item->appointment;
 	e = item->email;
 	ECalComponentText text;
 	struct icaltimetype tt_start, tt_end;
 	ECalComponentDateTime dt_start, dt_end;
-	
+
 	if (item->create_date) {
 		struct icaltimetype tt;
 		tt = get_ical_date (item->create_date, FALSE);
@@ -1313,7 +1313,7 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char
 		tt = get_ical_date (item->modify_date, FALSE);
 		e_cal_component_set_last_modified (ec, &tt);
 	}
-	
+
 	if (e) {
 		if (e->subject || e->proc_subject) {
 			if (e->subject) {
@@ -1332,11 +1332,11 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char
 			l.data = &text;
 			l.next = NULL;
 			e_cal_component_set_description_list (ec, &l);
-		}				
+		}
 	} else {
 		g_warning ("%s without subject / body!", type);
 	}
-	
+
 	if (a->location) {
 		e_cal_component_set_location (ec, a->location);
 	}
@@ -1391,19 +1391,19 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char
 		case PST_APP_LABEL_PHONE_CALL:
 			e_cal_component_set_categories (ec, "Phone-call"); break;
 	}
-	
+
 	if (a->alarm || a->alarm_minutes) {
 		ECalComponentAlarm *alarm;
 		ECalComponentAlarmTrigger trigger;
-		
+
 		alarm = e_cal_component_alarm_new ();
-		
+
 		if (a->alarm_minutes) {
 			trigger.type = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START;
 			trigger.u.rel_duration = icaldurationtype_from_int (- (a->alarm_minutes)*60);
 			e_cal_component_alarm_set_trigger (alarm, trigger);
 		}
-		
+
 		if (a->alarm) {
 			if (a->alarm_filename) {
 				e_cal_component_alarm_set_action (alarm, E_CAL_COMPONENT_ALARM_AUDIO);
@@ -1414,19 +1414,19 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char
 
 		e_cal_component_add_alarm (ec, alarm);
 		e_cal_component_alarm_free(alarm);
-	
+
 	}
-	
+
 	if (a->recurrence != PST_APP_RECUR_NONE) {
 		struct icalrecurrencetype  r;
 		GSList recur_list;
-		
+
 		icalrecurrencetype_clear (&r);
 		r.interval = 1; /* Interval not implemented in libpst */
 		if (a->recurrence_end) {
 			r.until = get_ical_date (a->recurrence_end, FALSE);
 		}
-		
+
 		switch (a->recurrence_type) {
 			case PST_APP_RECUR_DAILY:
 				r.freq = ICAL_DAILY_RECURRENCE; break;
@@ -1444,7 +1444,7 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char
 		recur_list.next = NULL;
 		e_cal_component_set_rrule_list (ec, &recur_list);
 	}
-	
+
 }
 
 static void
@@ -1454,7 +1454,7 @@ pst_process_appointment (PstImporter *m, pst_item *item)
 
 	ec = e_cal_component_new ();
 	e_cal_component_set_new_vtype (ec, E_CAL_COMPONENT_EVENT);
-	
+
 	fill_calcomponent (m, item, ec, "appointment");
 	set_cal_attachments (m->calendar, ec, m, item->attach);
 
@@ -1464,7 +1464,7 @@ pst_process_appointment (PstImporter *m, pst_item *item)
 	}
 
 	g_object_unref (ec);
-	
+
 }
 
 static void
@@ -1474,19 +1474,19 @@ pst_process_task (PstImporter *m, pst_item *item)
 
 	ec = e_cal_component_new ();
 	e_cal_component_set_new_vtype (ec, E_CAL_COMPONENT_TODO);
-	
+
 	fill_calcomponent (m, item, ec, "task");
 	set_cal_attachments (m->tasks, ec, m, item->attach);
 
 	/* Note - libpst is missing many fields. E.g. task status, start/completion date, % complete */
-	
+
 	if (!e_cal_create_object (m->tasks, e_cal_component_get_icalcomponent (ec), NULL, NULL)) {
 		g_warning("Creation of task failed");
 		g_free(ec);
 	}
-	
+
 	g_object_unref (ec);
-	
+
 }
 
 static void
@@ -1507,7 +1507,7 @@ pst_process_journal (PstImporter *m, pst_item *item)
 		ECalComponentText text;
 		struct icaltimetype tt_start, tt_end;
 		ECalComponentDateTime dt_start, dt_end;
-	
+
 		if (j->start) {
 			tt_start = get_ical_date (j->start, FALSE);
 			dt_start.value = &tt_start;
@@ -1515,7 +1515,7 @@ pst_process_journal (PstImporter *m, pst_item *item)
 			e_cal_component_set_dtstart (ec, &dt_start);
 			g_message ("journal start:%s", rfc2445_datetime_format (j->start));
 		}
-	
+
 		if (j->end) {
 			tt_end = get_ical_date (j->end, FALSE);
 			dt_end.value = &tt_end;
@@ -1532,7 +1532,7 @@ pst_process_journal (PstImporter *m, pst_item *item)
 	}
 
 	g_object_unref (ec);
-	
+
 }
 
 /* Print an error message - maybe later bring up an error dialog? */
@@ -1540,7 +1540,7 @@ static void
 pst_error_msg (const char *fmt, ...)
 {
 	va_list ap;
-	
+
 	va_start (ap, fmt);
 	g_critical (fmt, ap);
 	va_end (ap);
@@ -1628,11 +1628,11 @@ pst_import (EImport *ei, EImportTarget *target)
 	m->import = ei;
 	g_object_ref (m->import);
 	m->target = target;
-	
+
 	m->parent_uri = NULL;
 	m->folder_name = NULL;
 	m->folder_uri = NULL;
-	
+
 	m->addressbook = NULL;
 	m->calendar = NULL;
 	m->tasks = NULL;
@@ -1644,7 +1644,7 @@ pst_import (EImport *ei, EImportTarget *target)
 	m->status = camel_operation_new (pst_status, m);
 
 	id = m->base.seq;
-	
+
 	mail_msg_unordered_push (m);
 
 	return id;
@@ -1705,7 +1705,7 @@ pst_init (pst_file *pst, gchar *filename)
 	DEBUG_INIT (d_log);
 	DEBUG_REGISTER_CLOSE ();
 #endif
-	
+
 	DEBUG_ENT ("main");
 	if (pst_open (pst, filename) < 0) {
 		pst_error_msg ("Error opening PST file %s", filename);
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index a901317dfb..943f0ed933 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.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:
@@ -156,7 +156,7 @@ mount_ready_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
 	g_file_mount_enclosing_volume_finish (G_FILE (source_object), res, &error);
 
 	if (error) {
-		
+
 		error_queue_add (g_strdup_printf (_("Mount of %s failed:"), ms->uri->location), error);
 
 		if (ms)
@@ -258,14 +258,14 @@ ask_question (GMountOperation *op, const char *message, const char *choices[])
 		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
 							  "%s", secondary);
 	}
-	
+
 	if (choices) {
-		/* First count the items in the list then 
+		/* First count the items in the list then
 		 * add the buttons in reverse order */
 		for (len = 0; choices[len] != NULL; len++) {
 			;
 		}
-		
+
 		for (cnt = len - 1; cnt >= 0; cnt--) {
 			gtk_dialog_add_button (GTK_DIALOG (dialog), choices[cnt], cnt);
 		}
@@ -294,7 +294,7 @@ mount_first (EPublishUri *uri, GFile *file, gboolean can_report_success)
 	ms->can_report_success = can_report_success;
 
 	g_signal_connect (ms->mount_op, "ask-password", G_CALLBACK (ask_password), ms);
-	g_signal_connect (ms->mount_op, "ask-question", G_CALLBACK (ask_question), ms);	
+	g_signal_connect (ms->mount_op, "ask-question", G_CALLBACK (ask_question), ms);
 
 	g_file_mount_enclosing_volume (file, G_MOUNT_MOUNT_NONE, ms->mount_op, NULL, mount_ready_cb, ms);
 }
@@ -843,7 +843,7 @@ error_queue_show_idle (gpointer user_data)
 	gboolean has_error = FALSE, has_info = FALSE;
 
 	g_static_mutex_lock (&error_queue_lock);
-	
+
 	for (l = error_queue; l; l = l->next) {
 		struct eq_data *data = l->data;
 
diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c
index a4b3a44544..b28444458e 100644
--- a/plugins/publish-calendar/publish-format-fb.c
+++ b/plugins/publish-calendar/publish-format-fb.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/plugins/publish-calendar/publish-format-fb.h b/plugins/publish-calendar/publish-format-fb.h
index 4975aa107d..6d758f1465 100644
--- a/plugins/publish-calendar/publish-format-fb.h
+++ b/plugins/publish-calendar/publish-format-fb.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/plugins/publish-calendar/publish-format-ical.c b/plugins/publish-calendar/publish-format-ical.c
index 13962fc849..04e70ca8a8 100644
--- a/plugins/publish-calendar/publish-format-ical.c
+++ b/plugins/publish-calendar/publish-format-ical.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/plugins/publish-calendar/publish-format-ical.h b/plugins/publish-calendar/publish-format-ical.h
index 4c32310b99..d4955ca9dd 100644
--- a/plugins/publish-calendar/publish-format-ical.h
+++ b/plugins/publish-calendar/publish-format-ical.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/plugins/publish-calendar/publish-location.c b/plugins/publish-calendar/publish-location.c
index 1ebe2cfefb..71b82c8e07 100644
--- a/plugins/publish-calendar/publish-location.c
+++ b/plugins/publish-calendar/publish-location.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/plugins/publish-calendar/publish-location.h b/plugins/publish-calendar/publish-location.h
index 327cd986fd..a6afc2c272 100644
--- a/plugins/publish-calendar/publish-location.h
+++ b/plugins/publish-calendar/publish-location.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/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c
index ea03320ae8..08e59513e8 100644
--- a/plugins/publish-calendar/url-editor-dialog.c
+++ b/plugins/publish-calendar/url-editor-dialog.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:
@@ -42,7 +42,8 @@ create_uri (UrlEditorDialog *dialog)
 			g_free (uri->location);
 		uri->location = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->server_entry)));
 	} else {
-		char *method = "", *server, *file, *port, *username, *password;
+		const gchar *method;
+		char *server, *file, *port, *username, *password;
 
 		server   = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->server_entry)));
 		file     = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->file_entry)));
diff --git a/plugins/publish-calendar/url-editor-dialog.h b/plugins/publish-calendar/url-editor-dialog.h
index 94a1a71f00..8f45807bd8 100644
--- a/plugins/publish-calendar/url-editor-dialog.h
+++ b/plugins/publish-calendar/url-editor-dialog.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/plugins/python/python-plugin-loader.c b/plugins/python/python-plugin-loader.c
index 5e7a83fb29..ea9ab4bfb0 100644
--- a/plugins/python/python-plugin-loader.c
+++ b/plugins/python/python-plugin-loader.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:
@@ -26,7 +26,7 @@
 
 #include "python-plugin-loader.h"
 
-#define d(x) 
+#define d(x)
 
 static void *epp_parent_class;
 
@@ -84,17 +84,17 @@ epp_invoke(EPlugin *ep, const char *name, void *data)
 		p->pDict = PyModule_GetDict(p->pModule);
 
 		if (epp->pClass) {
-			p->pClass = PyDict_GetItemString(p->pDict, epp->pClass);			
+			p->pClass = PyDict_GetItemString(p->pDict, epp->pClass);
 		}
 	}
 
 	if (p->pClass) {
 
-		if (PyCallable_Check(p->pClass)) 
-			pInstance = PyObject_CallObject(p->pClass, NULL); 
+		if (PyCallable_Check(p->pClass))
+			pInstance = PyObject_CallObject(p->pClass, NULL);
 
 		pValue = PyObject_CallMethod(pInstance, name, NULL);
-	       
+
 	} else {
 
 		pFunc = PyDict_GetItemString(p->pDict, name);
diff --git a/plugins/python/python-plugin-loader.h b/plugins/python/python-plugin-loader.h
index 86e94d667b..4f9656e119 100644
--- a/plugins/python/python-plugin-loader.h
+++ b/plugins/python/python-plugin-loader.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/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index 39efa2f5ac..8846e8b4be 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.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:
@@ -81,7 +81,7 @@ static gboolean em_junk_sa_checked_spamassassin_version = FALSE;
 static guint em_junk_sa_spamassassin_version = 0;
 static char *em_junk_sa_socket_path = NULL;
 static char *em_junk_sa_spamd_pidfile = NULL;
-static char *em_junk_sa_spamc_binary = NULL;
+static const gchar *em_junk_sa_spamc_binary = NULL;
 static GConfClient *em_junk_sa_gconf = NULL;
 
 /* volatile so not cached between threads */
@@ -89,8 +89,8 @@ static volatile gboolean em_junk_sa_local_only;
 static volatile gboolean em_junk_sa_use_daemon;
 static char * em_junk_sa_preferred_socket_path;
 
-static char *em_junk_sa_spamc_binaries [4] = {"spamc", "/usr/bin/spamc", "/usr/sbin/spamc", NULL};
-static char *em_junk_sa_spamd_binaries [4] = {"spamd", "/usr/bin/spamd", "/usr/sbin/spamd", NULL};
+static const gchar *em_junk_sa_spamc_binaries [4] = {"spamc", "/usr/bin/spamc", "/usr/sbin/spamc", NULL};
+static const gchar *em_junk_sa_spamd_binaries [4] = {"spamd", "/usr/bin/spamd", "/usr/sbin/spamd", NULL};
 
 #define SPAMD_RESTARTS_SIZE 8
 static time_t em_junk_sa_spamd_restarts [SPAMD_RESTARTS_SIZE] = {0, 0, 0, 0, 0, 0, 0, 0};
@@ -104,7 +104,7 @@ char *em_junk_sa_spamc_gconf_binary = NULL;
 char *em_junk_sa_spamd_gconf_binary = NULL;
 
 static int
-pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, int wait_for_termination, GByteArray *output_buffer, GError **error)
+pipe_to_sa_full (CamelMimeMessage *msg, const gchar *in, const gchar **argv, int rv_err, int wait_for_termination, GByteArray *output_buffer, GError **error)
 {
 	int result, status, errnosav, fds[2], out_fds[2];
 	CamelStream *stream;
@@ -169,7 +169,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err,
 		for (fd = 3; fd < maxfd; fd++)
 			fcntl (fd, F_SETFD, FD_CLOEXEC);
 
-		execvp (argv[0], argv);
+		execvp (argv[0], (gchar * const *) argv);
 		_exit (rv_err & 0377);
 	} else if (pid < 0) {
 		errnosav = errno;
@@ -254,7 +254,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err,
 }
 
 static int
-pipe_to_sa (CamelMimeMessage *msg, const char *in, char **argv, GError **error)
+pipe_to_sa (CamelMimeMessage *msg, const gchar *in, const gchar **argv, GError **error)
 {
 	return pipe_to_sa_full (msg, in, argv, -1, 1, NULL, error);
 }
@@ -269,9 +269,9 @@ em_junk_sa_get_socket_path ()
 }
 
 static gboolean
-em_junk_sa_test_spamd_running (char *binary, gboolean system)
+em_junk_sa_test_spamd_running (const gchar *binary, gboolean system)
 {
-	char *argv[5];
+	const gchar *argv[5];
 	int i = 0;
 	gboolean rv;
 
@@ -303,11 +303,11 @@ em_junk_sa_test_spamd_running (char *binary, gboolean system)
   One time test to see if spamd is running with --allow-tell.  The call
   to spamc should return 0 if it is.  (Thanks to Karsten Bräckelmann
   for the idea).
-*/ 
+*/
 static void
 em_junk_sa_test_allow_tell (void)
 {
-	char *argv [4] = {
+	const gchar *argv [4] = {
 		"spamc",
 		"-L",
 		"forget",
@@ -321,7 +321,7 @@ em_junk_sa_test_allow_tell (void)
 static void
 em_junk_sa_test_spamassassin (void)
 {
-	char *argv [3] = {
+	const gchar *argv [3] = {
 		"spamassassin",
 		"--version",
 		NULL,
@@ -338,9 +338,9 @@ em_junk_sa_test_spamassassin (void)
 #define MAX_SPAMD_PORTS 1
 
 static gboolean
-em_junk_sa_run_spamd (char *binary)
+em_junk_sa_run_spamd (const gchar *binary)
 {
-	char *argv[8];
+	const gchar *argv[8];
 	int i;
 	gboolean rv = FALSE;
 
@@ -431,7 +431,7 @@ em_junk_sa_find_spamc ()
 static void
 em_junk_sa_test_spamd (void)
 {
-	char *argv[4];
+	const gchar *argv[4];
 	int i, b;
 	gboolean try_system_spamd = TRUE;
 
@@ -577,7 +577,8 @@ gboolean
 em_junk_sa_check_junk(EPlugin *ep, EMJunkHookTarget *target)
 {
 	GByteArray *out = NULL;
-	char *argv[7], *to_free = NULL;
+	const gchar *argv[7];
+	char *to_free = NULL;
 	int i = 0, socket_i;
 	gboolean rv;
 	CamelMimeMessage *msg = target->m;
@@ -644,7 +645,7 @@ get_spamassassin_version ()
 	GByteArray *out = NULL;
 	int i;
 
-	char * argv[3] = {
+	const gchar *argv[3] = {
 		"sa-learn",
 		"--version",
 		NULL
@@ -680,8 +681,10 @@ get_spamassassin_version ()
 void
 em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target)
 {
-	char *sync_op = ((get_spamassassin_version () >= 3) ? "--no-sync": "--no-rebuild");
-	char *argv[6] = {
+	const gchar *sync_op =
+		(get_spamassassin_version () >= 3)
+		? "--no-sync": "--no-rebuild";
+	const gchar *argv[6] = {
 		"sa-learn",
 		sync_op,
 		"--spam",
@@ -690,7 +693,7 @@ em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target)
 		NULL
 	};
 	/* Call setup for spamc */
-	char *argv2[4] = {
+	const gchar *argv2[4] = {
 	  "spamc",
 	  "-L",
 	  "spam",
@@ -708,8 +711,8 @@ em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target)
 			argv[4] = "--local";
 
 		pthread_mutex_lock (&em_junk_sa_report_lock);
-		pipe_to_sa (msg, NULL, 
-			    (no_allow_tell ? argv : argv2), 
+		pipe_to_sa (msg, NULL,
+			    (no_allow_tell ? argv : argv2),
 			    &target->error);
 		pthread_mutex_unlock (&em_junk_sa_report_lock);
 	}
@@ -718,8 +721,10 @@ em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target)
 void
 em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target)
 {
-	char *sync_op = ((get_spamassassin_version () >= 3) ? "--no-sync": "--no-rebuild");
-	char *argv[6] = {
+	const char *sync_op =
+		(get_spamassassin_version () >= 3)
+		? "--no-sync": "--no-rebuild";
+	const gchar *argv[6] = {
 		"sa-learn",
 		sync_op,
 		"--ham",
@@ -728,7 +733,7 @@ em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target)
 		NULL
 	};
 	/* Setup for spamc */
-	char *argv2[4] = {
+	const gchar *argv2[4] = {
 	  "spamc",
 	  "-L",
 	  "ham",
@@ -743,8 +748,8 @@ em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target)
 		if (no_allow_tell && em_junk_sa_local_only)
 			argv[4] = "--local";
 		pthread_mutex_lock (&em_junk_sa_report_lock);
-		pipe_to_sa (msg, NULL, 
-			    (no_allow_tell ? argv : argv2), 
+		pipe_to_sa (msg, NULL,
+			    (no_allow_tell ? argv : argv2),
 			    &target->error);
 		pthread_mutex_unlock (&em_junk_sa_report_lock);
 	}
@@ -753,8 +758,9 @@ em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target)
 void
 em_junk_sa_commit_reports (EPlugin *ep)
 {
-	char *sync_op = ((get_spamassassin_version () >= 3) ? "--sync": "--rebuild");
-	char *argv[4] = {
+	const gchar *sync_op =
+		(get_spamassassin_version () >= 3) ? "--sync": "--rebuild";
+	const gchar *argv[4] = {
 		"sa-learn",
 		sync_op,
 		NULL,
@@ -780,7 +786,7 @@ em_junk_sa_commit_reports (EPlugin *ep)
 void *
 em_junk_sa_validate_binary (EPlugin *ep)
 {
-	return em_junk_sa_is_available (NULL) ? "1" : NULL;
+	return em_junk_sa_is_available (NULL) ? (void *) "1" : NULL;
 }
 
 static void
@@ -916,7 +922,7 @@ org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFact
 	gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (label), FALSE, FALSE, 0);
 
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), !em_junk_sa_local_only);
-	g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (use_remote_tests_cb), "/apps/evolution/mail/junk/sa/local_only");
+	g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (use_remote_tests_cb), (gpointer) "/apps/evolution/mail/junk/sa/local_only");
 	gtk_table_attach((GtkTable *)data->parent, vbox, 0, 1, i, i+1, 0, 0, 0, 0);
 	gtk_widget_show_all (vbox);
 	return (GtkWidget *)vbox;
diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c
index 2762dc5dfe..2f9c92d6f7 100644
--- a/plugins/save-calendar/csv-format.c
+++ b/plugins/save-calendar/csv-format.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:
@@ -357,7 +357,7 @@ do_save_calendar_csv (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource
 
 			gint i=0;
 
-			static gchar *labels[] = {
+			static const gchar *labels[] = {
 				 N_("UID"),
 				 N_("Summary"),
 				 N_("Description List"),
diff --git a/plugins/save-calendar/format-handler.h b/plugins/save-calendar/format-handler.h
index 0174bfc078..a7bc2e8d85 100644
--- a/plugins/save-calendar/format-handler.h
+++ b/plugins/save-calendar/format-handler.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/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c
index a537bf4641..f538a9e0a1 100644
--- a/plugins/save-calendar/ical-format.c
+++ b/plugins/save-calendar/ical-format.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/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c
index b1c8257a41..9c9f864a2a 100644
--- a/plugins/save-calendar/rdf-format.c
+++ b/plugins/save-calendar/rdf-format.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/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c
index 7e21b23f9e..e461821242 100644
--- a/plugins/save-calendar/save-calendar.c
+++ b/plugins/save-calendar/save-calendar.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/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c
index 34d5961d4b..71fb4d4ff1 100644
--- a/plugins/startup-wizard/startup-wizard.c
+++ b/plugins/startup-wizard/startup-wizard.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:
@@ -38,7 +38,7 @@ void startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target);
 GtkWidget *startup_wizard_importer_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data);
 gboolean startup_wizard_check (EPlugin *ep, EConfigHookPageCheckData *check_data);
 void startup_wizard_commit (EPlugin *ep, EMConfigTargetAccount *target);
-void startup_wizard_abort (EPlugin *ep, EMConfigTargetAccount *target);
+void startup_wizard_abort (EPlugin *ep, EMConfigTargetAccount *target) G_GNUC_NORETURN;
 
 static EImport *import;
 static EImportTargetHome *import_target;
diff --git a/plugins/subject-thread/subject-thread.c b/plugins/subject-thread/subject-thread.c
index 595f938414..6c008c71ae 100644
--- a/plugins/subject-thread/subject-thread.c
+++ b/plugins/subject-thread/subject-thread.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/plugins/templates/templates.c b/plugins/templates/templates.c
index 537b8822bc..a871399754 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.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:
@@ -74,14 +74,14 @@ static void reply_with_template	(EPopup *ep, EPopupItem *item, void *data);
 
 static void popup_free		(EPopup *ep, GSList *l, void *data);
 
-static GSList *fill_submenu	(CamelStore *store, 
-                             	CamelFolderInfo *info, 
-                              	GSList *list, 
+static GSList *fill_submenu	(CamelStore *store,
+                             	CamelFolderInfo *info,
+                              	GSList *list,
                               	EMPopupTargetSelect *t);
 
-static GSList *append_to_menu 	(CamelFolder *folder, 
-                             	GPtrArray *uids, 
-                             	GSList *list, 
+static GSList *append_to_menu 	(CamelFolder *folder,
+                             	GPtrArray *uids,
+                             	GSList *list,
                              	EMPopupTargetSelect *t);
 
 void org_gnome_templates_popup	(EPlugin *ep, EMPopupTargetSelect *t);
@@ -98,7 +98,7 @@ static void  key_cell_edited_callback (GtkCellRendererText *cell, gchar *path_st
 				   gchar *new_text,UIData *ui);
 
 static void  value_cell_edited_callback (GtkCellRendererText *cell, gchar *path_string,
-				   gchar *new_text,UIData *ui);				   
+				   gchar *new_text,UIData *ui);
 
 static gboolean clue_foreach_check_isempty (GtkTreeModel *model, GtkTreePath
 					*path, GtkTreeIter *iter, UIData *ui);
@@ -145,16 +145,16 @@ commit_changes (UIData *ui)
 	while (valid) {
 		char *keyword, *value;
 		char *key;
-		
+
 		gtk_tree_model_get (model, &iter, CLUE_KEYWORD_COLUMN, &keyword, -1);
 		gtk_tree_model_get (model, &iter, CLUE_VALUE_COLUMN, &value, -1);
 
 		/* Check if the keyword and value are not empty */
-		if ((keyword) && (value) && (g_utf8_strlen(g_strstrip(keyword), -1) > 0) 
+		if ((keyword) && (value) && (g_utf8_strlen(g_strstrip(keyword), -1) > 0)
 			&& (g_utf8_strlen(g_strstrip(value), -1) > 0)) {
 			key = g_strdup_printf("%s=%s", keyword, value);
 			clue_list = g_slist_append (clue_list, key);
-		}	
+		}
 		valid = gtk_tree_model_iter_next (model, &iter);
 	}
 
@@ -229,7 +229,7 @@ key_cell_edited_callback (GtkCellRendererText *cell,
 
 	gtk_tree_model_get_iter_from_string (model, &iter, path_string);
 
-	gtk_tree_model_get (model, &iter, CLUE_VALUE_COLUMN, &value, -1);	
+	gtk_tree_model_get (model, &iter, CLUE_VALUE_COLUMN, &value, -1);
 	gtk_list_store_set (GTK_LIST_STORE (model), &iter,
 				    CLUE_KEYWORD_COLUMN, new_text, CLUE_VALUE_COLUMN, value, -1);
 
@@ -249,7 +249,7 @@ value_cell_edited_callback (GtkCellRendererText *cell,
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (ui->treeview));
 
 	gtk_tree_model_get_iter_from_string (model, &iter, path_string);
-	
+
 	gtk_tree_model_get (model, &iter, CLUE_KEYWORD_COLUMN, &keyword, -1);
 
 	gtk_list_store_set (GTK_LIST_STORE (model), &iter,
@@ -491,9 +491,9 @@ get_content (CamelMimeMessage *message)
 		g_free (str);
 		return convert_str;
 	}
-	else 
+	else
 		return str;
-			
+
 }
 
 static void
@@ -509,8 +509,8 @@ reply_with_template (EPopup *ep, EPopupItem *item, void *data)
 	templates_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_TEMPLATES);
 
 	/* Get from the currently selected folder, the currently selected message */
-	reply_to = camel_folder_get_message (userdata->t->folder, 
-			g_ptr_array_index (userdata->t->uids, 0), 
+	reply_to = camel_folder_get_message (userdata->t->folder,
+			g_ptr_array_index (userdata->t->uids, 0),
 			NULL);
 
 	/* The message we'll be using has been stored when building the menu */
@@ -525,8 +525,8 @@ reply_with_template (EPopup *ep, EPopupItem *item, void *data)
 	header = ((CamelMimePart *)reply_to)->headers;
 	while (header) {
 		if (g_ascii_strncasecmp (header->name, "content-", 8) != 0) {
-			camel_medium_add_header((CamelMedium *) new, 
-					header->name, 
+			camel_medium_add_header((CamelMedium *) new,
+					header->name,
 					header->value);
 		}
 		header = header->next;
@@ -538,15 +538,15 @@ reply_with_template (EPopup *ep, EPopupItem *item, void *data)
 	cont = get_content (template);
 
 	/* Set the To: field to the same To: field of the message we are replying to. */
-	camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_TO, 
+	camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_TO,
 			camel_mime_message_get_from (reply_to));
 
 
 	/* Copy the CC and BCC from the template.*/
-	camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_CC, 
+	camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_CC,
 			camel_mime_message_get_recipients (template, CAMEL_RECIPIENT_TYPE_CC));
 
-	camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_BCC, 
+	camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_BCC,
 			camel_mime_message_get_recipients (template, CAMEL_RECIPIENT_TYPE_BCC));
 
 	camel_mime_part_set_content((CamelMimePart *)new,
@@ -558,7 +558,7 @@ reply_with_template (EPopup *ep, EPopupItem *item, void *data)
 	camel_object_unref(new);
 }
 
-static void 
+static void
 popup_free (EPopup *ep, GSList *l, void *data)
 {
 	g_slist_free (l);
@@ -583,15 +583,15 @@ static GSList
 		if (!g_str_has_suffix (folder->name, "Templates"))
 			path = g_strdup_printf ("80.%s", folder->full_name);
 		else
-			path = "80.Templates";
+			path = g_strdup ("80.Templates");
 
 		/* If this uid is trashed, ignore it */
 		if (camel_folder_get_message_flags (folder, uid) & CAMEL_MESSAGE_DELETED)
 			continue;
-		
+
 		/* Get the message for this uid */
-		message = camel_folder_get_message (folder, 
-				uid, 
+		message = camel_folder_get_message (folder,
+				uid,
 				NULL);
 
 		subject = camel_mime_message_get_subject (message);
@@ -617,7 +617,7 @@ static GSList
 	return list;
 }
 
-static GSList 
+static GSList
 *fill_submenu (CamelStore *store, CamelFolderInfo *info, GSList *list, EMPopupTargetSelect *t)
 {
 	while (info) {
@@ -629,14 +629,14 @@ static GSList
 
 		item = g_slice_alloc0(sizeof(*item));
 		item->type = E_POPUP_SUBMENU;
-		item->label = folder->name; 
+		item->label = folder->name;
 		item->visible = EM_POPUP_SELECT_MANY | EM_POPUP_SELECT_ONE;
 
 		/* To avoid having a Templates dir, we ignore the top level */
 		if (!g_str_has_suffix (folder->name, "Templates"))
 			item->path = g_strdup_printf ("80.%s", folder->full_name);
 		else
-			item->path = "80.Templates";
+			item->path = g_strdup ("80.Templates");
 
 		list = g_slist_prepend (list, item);
 
@@ -670,9 +670,9 @@ org_gnome_templates_popup (EPlugin *ep, EMPopupTargetSelect *t)
 
 	templates_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_TEMPLATES);
 
-	templates_info = camel_store_get_folder_info (store, 
-			templates_folder->full_name, 
-			CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_FAST, 
+	templates_info = camel_store_get_folder_info (store,
+			templates_folder->full_name,
+			CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_FAST,
 			NULL);
 
 	/* Get subfolders and fill it */
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c
index 6964d07e10..9b4f4cae6a 100644
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.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/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -38,7 +38,7 @@
 #include <ytnef.h>
 #elif defined HAVE_LIBYTNEF_YTNEF_H
 #include <libytnef/ytnef.h>
-#endif 
+#endif
 
 #include <camel/camel-mime-part.h>
 #include <camel/camel-folder.h>
diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c
index 0e10b3a82a..96ce0e3f9c 100644
--- a/plugins/vcard-inline/vcard-inline.c
+++ b/plugins/vcard-inline/vcard-inline.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)
  *
diff --git a/plugins/webdav-account-setup/webdav-contacts-source.c b/plugins/webdav-account-setup/webdav-contacts-source.c
index 012a541d27..79d4744c56 100644
--- a/plugins/webdav-account-setup/webdav-contacts-source.c
+++ b/plugins/webdav-account-setup/webdav-contacts-source.c
@@ -311,7 +311,7 @@ plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data)
 	uidata->username_entry = GTK_ENTRY(gtk_entry_new());
 	gtk_box_pack_start(hbox, GTK_WIDGET(uidata->username_entry), TRUE, TRUE, 0);
 
-	
+
 	hbox = GTK_BOX(gtk_hbox_new(FALSE, 10));
 	gtk_box_pack_start(GTK_BOX(vbox2), GTK_WIDGET(hbox), TRUE, TRUE, 0);