[evolution-patches] shell patch to decouple "upgrade revision" from evolution version

[Chris Toshok <toshok ximian com>]

This makes it possible for us to bump the upgrade revision independently
of the release revision.

Chris

Index: e-shell.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell.c,v
retrieving revision 1.239
diff -u -r1.239 e-shell.c
--- e-shell.c	12 Mar 2004 07:58:20 -0000	1.239
+++ e-shell.c	8 Apr 2004 19:29:51 -0000
@@ -528,6 +528,7 @@
 {
 	GConfClient *gconf_client;
 	int major = 0, minor = 0, revision = 0;
+	char *version_string;
 
 	gconf_client = gconf_client_get_default ();
 
@@ -538,8 +539,10 @@
 			    "The data hasn't been deleted, but it will not be seen by this version of Evolution.\n"),
 			  major, minor, revision);
 
-	gconf_client_set_string (gconf_client, "/apps/evolution/version", VERSION, NULL);
+	version_string = g_strdup_printf ("%s.%s", BASE_VERSION, UPGRADE_REVISION);
+	gconf_client_set_string (gconf_client, "/apps/evolution/version", version_string, NULL);
 	g_object_unref (gconf_client);
+	g_free (version_string);
 }
 
 /**
@@ -666,7 +669,9 @@
 
 	g_return_val_if_fail (E_IS_SHELL (shell), FALSE);
 
-	sscanf (VERSION, "%u.%u.%u", &current_major, &current_minor, &current_revision);
+	sscanf (BASE_VERSION, "%u.%u", &current_major, &current_minor);
+
+	current_revision = atoi (UPGRADE_REVISION);
 
 	if (! (current_major > major
 	       || (current_major == major && current_minor > minor)
@@ -689,8 +694,8 @@
 		if (BONOBO_EX (&ev)) {
 			char *exception_text;
 
-			// Ignore components that do not implement this version, it might just mean that they don't need an
-			// upgrade path.
+			/* Ignore components that do not implement this version, it might just mean that they don't need an
+			   upgrade path. */
 			if (strcmp (ev._id, ex_CORBA_NO_IMPLEMENT) == 0) {
 				CORBA_exception_free (&ev);
 				continue;
@@ -1015,8 +1020,8 @@
 
 		GNOME_Evolution_Component_sendAndReceive (info->iface, &ev);
 
-		// Ignore errors, the components can decide to not implement
-		// this interface.
+		/* Ignore errors, the components can decide to not implement
+		   this interface. */
 
 		CORBA_exception_free (&ev);
 	}
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1407
diff -u -r1.1407 ChangeLog
--- ChangeLog	7 Apr 2004 20:48:40 -0000	1.1407
+++ ChangeLog	8 Apr 2004 19:29:53 -0000
@@ -1,3 +1,11 @@
+2004-04-08  Chris Toshok  <toshok ximian com>
+
+	* e-shell.c (e_shell_attempt_upgrade): use BASE_VERSION to supply
+	the major/minor version, and use UPGRADE_REVISION for the
+	revision.
+	(attempt_upgrade): store the key based on BASE_VERSION and
+	UPGRADE_REVISION.
+
 2004-04-07  Jeffrey Stedfast  <fejj ximian com>
 
 	* Evolution-ConfigControl.idl: Removed the "apply" method.