Merge lp:~rodrigo-moya/ubuntu/natty/evolution/2_32_1_release into lp:~ubuntu-desktop/evolution/ubuntu

[Rodrigo Moya]

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-23 13:26:36 +0000
+++ debian/changelog	2010-11-25 16:51:49 +0000
@@ -1,3 +1,62 @@
+evolution (2.32.1-0ubuntu1) natty; urgency=low
+
+  * Upstream release 2.32.1
+    - Bug #632293 - Do not add POP accounts into folder tree
+    - Bug #634088 - Uses uninitialized variable in action_contact_new_cb
+    - Bug #628139 - Thread-safety issues in libical time zone loading
+    - Bug #632941 - Calendar ignores preference "show/hide end times"
+    - Bug #632278 - Double .vcf extension on addressbook save
+    - Bug #632199 - Opening calendar from panel clock goes to previous day
+    - Bug #592045 - Use week-day names in abbreviated date
+    - Bug #632870 - Cut and paste broken in ESignatureEditor
+    - Bug #597567 - Crash in comp_subject()
+    - Bug #631526 - Loading images doesn't use proxy credentials
+    - Bug #567265 - BCC kept on message forward from Sent folder
+    - Bug #630518 - Hides calendar parts from multipart/alternative
+    - Bug #631968 - Date wrongly displayed as Tomorrow.
+    - Bug #604981 - Always bcc ignored for Contacts.
+    - Bug #632171 - "New Address Book" dialog accepts whitespace for name
+    - Bug #630375 - Character encoding of GPG encrypted message not honored
+    - Bug #617611 - redo_queries calls gtk+ functions in non-main thread
+    - Bug #619387 - EMailBrowser doesn't honour sorting of a mail window
+    - Bug #552121 - Drop UUENCODE inline filter
+    - Bug #631588 - Sort by Subject doesn't work
+    - Bug #617953 - Hide Junk messages in Search folders
+    - Bug #618102 - Single event print doesn't show time
+    - Bug #211593 - Show week numbers on calendar printout
+    - Bug #500591 - Crash when viewing a large message
+    - Bug #630295 - Inline GPG encrypted message is not always recognized
+    - Bug #629825 - Hide Free/Busy tab if not needed in express mode
+    - Bug #615835 - Alarm not working for authenticated calendars
+    - Bug #626066 - "trust" properties on certificate authority not saved
+    - Bug #629462 - Tasks 'Due' filters don't work properly
+    - Bug #629799 - Crash importing a mail with an ics attachment
+    - Bug #630294 - Shouldn't send invitation reply when has no organizer
+    - Bug #628522 - Invalid access off end of array in e_bit_array_delete()
+    - Bug #630700 - Crash on message send
+    - Bug #629266 - Crash on search in Current Account
+    - Bug #604080 - Predefined account SSL not propagated to UI
+    - Bug #629934 - Month view defaults to Monday as start of week
+    - Bug #629636 - Doesn't recognize local ESource-s
+    - Bug #629480 - calendar-gui-WARNING: Couldn't find event window
+    - Bug #629150 - Empty calendar view
+    - Bug #629972 - [backup-restore] Problems restoring old data
+    - Drop accessibility support for ECellText.
+    - Workaround crash when pasting nothing into html message composer
+    - stock_appontment-reminder icons renamed
+    - Fix build on platforms when ngettext is a macro
+    - Memory leaks around g_value_set_string
+    - MailFolderCache notifies in reverse order
+    - Calendar's "Open Web Page" actions doesn't work
+    - Updated translations (eu, ja, cs, ca@valencia, ca, gl, ta, et
+  * debian/patches/93_fix_sources_migration.patch:
+    - Add upstream patch to fix migration of calendar and addressbook sources to
+      the new location.
+  * debian/patches/92_remove_views_after_xdg_migration.patch:
+    - Remove upstreamed patch
+
+ -- Rodrigo Moya <[e-mail]>  Thu, 25 Nov 2010 16:11:59 +0100
+
 evolution (2.32.0-0ubuntu1) natty; urgency=low
 
   * Upstream release 2.32.0

=== removed file 'debian/patches/92_remove_views_after_xdg_migration.patch'
--- debian/patches/92_remove_views_after_xdg_migration.patch	2010-11-17 15:10:47 +0000
+++ debian/patches/92_remove_views_after_xdg_migration.patch	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-From: Mathieu Trudel-Lapierre <[e-mail]>
-Subject: Cleanup "views" directories
-
- Make sure the "views" directories get removed once xdg migration of its
- files is done. This is because differently from ..._rename, 
- ..._rename_files only goes through the contents of the directory and
- renames the files there, but doesn't touch the base directory, even in
- corrections.
-
- As the <backend>/config directories are dealt in the same way, and because
- "views" should also be considered config, make sure we process "views" the
- same way as "config" gets processed -- rename the contents, then trash the
- empty directory later.
-
-diff -Nur -x '*.orig' -x '*~' evolution-2.32.0//shell/e-shell-migrate.c evolution-2.32.0.new//shell/e-shell-migrate.c
---- evolution-2.32.0//shell/e-shell-migrate.c	2010-09-13 08:18:24.000000000 -0400
-+++ evolution-2.32.0.new//shell/e-shell-migrate.c	2010-11-16 14:53:20.386539000 -0500
-@@ -433,14 +443,15 @@
- }
- 
- static void
--shell_xdg_migrate_config_dir_cleanup (EShell *shell,
-+shell_xdg_migrate_dir_cleanup (EShell *shell,
-                                       const gchar *old_base_dir,
--                                      const gchar *backend_name)
-+                                      const gchar *backend_name,
-+                                      const gchar *dir_name)
- {
- 	gchar *dirname;
- 
- 	dirname = g_build_filename (
--		old_base_dir, backend_name, "config", NULL);
-+		old_base_dir, backend_name, dir_name, NULL);
- 
- 	shell_xdg_migrate_rmdir (dirname);
- 
-@@ -467,10 +478,14 @@
- 	/* Handle backend-specific files. */
- 	shell_xdg_migrate_config_dir_mail (shell, old_base_dir);
- 
--	/* Remove leftover "config" directories. */
-+	/* Remove leftover config directories. */
- 	for (ii = 0; shell_backend_names[ii] != NULL; ii++)
--		shell_xdg_migrate_config_dir_cleanup (
--			shell, old_base_dir, shell_backend_names[ii]);
-+	{
-+		shell_xdg_migrate_dir_cleanup (
-+			shell, old_base_dir, shell_backend_names[ii], "config");
-+		shell_xdg_migrate_dir_cleanup (
-+			shell, old_base_dir, shell_backend_names[ii], "views");
-+	}
- 
- 	/*** Miscellaneous configuration files. ***/
- 

