1 files changed, 61 insertions, 3 deletions

diff --git a/shell/main.c b/shell/main.c
index 5d7cebf635..6fc007c6e8 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -24,6 +24,7 @@
 
 #include "e-util/e-dialog-utils.h"
 #include "e-util/e-gtk-utils.h"
+#include "e-util/e-bconf-map.h"
 
 #include "e-icon-factory.h"
 #include "e-shell-constants.h"
@@ -31,6 +32,10 @@
 
 #include "e-shell.h"
 
+#include <libxml/xmlmemory.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+
 #include <gconf/gconf-client.h>
 
 #include <gtk/gtkalignment.h>
@@ -338,21 +343,74 @@ new_window_created_callback (EShell *shell,
 
 #endif /* DEVELOPMENT_WARNING */
 
+static gboolean
+detect_version (GConfClient *gconf, int *major, int *minor, int *revision)
+{
+	char *val, *evolution_dir, *filename;
+	struct stat st;
+	
+	evolution_dir = g_build_filename (g_get_home_dir (), "evolution", NULL);
+	filename = g_build_filename (evolution_dir, "config.xmldb", NULL);
+	
+	val = gconf_client_get_string(gconf, "/apps/evolution/version", NULL);	
+	if (val) {
+		/* Since 1.4.0 We've been keeping the version key in gconf */
+		sscanf(val, "%u.%u.%u", major, minor, revision);
+		g_free(val);
+	} else if (lstat (filename, &st) != 0 || !S_ISDIR (st.st_mode)) {
+		/* If ~/evolution does not exit or is not a directory it must be a new installation */
+		*major = 0;
+		*minor = 0;
+		*revision = 0;
+	} else {
+		xmlDocPtr config_doc = NULL;
+		xmlNodePtr source;
+		char *tmp;
+		
+		if (lstat(filename, &st) == 0
+		    && S_ISREG(st.st_mode))
+			config_doc = xmlParseFile (filename);
+
+		tmp = NULL;
+		if (config_doc
+		    && (source = e_bconf_get_path (config_doc, "/Shell"))
+		    && (tmp = e_bconf_get_value (source, "upgrade_from_1_0_to_1_2_performed"))
+		    && tmp[0] == '1' ) {
+			*major = 1;
+			*minor = 2;
+			*revision = 0;
+		} else {
+			*major = 1;
+			*minor = 0;
+			*revision = 0;
+		}
+		if (tmp)
+			xmlFree(tmp);
+		if (config_doc)
+			xmlFreeDoc (config_doc);		
+	}
+
+	g_free (evolution_dir);
+	g_free (filename);
+
+	return TRUE;
+}
+
 static void
 attempt_upgrade (EShell *shell)
 {
 	GConfClient *gconf_client;
 	int major = 0, minor = 0, revision = 0;
 
-	if (!e_upgrade_detect_version (&major, &minor, &revision)
+	gconf_client = gconf_client_get_default ();
+
+	if (!detect_version (gconf_client, &major, &minor, &revision)
 	    || !e_shell_attempt_upgrade (shell, major, minor, revision)) 
 		e_notice (NULL, GTK_MESSAGE_ERROR,
 			  _("Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
 			    "The data hasn't been deleted, but it will not be seen by this version of Evolution.\n"),
 			  major, minor, revision);
 
-
-	gconf_client = gconf_client_get_default ();
 	gconf_client_set_string (gconf_client, "/apps/evolution/version", VERSION, NULL);
 	g_object_unref (gconf_client);
 }