aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-07-30 20:04:40 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-07-30 20:04:40 +0800
commit1d2a02b6581372e13a2162bef597fb93a6d163ab (patch)
tree26bd9d80a76164bf9cc044ff2bbe0719ede43ddb
parent80d4fed16263cb7bf31ca219642b867e4e77f45a (diff)
downloadgsoc2013-evolution-1d2a02b6581372e13a2162bef597fb93a6d163ab.tar
gsoc2013-evolution-1d2a02b6581372e13a2162bef597fb93a6d163ab.tar.gz
gsoc2013-evolution-1d2a02b6581372e13a2162bef597fb93a6d163ab.tar.bz2
gsoc2013-evolution-1d2a02b6581372e13a2162bef597fb93a6d163ab.tar.lz
gsoc2013-evolution-1d2a02b6581372e13a2162bef597fb93a6d163ab.tar.xz
gsoc2013-evolution-1d2a02b6581372e13a2162bef597fb93a6d163ab.tar.zst
gsoc2013-evolution-1d2a02b6581372e13a2162bef597fb93a6d163ab.zip
Remove folder-tree-expand-state.xml while migrating.
-rw-r--r--shell/e-shell-migrate.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c
index ed6537c7df..f47a5e7694 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". */