[evolution] Remove folder-tree-expand-state.xml while migrating.

[Matthew Barnes <mbarnes src gnome org>]

commit 1d2a02b6581372e13a2162bef597fb93a6d163ab
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Jul 30 08:04:40 2010 -0400

    Remove folder-tree-expand-state.xml while migrating.

 shell/e-shell-migrate.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c
index ed6537c..f47a5e7 100644
--- a/shell/e-shell-migrate.c
+++ b/shell/e-shell-migrate.c
@@ -333,12 +333,21 @@ shell_xdg_migrate_config_dir_mail (EShell *shell,
 	g_free (new_filename);
 
 	/* I hate this file.  GtkHtml uses style properties for fonts. */
-	old_filename = g_build_filename (old_config_dir, "config", "gtkrc-mail-fonts", NULL);
-	new_filename = g_build_filename (new_config_dir, "gtkrc-mail-fonts", NULL);
+	old_filename = g_build_filename (
+		old_config_dir, "config", "gtkrc-mail-fonts", NULL);
+	new_filename = g_build_filename (
+		new_config_dir, "gtkrc-mail-fonts", NULL);
 	shell_xdg_migrate_rename (old_filename, new_filename);
 	g_free (old_filename);
 	g_free (new_filename);
 
+	/* This file is no longer used.  Try removing it. */
+	old_filename = g_build_filename (
+		old_config_dir, "config",
+		"folder-tree-expand-state.xml", NULL);
+	g_unlink (old_filename);
+	g_free (old_filename);
+
 	/* Everything else in the "config" directory just should be
 	 * per-folder ETree files recording the expanded state of mail
 	 * threads.  Rename this directory to "folders". */