evolution-exchange r1644 - in trunk: . storage

[tml svn gnome org]

Author: tml
Date: Thu May  8 01:47:14 2008
New Revision: 1644
URL: http://svn.gnome.org/viewvc/evolution-exchange?rev=1644&view=rev

Log:
2008-05-08  Tor Lillqvist  <tml novell com>

	* storage/exchange-migrate.c: Bypass migration code on Windows as
	there are no old evolution-exchange 1.x deployments on Windows to
	migrate from.



Modified:
   trunk/ChangeLog
   trunk/storage/exchange-migrate.c

Modified: trunk/storage/exchange-migrate.c
==============================================================================
--- trunk/storage/exchange-migrate.c	(original)
+++ trunk/storage/exchange-migrate.c	Thu May  8 01:47:14 2008
@@ -47,6 +47,14 @@
 CORBA_short min=0;
 CORBA_short rev=0;
 
+#ifndef G_OS_WIN32
+
+/* No need for migration code from evolution-exchange 1.x on Win32.
+ * If and when the same code is partly used for migrating between
+ * future evolution-exchange versions, that code will have to be
+ * revised and ported as necessary.
+ */
+
 gchar *label_string = NULL;
 
 static void
@@ -449,6 +457,8 @@
 	return ret;
 }
 
+#endif
+
 void
 exchange_migrate (const CORBA_short major,
 		  const CORBA_short minor,
@@ -464,7 +474,7 @@
 
 	/* FIXME: version check */
 	if (maj == 1 && min <= 5) {
-
+#ifndef G_OS_WIN32
 		if (!base_dir)
 			return;
 
@@ -507,5 +517,6 @@
 		if (ret == FALSE)
 			show_error_dialog ();
 
+#endif
 	}
 }