aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorChenthill Palanisamy <pchenthill@novell.com>2010-11-23 04:28:24 +0800
committerChenthill Palanisamy <pchenthill@novell.com>2010-11-23 04:34:03 +0800
commite3dda0436d981d9632a529aa5ca7230cb343694b (patch)
tree08c6ddc8d5daa9ecc8e037ce7ecdc9ea71327952 /shell
parentb5c8f6f9be84477d3fe201c5cc234256399542a6 (diff)
downloadgsoc2013-evolution-e3dda0436d981d9632a529aa5ca7230cb343694b.tar.gz
gsoc2013-evolution-e3dda0436d981d9632a529aa5ca7230cb343694b.tar.zst
gsoc2013-evolution-e3dda0436d981d9632a529aa5ca7230cb343694b.zip
Migrate the local store from mbox to maildir format
Diffstat (limited to 'shell')
-rw-r--r--shell/e-shell-migrate.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c
index f4ac0b7de5..3f3f6f563b 100644
--- a/shell/e-shell-migrate.c
+++ b/shell/e-shell-migrate.c
@@ -822,11 +822,8 @@ e_shell_migrate_attempt (EShell *shell)
if (curr_major <= 2 && curr_minor <= 30)
fix_folder_permissions (e_get_user_data_dir ());
- if (!(curr_major > major ||
- (curr_major == major && curr_minor > minor) ||
- (curr_major == major && curr_minor == minor && curr_micro > micro)))
- goto check_old;
-
+ /* Attempt to run migration all the time and let the backend
+ make the choice */
if (!shell_migrate_attempt (shell, major, minor, micro))
_exit (EXIT_SUCCESS);
@@ -837,9 +834,6 @@ e_shell_migrate_attempt (EShell *shell)
g_free (string);
migrated = TRUE;
-
-check_old:
-
key = GCONF_LAST_VERSION_KEY;
/* Try to retrieve the last migrated version from GConf. */