aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2010-11-03 20:27:06 +0800
committerMilan Crha <mcrha@redhat.com>2010-11-03 20:27:06 +0800
commit76afb0dea33fc58274a9845446979ca4793af96c (patch)
treee083d7444804a1ee3b0710c18dac2b9fa73f2063
parent0d4a84a5fe468d3f4c623501ac1943fc1c9f91f8 (diff)
downloadgsoc2013-evolution-76afb0dea33fc58274a9845446979ca4793af96c.tar
gsoc2013-evolution-76afb0dea33fc58274a9845446979ca4793af96c.tar.gz
gsoc2013-evolution-76afb0dea33fc58274a9845446979ca4793af96c.tar.bz2
gsoc2013-evolution-76afb0dea33fc58274a9845446979ca4793af96c.tar.lz
gsoc2013-evolution-76afb0dea33fc58274a9845446979ca4793af96c.tar.xz
gsoc2013-evolution-76afb0dea33fc58274a9845446979ca4793af96c.tar.zst
gsoc2013-evolution-76afb0dea33fc58274a9845446979ca4793af96c.zip
Bug #632483 - [WinXP] Does not start when updated from 2.8
-rw-r--r--mail/e-mail-migrate.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index 0956ccdde7..f4293680a0 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -821,29 +821,22 @@ e_mail_migrate (EShellBackend *shell_backend,
if (major == 0)
return emm_setup_initial (data_dir);
- if (major < 2 || (major == 2 && minor < 12)) {
#ifndef G_OS_WIN32
+ if (major < 2 || (major == 2 && minor < 12)) {
em_update_accounts_2_11 ();
-#else
- g_error ("Upgrading from ancient versions not supported on Windows");
-#endif
}
if (major < 2 || (major == 2 && minor < 22))
-#ifndef G_OS_WIN32
em_update_message_notify_settings_2_21 ();
-#else
- g_error ("Upgrading from ancient versions not supported on Windows");
-#endif
if (major < 2 || (major == 2 && minor < 24)) {
-#ifndef G_OS_WIN32
em_update_sa_junk_setting_2_23 ();
migrate_to_db (shell_backend);
+ }
#else
- g_error ("Upgrading from ancient versions not supported on Windows");
+ if (major < 2 || (major == 2 && minor < 24))
+ g_debug ("Upgrading from ancient versions %d.%d not supported on Windows", major, minor);
#endif
- }
if (major < 2 || (major == 2 && minor < 32)) {
em_ensure_proxy_ignore_hosts_being_list ();