diff options
| author | Chenthill Palanisamy <pchenthill@novell.com> | 2010-11-23 04:28:24 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-30 00:41:04 +0800 |
| commit | 89557dcfee7bb9f7ca7dddfe559e89dc7b2a93df (patch) | |
| tree | 4a8c829382d963104a260c32a19634204efa8176 /shell | |
| parent | 64d24b234e59628c8d2a3adf34b416f8bd2da78d (diff) | |
| download | gsoc2013-evolution-89557dcfee7bb9f7ca7dddfe559e89dc7b2a93df.tar gsoc2013-evolution-89557dcfee7bb9f7ca7dddfe559e89dc7b2a93df.tar.gz gsoc2013-evolution-89557dcfee7bb9f7ca7dddfe559e89dc7b2a93df.tar.bz2 gsoc2013-evolution-89557dcfee7bb9f7ca7dddfe559e89dc7b2a93df.tar.lz gsoc2013-evolution-89557dcfee7bb9f7ca7dddfe559e89dc7b2a93df.tar.xz gsoc2013-evolution-89557dcfee7bb9f7ca7dddfe559e89dc7b2a93df.tar.zst gsoc2013-evolution-89557dcfee7bb9f7ca7dddfe559e89dc7b2a93df.zip | |
Migrate the local store from mbox to maildir format
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/e-shell-migrate.c | 10 |
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. */ |