[evolution/wip/gsettings] Bug #632483 - [WinXP] Does not start when updated from 2.8



commit 73b37d2a69c275894894e88ece153dff33d1f681
Author: Milan Crha <mcrha redhat com>
Date:   Wed Nov 3 13:27:06 2010 +0100

    Bug #632483 - [WinXP] Does not start when updated from 2.8

 mail/e-mail-migrate.c |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index 0956ccd..f429368 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 ();



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]