41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
Do not create local_mbox when user denied maildir migration
|
|
|
|
Do not always ask for migration to maildir
|
|
|
|
One can downgrade GConf key /apps/evolution/last_version to something
|
|
below 2.92.0 and he/she will be asked again.
|
|
|
|
|
|
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
|
|
index ffecec1..24df694 100644
|
|
--- a/mail/e-mail-migrate.c
|
|
+++ b/mail/e-mail-migrate.c
|
|
@@ -1046,11 +1046,12 @@ migrate_local_store (EShellBackend *shell_backend)
|
|
session = (EMMigrateSession *) em_migrate_session_new (data_dir);
|
|
camel_session_set_online ((CamelSession *) session, FALSE);
|
|
|
|
- if (migrate == GTK_RESPONSE_YES)
|
|
+ if (migrate == GTK_RESPONSE_YES) {
|
|
ret = migrate_mbox_to_maildir (shell_backend, session);
|
|
|
|
- if (ret)
|
|
- create_mbox_account (shell_backend, session);
|
|
+ if (ret)
|
|
+ create_mbox_account (shell_backend, session);
|
|
+ }
|
|
|
|
g_unlink (migrating_file_flag);
|
|
|
|
@@ -1165,8 +1165,10 @@ e_mail_migrate (EShellBackend *shell_backend,
|
|
em_ensure_proxy_ignore_hosts_being_list ();
|
|
}
|
|
|
|
- if (!migrate_local_store (shell_backend))
|
|
- return FALSE;
|
|
+ if (major < 2 || (major == 2 && minor < 92)) {
|
|
+ if (!migrate_local_store (shell_backend))
|
|
+ return FALSE;
|
|
+ }
|
|
|
|
return TRUE;
|
|
}
|