From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
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. ***/
 