=== added file 'debian/patches/93_fix_sources_migration.patch'
--- debian/patches/93_fix_sources_migration.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/93_fix_sources_migration.patch	2010-11-25 16:51:49 +0000
@@ -0,0 +1,490 @@
+diff --git a/calendar/common/authentication.c b/calendar/common/authentication.c
+index 0420f1f..286b7d6 100644
+--- a/calendar/common/authentication.c
++++ b/calendar/common/authentication.c
+@@ -274,6 +274,7 @@ fail:
+ 	} else if (g_error_matches (
+ 		error, E_CALENDAR_ERROR, E_CALENDAR_STATUS_BUSY)) {
+ 		g_clear_error (&error);
++		g_usleep (250000);
+ 		goto try_again;
+ 
+ 	} else {
+diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
+index 3549fb4..d46302c 100644
+--- a/calendar/gui/e-cal-model.c
++++ b/calendar/gui/e-cal-model.c
+@@ -2114,6 +2114,19 @@ backend_died_cb (ECal *client, gpointer user_data)
+ 	e_cal_model_remove_client (model, client);
+ }
+ 
++static gboolean
++wait_open_cb (gpointer data)
++{
++	ECal *client = data;
++
++	g_return_val_if_fail (client != NULL, FALSE);
++	g_return_val_if_fail (E_IS_CAL (client), FALSE);
++
++	e_cal_open_async (client, FALSE);
++
++	return FALSE;
++}
++
+ static void
+ cal_opened_cb (ECal *client, const GError *error, gpointer user_data)
+ {
+@@ -2121,10 +2134,13 @@ cal_opened_cb (ECal *client, const GError *error, gpointer user_data)
+ 	ECalModelClient *client_data;
+ 
+ 	if (g_error_matches (error, E_CALENDAR_ERROR, E_CALENDAR_STATUS_BUSY)) {
+-		e_cal_open_async (client, FALSE);
++		g_timeout_add (250, wait_open_cb, client);
+ 		return;
+ 	}
+ 
++	/* Stop listening for this calendar to be opened */
++	g_signal_handlers_disconnect_matched (client, G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, 0, 0, NULL, cal_opened_cb, model);
++
+ 	if (error) {
+ 		e_cal_model_remove_client (model, client);
+ 		e_cal_model_update_status_message (model, NULL, -1.0);
+@@ -2133,9 +2149,6 @@ cal_opened_cb (ECal *client, const GError *error, gpointer user_data)
+ 
+ 	e_cal_model_update_status_message (model, NULL, -1.0);
+ 
+-	/* Stop listening for this calendar to be opened */
+-	g_signal_handlers_disconnect_matched (client, G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, 0, 0, NULL, cal_opened_cb, model);
+-
+ 	client_data = find_client_data (model, client);
+ 	g_return_if_fail (client_data);
+ 
+diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c
+index a1cdbb8..46201fb 100644
+--- a/capplet/settings/mail-capplet-shell.c
++++ b/capplet/settings/mail-capplet-shell.c
+@@ -283,21 +283,18 @@ mail_capplet_shell_new (gint socket_id, gboolean just_druid, gboolean main_loop)
+ 	return GTK_WIDGET (shell);
+ }
+ 
++#define LOCAL_BASE_URI "local:"
+ #define PERSONAL_RELATIVE_URI "system"
+ 
+ static void
+-setup_abooks()
++setup_abooks (void)
+ {
+-	gchar *base_dir, *uri;
+ 	GSList *groups;
+ 	ESourceGroup *group;
+ 	ESourceList *list = NULL;
+ 	ESourceGroup *on_this_computer = NULL;
+ 	ESource *personal_source = NULL;
+ 
+-	base_dir = g_build_filename (e_get_user_data_dir (), "addressbook", "local", NULL);
+-	uri = g_filename_to_uri (base_dir, NULL, NULL);
+-
+ 	if (!e_book_get_addressbooks(&list, NULL)) {
+ 		g_warning ("Unable to get books\n");
+ 		return;
+@@ -307,16 +304,25 @@ setup_abooks()
+ 	if (groups) {
+ 		/* groups are already there, we need to search for things... */
+ 		GSList *g;
++		gchar *base_dir, *base_uri;
+ 
+-		for (g = groups; g; g = g->next) {
++		base_dir = g_build_filename (e_get_user_data_dir (), "addressbook", "local", NULL);
++		base_uri = g_filename_to_uri (base_dir, NULL, NULL);
+ 
++		for (g = groups; g; g = g->next) {
+ 			group = E_SOURCE_GROUP (g->data);
+ 
+-			if (!on_this_computer && !strcmp (uri, e_source_group_peek_base_uri (group))) {
++			if (strcmp (base_uri, e_source_group_peek_base_uri (group)) == 0)
++				e_source_group_set_base_uri (group, LOCAL_BASE_URI);
++
++			if (!on_this_computer && !strcmp (LOCAL_BASE_URI, e_source_group_peek_base_uri (group))) {
+ 				on_this_computer = g_object_ref (group);
+ 				break;
+ 			}
+ 		}
++
++		g_free (base_dir);
++		g_free (base_uri);
+ 	}
+ 
+ 	if (on_this_computer) {
+@@ -339,7 +345,7 @@ setup_abooks()
+ 	}
+ 	else {
+ 		/* create the local source group */
+-		group = e_source_group_new (_("On This Computer"), uri);
++		group = e_source_group_new (_("On This Computer"), LOCAL_BASE_URI);
+ 		e_source_list_add_group (list, group, -1);
+ 
+ 		on_this_computer = group;
+@@ -362,7 +368,5 @@ setup_abooks()
+ 
+ 	e_source_list_sync (list, NULL);
+ 	g_object_unref (list);
+-	g_free (uri);
+-	g_free (base_dir);
+ }
+ 
+diff --git a/modules/addressbook/e-book-shell-migrate.c b/modules/addressbook/e-book-shell-migrate.c
+index 7440564..7b91a04 100644
+--- a/modules/addressbook/e-book-shell-migrate.c
++++ b/modules/addressbook/e-book-shell-migrate.c
+@@ -66,6 +66,7 @@ typedef struct {
+ 	GtkWidget *progress;
+ } MigrationContext;
+ 
++#define LOCAL_BASE_URI "local:"
+ #define LDAP_BASE_URI "ldap://"
+ #define PERSONAL_RELATIVE_URI "system"
+ 
+@@ -77,27 +78,28 @@ create_groups (MigrationContext *context,
+ {
+ 	GSList *groups;
+ 	ESourceGroup *group;
+-	gchar *base_uri, *base_uri_proto;
+ 
+ 	*on_this_computer = NULL;
+ 	*on_ldap_servers = NULL;
+ 	*personal_source = NULL;
+ 
+-	base_uri = g_build_filename (context->data_dir, "local", NULL);
+-
+-	base_uri_proto = g_filename_to_uri (base_uri, NULL, NULL);
+-
+ 	groups = e_source_list_peek_groups (context->source_list);
+ 	if (groups) {
+ 		/* groups are already there, we need to search for things... */
+ 		GSList *g;
++		gchar *base_dir, *base_uri;
+ 
+-		for (g = groups; g; g = g->next) {
++		base_dir = g_build_filename (context->data_dir, "local", NULL);
++		base_uri = g_filename_to_uri (base_dir, NULL, NULL);
+ 
++		for (g = groups; g; g = g->next) {
+ 			group = E_SOURCE_GROUP (g->data);
+ 
++			if (strcmp (base_uri, e_source_group_peek_base_uri (group)) == 0)
++				e_source_group_set_base_uri (group, LOCAL_BASE_URI);
++
+ 			if (!*on_this_computer &&
+-					!strcmp (base_uri_proto,
++					!strcmp (LOCAL_BASE_URI,
+ 					e_source_group_peek_base_uri (group)))
+ 				*on_this_computer = g_object_ref (group);
+ 			else if (!*on_ldap_servers &&
+@@ -105,6 +107,9 @@ create_groups (MigrationContext *context,
+ 					e_source_group_peek_base_uri (group)))
+ 				*on_ldap_servers = g_object_ref (group);
+ 		}
++
++		g_free (base_dir);
++		g_free (base_uri);
+ 	}
+ 
+ 	if (*on_this_computer) {
+@@ -127,7 +132,7 @@ create_groups (MigrationContext *context,
+ 	}
+ 	else {
+ 		/* create the local source group */
+-		group = e_source_group_new (_("On This Computer"), base_uri_proto);
++		group = e_source_group_new (_("On This Computer"), LOCAL_BASE_URI);
+ 		e_source_list_add_group (context->source_list, group, -1);
+ 
+ 		*on_this_computer = group;
+@@ -150,9 +155,6 @@ create_groups (MigrationContext *context,
+ 
+ 		*on_ldap_servers = group;
+ 	}
+-
+-	g_free (base_uri_proto);
+-	g_free (base_uri);
+ }
+ 
+ static MigrationContext *
+diff --git a/modules/calendar/e-cal-shell-migrate.c b/modules/calendar/e-cal-shell-migrate.c
+index c1a7221..d27b941 100644
+--- a/modules/calendar/e-cal-shell-migrate.c
++++ b/modules/calendar/e-cal-shell-migrate.c
+@@ -42,6 +42,7 @@
+ #include "calendar/gui/e-cal-event.h"
+ #include "shell/e-shell.h"
+ 
++#define LOCAL_BASE_URI "local:"
+ #define WEBCAL_BASE_URI "webcal://"
+ #define CONTACTS_BASE_URI "contacts://"
+ #define BAD_CONTACTS_BASE_URI "contact://"
+@@ -79,8 +80,6 @@ create_calendar_sources (EShellBackend *shell_backend,
+ 	EShellSettings *shell_settings;
+ 	GSList *groups;
+ 	ESourceGroup *group;
+-	gchar *base_uri, *base_uri_proto;
+-	const gchar *base_dir;
+ 
+ 	*on_this_computer = NULL;
+ 	*on_the_web = NULL;
+@@ -90,15 +89,14 @@ create_calendar_sources (EShellBackend *shell_backend,
+ 	shell = e_shell_backend_get_shell (shell_backend);
+ 	shell_settings = e_shell_get_shell_settings (shell);
+ 
+-	base_dir = e_shell_backend_get_data_dir (shell_backend);
+-	base_uri = g_build_filename (base_dir, "local", NULL);
+-
+-	base_uri_proto = g_filename_to_uri (base_uri, NULL, NULL);
+-
+ 	groups = e_source_list_peek_groups (source_list);
+ 	if (groups) {
+ 		/* groups are already there, we need to search for things... */
+ 		GSList *g;
++		gchar *base_dir, *base_uri;
++
++		base_dir = g_build_filename (e_shell_backend_get_data_dir (shell_backend), "local", NULL);
++		base_uri = g_filename_to_uri (base_dir, NULL, NULL);
+ 
+ 		for (g = groups; g; g = g->next) {
+ 
+@@ -108,9 +106,9 @@ create_calendar_sources (EShellBackend *shell_backend,
+ 				e_source_group_set_base_uri (group, CONTACTS_BASE_URI);
+ 
+ 			if (!strcmp (base_uri, e_source_group_peek_base_uri (group)))
+-				e_source_group_set_base_uri (group, base_uri_proto);
++				e_source_group_set_base_uri (group, LOCAL_BASE_URI);
+ 
+-			if (!*on_this_computer && !strcmp (base_uri_proto,
++			if (!*on_this_computer && !strcmp (LOCAL_BASE_URI,
+ 				e_source_group_peek_base_uri (group)))
+ 				*on_this_computer = g_object_ref (group);
+ 
+@@ -122,6 +120,9 @@ create_calendar_sources (EShellBackend *shell_backend,
+ 				e_source_group_peek_base_uri (group)))
+ 				*contacts = g_object_ref (group);
+ 		}
++
++		g_free (base_dir);
++		g_free (base_uri);
+ 	}
+ 
+ 	if (*on_this_computer) {
+@@ -143,7 +144,7 @@ create_calendar_sources (EShellBackend *shell_backend,
+ 		}
+ 	} else {
+ 		/* create the local source group */
+-		group = e_source_group_new (_("On This Computer"), base_uri_proto);
++		group = e_source_group_new (_("On This Computer"), LOCAL_BASE_URI);
+ 		e_source_list_add_group (source_list, group, -1);
+ 
+ 		*on_this_computer = group;
+@@ -189,9 +190,6 @@ create_calendar_sources (EShellBackend *shell_backend,
+ 
+ 		*contacts = group;
+ 	}
+-
+-	g_free (base_uri_proto);
+-	g_free (base_uri);
+ }
+ 
+ gboolean
+diff --git a/modules/calendar/e-memo-shell-migrate.c b/modules/calendar/e-memo-shell-migrate.c
+index d858247..d2ec8e2 100644
+--- a/modules/calendar/e-memo-shell-migrate.c
++++ b/modules/calendar/e-memo-shell-migrate.c
+@@ -34,6 +34,7 @@
+ #include "calendar/gui/calendar-config-keys.h"
+ #include "shell/e-shell.h"
+ 
++#define LOCAL_BASE_URI "local:"
+ #define WEBCAL_BASE_URI "webcal://"
+ #define PERSONAL_RELATIVE_URI "system"
+ #define GROUPWISE_BASE_URI "groupwise://"
+@@ -49,8 +50,6 @@ create_memo_sources (EShellBackend *shell_backend,
+ 	EShellSettings *shell_settings;
+ 	GSList *groups;
+ 	ESourceGroup *group;
+-	gchar *base_uri, *base_uri_proto;
+-	const gchar *base_dir;
+ 
+ 	*on_this_computer = NULL;
+ 	*on_the_web = NULL;
+@@ -59,25 +58,29 @@ create_memo_sources (EShellBackend *shell_backend,
+ 	shell = e_shell_backend_get_shell (shell_backend);
+ 	shell_settings = e_shell_get_shell_settings (shell);
+ 
+-	base_dir = e_shell_backend_get_data_dir (shell_backend);
+-	base_uri = g_build_filename (base_dir, "local", NULL);
+-
+-	base_uri_proto = g_filename_to_uri (base_uri, NULL, NULL);
+-
+ 	groups = e_source_list_peek_groups (source_list);
+ 	if (groups) {
+ 		/* groups are already there, we need to search for things... */
+ 		GSList *g;
++		gchar *base_dir, *base_uri;
+ 
+-		for (g = groups; g; g = g->next) {
++		base_dir = g_build_filename (e_shell_backend_get_data_dir (shell_backend), "local", NULL);
++		base_uri = g_filename_to_uri (base_dir, NULL, NULL);
+ 
++		for (g = groups; g; g = g->next) {
+ 			group = E_SOURCE_GROUP (g->data);
+ 
+-			if (!*on_this_computer && !strcmp (base_uri_proto, e_source_group_peek_base_uri (group)))
++			if (strcmp (base_uri, e_source_group_peek_base_uri (group)) == 0)
++				e_source_group_set_base_uri (group, LOCAL_BASE_URI);
++
++			if (!*on_this_computer && !strcmp (LOCAL_BASE_URI, e_source_group_peek_base_uri (group)))
+ 				*on_this_computer = g_object_ref (group);
+ 			else if (!*on_the_web && !strcmp (WEBCAL_BASE_URI, e_source_group_peek_base_uri (group)))
+ 				*on_the_web = g_object_ref (group);
+ 		}
++
++		g_free (base_dir);
++		g_free (base_uri);
+ 	}
+ 
+ 	if (*on_this_computer) {
+@@ -99,7 +102,7 @@ create_memo_sources (EShellBackend *shell_backend,
+ 		}
+ 	} else {
+ 		/* create the local source group */
+-		group = e_source_group_new (_("On This Computer"), base_uri_proto);
++		group = e_source_group_new (_("On This Computer"), LOCAL_BASE_URI);
+ 		e_source_list_add_group (source_list, group, -1);
+ 
+ 		*on_this_computer = group;
+@@ -138,9 +141,6 @@ create_memo_sources (EShellBackend *shell_backend,
+ 
+ 		*on_the_web = group;
+ 	}
+-
+-	g_free (base_uri_proto);
+-	g_free (base_uri);
+ }
+ 
+ static gboolean
+diff --git a/modules/calendar/e-task-shell-migrate.c b/modules/calendar/e-task-shell-migrate.c
+index 91da8f4..dc240b9 100644
+--- a/modules/calendar/e-task-shell-migrate.c
++++ b/modules/calendar/e-task-shell-migrate.c
+@@ -42,6 +42,7 @@
+ #include "calendar/gui/calendar-config-keys.h"
+ #include "shell/e-shell.h"
+ 
++#define LOCAL_BASE_URI "local:"
+ #define WEBCAL_BASE_URI "webcal://"
+ #define PERSONAL_RELATIVE_URI "system"
+ 
+@@ -56,8 +57,6 @@ create_task_sources (EShellBackend *shell_backend,
+ 	EShellSettings *shell_settings;
+ 	GSList *groups;
+ 	ESourceGroup *group;
+-	gchar *base_uri, *base_uri_proto;
+-	const gchar *base_dir;
+ 
+ 	*on_this_computer = NULL;
+ 	*on_the_web = NULL;
+@@ -66,27 +65,31 @@ create_task_sources (EShellBackend *shell_backend,
+ 	shell = e_shell_backend_get_shell (shell_backend);
+ 	shell_settings = e_shell_get_shell_settings (shell);
+ 
+-	base_dir = e_shell_backend_get_data_dir (shell_backend);
+-	base_uri = g_build_filename (base_dir, "local", NULL);
+-
+-	base_uri_proto = g_filename_to_uri (base_uri, NULL, NULL);
+-
+ 	groups = e_source_list_peek_groups (source_list);
+ 	if (groups) {
+ 		/* groups are already there, we need to search for things... */
+ 		GSList *g;
++		gchar *base_dir, *base_uri;
+ 
+-		for (g = groups; g; g = g->next) {
++		base_dir = g_build_filename (e_shell_backend_get_data_dir (shell_backend), "local", NULL);
++		base_uri = g_filename_to_uri (base_dir, NULL, NULL);
+ 
++		for (g = groups; g; g = g->next) {
+ 			group = E_SOURCE_GROUP (g->data);
+ 
+-			if (!*on_this_computer && !strcmp (base_uri_proto,
++			if (strcmp (base_uri, e_source_group_peek_base_uri (group)) == 0)
++				e_source_group_set_base_uri (group, LOCAL_BASE_URI);
++
++			if (!*on_this_computer && !strcmp (LOCAL_BASE_URI,
+ 				e_source_group_peek_base_uri (group)))
+ 				*on_this_computer = g_object_ref (group);
+ 			else if (!*on_the_web && !strcmp (WEBCAL_BASE_URI,
+ 				e_source_group_peek_base_uri (group)))
+ 				*on_the_web = g_object_ref (group);
+ 		}
++
++		g_free (base_dir);
++		g_free (base_uri);
+ 	}
+ 
+ 	if (*on_this_computer) {
+@@ -108,7 +111,7 @@ create_task_sources (EShellBackend *shell_backend,
+ 		}
+ 	} else {
+ 		/* create the local source group */
+-		group = e_source_group_new (_("On This Computer"), base_uri_proto);
++		group = e_source_group_new (_("On This Computer"), LOCAL_BASE_URI);
+ 		e_source_list_add_group (source_list, group, -1);
+ 
+ 		*on_this_computer = group;
+@@ -147,9 +150,6 @@ create_task_sources (EShellBackend *shell_backend,
+ 
+ 		*on_the_web = group;
+ 	}
+-
+-	g_free (base_uri_proto);
+-	g_free (base_uri);
+ }
+ 
+ gboolean
+diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c
+index f4ac0b7..7853127 100644
+--- a/shell/e-shell-migrate.c
++++ b/shell/e-shell-migrate.c
+@@ -433,14 +433,15 @@ shell_xdg_migrate_config_dir_mail (EShell *shell,
+ }
+ 
+ static void
+-shell_xdg_migrate_config_dir_cleanup (EShell *shell,
++shell_xdg_migrate_dir_cleanup (EShell *shell,
+                                       const gchar *old_base_dir,
+-                                      const gchar *backend_name)
++                                      const gchar *backend_name,
++                                      const gchar *dir_name)
+ {
+ 	gchar *dirname;
+ 
+ 	dirname = g_build_filename (
+-		old_base_dir, backend_name, "config", NULL);
++		old_base_dir, backend_name, dir_name, NULL);
+ 
+ 	shell_xdg_migrate_rmdir (dirname);
+ 
+@@ -467,10 +468,13 @@ shell_xdg_migrate_config_dir (EShell *shell,
+ 	/* Handle backend-specific files. */
+ 	shell_xdg_migrate_config_dir_mail (shell, old_base_dir);
+ 
+-	/* Remove leftover "config" directories. */
+-	for (ii = 0; shell_backend_names[ii] != NULL; ii++)
+-		shell_xdg_migrate_config_dir_cleanup (
+-			shell, old_base_dir, shell_backend_names[ii]);
++	/* Remove leftover config directories. */
++	for (ii = 0; shell_backend_names[ii] != NULL; ii++) {
++		shell_xdg_migrate_dir_cleanup (
++			shell, old_base_dir, shell_backend_names[ii], "config");
++		shell_xdg_migrate_dir_cleanup (
++			shell, old_base_dir, shell_backend_names[ii], "views");
++	}
+ 
+ 	/*** Miscellaneous configuration files. ***/
+