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

47 files changed, 57 insertions, 57 deletions

diff --git a/calendar/module/e-cal-shell-backend.c b/calendar/module/e-cal-shell-backend.c
index 9c38555f2d..675a3d4fa6 100644
--- a/calendar/module/e-cal-shell-backend.c
+++ b/calendar/module/e-cal-shell-backend.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -264,7 +264,7 @@ cal_shell_backend_ensure_sources (EShellBackend *shell_backend)
 				e_source_group_remove_source (contacts, source);
 				trash = g_slist_delete_link (trash, trash);
 			}
-				
+
 		}
 	} else {
 		ESourceGroup *source_group;
diff --git a/calendar/module/e-cal-shell-backend.h b/calendar/module/e-cal-shell-backend.h
index 434c87badb..497e200490 100644
--- a/calendar/module/e-cal-shell-backend.h
+++ b/calendar/module/e-cal-shell-backend.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-cal-shell-content.c b/calendar/module/e-cal-shell-content.c
index 7f750f5be5..6afb40dce7 100644
--- a/calendar/module/e-cal-shell-content.c
+++ b/calendar/module/e-cal-shell-content.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-cal-shell-content.h b/calendar/module/e-cal-shell-content.h
index 6b8617984c..44e13f733c 100644
--- a/calendar/module/e-cal-shell-content.h
+++ b/calendar/module/e-cal-shell-content.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-cal-shell-migrate.c b/calendar/module/e-cal-shell-migrate.c
index bdcca08ce2..5414f4a391 100644
--- a/calendar/module/e-cal-shell-migrate.c
+++ b/calendar/module/e-cal-shell-migrate.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-cal-shell-migrate.h b/calendar/module/e-cal-shell-migrate.h
index 44cbf68ee1..359ca5ea22 100644
--- a/calendar/module/e-cal-shell-migrate.h
+++ b/calendar/module/e-cal-shell-migrate.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-cal-shell-settings.c b/calendar/module/e-cal-shell-settings.c
index 639622fec1..03af4aeebc 100644
--- a/calendar/module/e-cal-shell-settings.c
+++ b/calendar/module/e-cal-shell-settings.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-cal-shell-settings.h b/calendar/module/e-cal-shell-settings.h
index 7382130f2d..de8b22888b 100644
--- a/calendar/module/e-cal-shell-settings.h
+++ b/calendar/module/e-cal-shell-settings.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-cal-shell-sidebar.c b/calendar/module/e-cal-shell-sidebar.c
index 2646836e3e..dc7df596d6 100644
--- a/calendar/module/e-cal-shell-sidebar.c
+++ b/calendar/module/e-cal-shell-sidebar.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-cal-shell-sidebar.h b/calendar/module/e-cal-shell-sidebar.h
index d4e881a1c2..c555537abf 100644
--- a/calendar/module/e-cal-shell-sidebar.h
+++ b/calendar/module/e-cal-shell-sidebar.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-cal-shell-view-actions.c b/calendar/module/e-cal-shell-view-actions.c
index 53898ffe12..a5d0dd826b 100644
--- a/calendar/module/e-cal-shell-view-actions.c
+++ b/calendar/module/e-cal-shell-view-actions.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -121,7 +121,7 @@ static void
 action_calendar_go_back_cb (GtkAction *action,
                             ECalShellView *cal_shell_view)
 {
-#if 0 
+#if 0
 	ECalShellContent *cal_shell_content;
 	GnomeCalendar *calendar;
 
diff --git a/calendar/module/e-cal-shell-view-actions.h b/calendar/module/e-cal-shell-view-actions.h
index 1ad6aa7d51..b02906f179 100644
--- a/calendar/module/e-cal-shell-view-actions.h
+++ b/calendar/module/e-cal-shell-view-actions.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-cal-shell-view-memopad.c b/calendar/module/e-cal-shell-view-memopad.c
index d9adf23098..ecee72d8b5 100644
--- a/calendar/module/e-cal-shell-view-memopad.c
+++ b/calendar/module/e-cal-shell-view-memopad.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-cal-shell-view-private.c b/calendar/module/e-cal-shell-view-private.c
index aa7b6e336e..f681a2c2f3 100644
--- a/calendar/module/e-cal-shell-view-private.c
+++ b/calendar/module/e-cal-shell-view-private.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -73,7 +73,7 @@ cal_shell_view_mini_calendar_date_range_changed_cb (ECalShellView *cal_shell_vie
 {
 	/* FIXME gnome-calendar.c calls update_query() here. */
 }
-                                                    
+
 static void
 cal_shell_view_mini_calendar_selection_changed_cb (ECalShellView *cal_shell_view,
                                                    ECalendarItem *calitem)
diff --git a/calendar/module/e-cal-shell-view-private.h b/calendar/module/e-cal-shell-view-private.h
index 16a06ccd9b..8308e0bf7f 100644
--- a/calendar/module/e-cal-shell-view-private.h
+++ b/calendar/module/e-cal-shell-view-private.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-cal-shell-view-taskpad.c b/calendar/module/e-cal-shell-view-taskpad.c
index 6d00eb542b..bdd136b6f7 100644
--- a/calendar/module/e-cal-shell-view-taskpad.c
+++ b/calendar/module/e-cal-shell-view-taskpad.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-cal-shell-view.c b/calendar/module/e-cal-shell-view.c
index 593b955418..5bf1c749a1 100644
--- a/calendar/module/e-cal-shell-view.c
+++ b/calendar/module/e-cal-shell-view.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-cal-shell-view.h b/calendar/module/e-cal-shell-view.h
index 42fddec55a..67fa15220c 100644
--- a/calendar/module/e-cal-shell-view.h
+++ b/calendar/module/e-cal-shell-view.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-memo-shell-backend.c b/calendar/module/e-memo-shell-backend.c
index f910bcf798..d2734e066a 100644
--- a/calendar/module/e-memo-shell-backend.c
+++ b/calendar/module/e-memo-shell-backend.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-memo-shell-backend.h b/calendar/module/e-memo-shell-backend.h
index 0ffc222121..37fe41a784 100644
--- a/calendar/module/e-memo-shell-backend.h
+++ b/calendar/module/e-memo-shell-backend.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-memo-shell-content.c b/calendar/module/e-memo-shell-content.c
index 4e06448489..ce020158ae 100644
--- a/calendar/module/e-memo-shell-content.c
+++ b/calendar/module/e-memo-shell-content.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -69,8 +69,8 @@ enum {
 };
 
 static GtkTargetEntry drag_types[] = {
-	{ "text/calendar", 0, TARGET_VCALENDAR },
-	{ "text/x-calendar", 0, TARGET_VCALENDAR }
+	{ (gchar *) "text/calendar", 0, TARGET_VCALENDAR },
+	{ (gchar *) "text/x-calendar", 0, TARGET_VCALENDAR }
 };
 
 static gpointer parent_class;
diff --git a/calendar/module/e-memo-shell-content.h b/calendar/module/e-memo-shell-content.h
index ace932c0d7..84c22d6ce4 100644
--- a/calendar/module/e-memo-shell-content.h
+++ b/calendar/module/e-memo-shell-content.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-memo-shell-migrate.c b/calendar/module/e-memo-shell-migrate.c
index 763d366eab..de40a7e702 100644
--- a/calendar/module/e-memo-shell-migrate.c
+++ b/calendar/module/e-memo-shell-migrate.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-memo-shell-migrate.h b/calendar/module/e-memo-shell-migrate.h
index 26139edeb8..ba163c6950 100644
--- a/calendar/module/e-memo-shell-migrate.h
+++ b/calendar/module/e-memo-shell-migrate.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-memo-shell-sidebar.c b/calendar/module/e-memo-shell-sidebar.c
index 5d5c6a7922..ca5d05c40b 100644
--- a/calendar/module/e-memo-shell-sidebar.c
+++ b/calendar/module/e-memo-shell-sidebar.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-memo-shell-sidebar.h b/calendar/module/e-memo-shell-sidebar.h
index 9a30b91e15..665c8f218a 100644
--- a/calendar/module/e-memo-shell-sidebar.h
+++ b/calendar/module/e-memo-shell-sidebar.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-memo-shell-view-actions.c b/calendar/module/e-memo-shell-view-actions.c
index 30dfde6f0e..ab0b9f0fe3 100644
--- a/calendar/module/e-memo-shell-view-actions.c
+++ b/calendar/module/e-memo-shell-view-actions.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-memo-shell-view-actions.h b/calendar/module/e-memo-shell-view-actions.h
index 97fd9a6c2b..d6fd3ca514 100644
--- a/calendar/module/e-memo-shell-view-actions.h
+++ b/calendar/module/e-memo-shell-view-actions.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-memo-shell-view-private.c b/calendar/module/e-memo-shell-view-private.c
index dbb474a7a2..69d6c0afe2 100644
--- a/calendar/module/e-memo-shell-view-private.c
+++ b/calendar/module/e-memo-shell-view-private.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-memo-shell-view-private.h b/calendar/module/e-memo-shell-view-private.h
index 04857efe69..c41eaed7c0 100644
--- a/calendar/module/e-memo-shell-view-private.h
+++ b/calendar/module/e-memo-shell-view-private.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-memo-shell-view.c b/calendar/module/e-memo-shell-view.c
index 22c4472219..e2964b061c 100644
--- a/calendar/module/e-memo-shell-view.c
+++ b/calendar/module/e-memo-shell-view.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-memo-shell-view.h b/calendar/module/e-memo-shell-view.h
index 0cbaa7b4f3..686ae734c9 100644
--- a/calendar/module/e-memo-shell-view.h
+++ b/calendar/module/e-memo-shell-view.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-task-shell-backend.c b/calendar/module/e-task-shell-backend.c
index 9e35b47871..6bded3e412 100644
--- a/calendar/module/e-task-shell-backend.c
+++ b/calendar/module/e-task-shell-backend.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-task-shell-backend.h b/calendar/module/e-task-shell-backend.h
index edb56f2986..63b157ad85 100644
--- a/calendar/module/e-task-shell-backend.h
+++ b/calendar/module/e-task-shell-backend.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-task-shell-content.c b/calendar/module/e-task-shell-content.c
index 280bc7cf18..0177c6c3c3 100644
--- a/calendar/module/e-task-shell-content.c
+++ b/calendar/module/e-task-shell-content.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -70,8 +70,8 @@ enum {
 };
 
 static GtkTargetEntry drag_types[] = {
-	{ "text/calendar", 0, TARGET_VCALENDAR },
-	{ "text/x-calendar", 0, TARGET_VCALENDAR }
+	{ (gchar *) "text/calendar", 0, TARGET_VCALENDAR },
+	{ (gchar *) "text/x-calendar", 0, TARGET_VCALENDAR }
 };
 
 static gpointer parent_class;
diff --git a/calendar/module/e-task-shell-content.h b/calendar/module/e-task-shell-content.h
index e749d61143..7e0b2128a7 100644
--- a/calendar/module/e-task-shell-content.h
+++ b/calendar/module/e-task-shell-content.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -63,7 +63,7 @@ enum {
 	E_TASK_SHELL_CONTENT_SELECTION_CAN_EDIT		= 1 << 3,
 	E_TASK_SHELL_CONTENT_SELECTION_HAS_COMPLETE	= 1 << 4,
 	E_TASK_SHELL_CONTENT_SELECTION_HAS_INCOMPLETE	= 1 << 5,
-	E_TASK_SHELL_CONTENT_SELECTION_HAS_URL		= 1 << 6 
+	E_TASK_SHELL_CONTENT_SELECTION_HAS_URL		= 1 << 6
 };
 
 struct _ETaskShellContent {
diff --git a/calendar/module/e-task-shell-migrate.c b/calendar/module/e-task-shell-migrate.c
index 76e53f765c..9653fb95ea 100644
--- a/calendar/module/e-task-shell-migrate.c
+++ b/calendar/module/e-task-shell-migrate.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-task-shell-migrate.h b/calendar/module/e-task-shell-migrate.h
index 6853dd818c..4cb91c9f4a 100644
--- a/calendar/module/e-task-shell-migrate.h
+++ b/calendar/module/e-task-shell-migrate.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-task-shell-sidebar.c b/calendar/module/e-task-shell-sidebar.c
index f23a2be7b2..827a0a037e 100644
--- a/calendar/module/e-task-shell-sidebar.c
+++ b/calendar/module/e-task-shell-sidebar.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -433,7 +433,7 @@ task_shell_sidebar_check_state (EShellSidebar *shell_sidebar)
 	ETaskShellSidebar *task_shell_sidebar;
 	ESourceSelector *selector;
 	ESource *source;
-	gboolean is_system = FALSE; 
+	gboolean is_system = FALSE;
 	guint32 state = 0;
 
 	task_shell_sidebar = E_TASK_SHELL_SIDEBAR (shell_sidebar);
diff --git a/calendar/module/e-task-shell-sidebar.h b/calendar/module/e-task-shell-sidebar.h
index a6d7241105..5d4c74fe11 100644
--- a/calendar/module/e-task-shell-sidebar.h
+++ b/calendar/module/e-task-shell-sidebar.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-task-shell-view-actions.c b/calendar/module/e-task-shell-view-actions.c
index 5de630e7d0..4645ac0e56 100644
--- a/calendar/module/e-task-shell-view-actions.c
+++ b/calendar/module/e-task-shell-view-actions.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -461,7 +461,7 @@ action_task_new_cb (GtkAction *action,
 
 	gtk_window_present (GTK_WINDOW (editor));
 
-	g_object_unref (comp);	
+	g_object_unref (comp);
 	g_object_unref (client);
 }
 
diff --git a/calendar/module/e-task-shell-view-actions.h b/calendar/module/e-task-shell-view-actions.h
index 163a6400cd..d7db39bcc9 100644
--- a/calendar/module/e-task-shell-view-actions.h
+++ b/calendar/module/e-task-shell-view-actions.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-task-shell-view-private.c b/calendar/module/e-task-shell-view-private.c
index 58bda3d9bb..d6fd8e35aa 100644
--- a/calendar/module/e-task-shell-view-private.c
+++ b/calendar/module/e-task-shell-view-private.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-task-shell-view-private.h b/calendar/module/e-task-shell-view-private.h
index c613e9e9fe..d3bb3cf086 100644
--- a/calendar/module/e-task-shell-view-private.h
+++ b/calendar/module/e-task-shell-view-private.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-task-shell-view.c b/calendar/module/e-task-shell-view.c
index d2f7899ce6..ce1b53a43c 100644
--- a/calendar/module/e-task-shell-view.c
+++ b/calendar/module/e-task-shell-view.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/e-task-shell-view.h b/calendar/module/e-task-shell-view.h
index 8dca041e19..8478e53cc2 100644
--- a/calendar/module/e-task-shell-view.h
+++ b/calendar/module/e-task-shell-view.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/module/evolution-module-calendar.c b/calendar/module/evolution-module-calendar.c
index e89005fde6..63bf98ead9 100644
--- a/calendar/module/evolution-module-calendar.c
+++ b/calendar/module/evolution-module-calendar.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)