From f17f36a31ed398d797cf96a9029efaaf83485f43 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Tue, 13 Jan 2004 18:51:54 +0000 Subject: detect the version more completely with the new util routine (main): don't 2004-01-13 JP Rosevear * main.c (attempt_upgrade): detect the version more completely with the new util routine (main): don't upgrade the config db here * e-shell.h: update proto * e-shell.c (e_shell_attempt_upgrade): take the current version as numerical params * e-config-upgrade.h: update prototypes * e-config-upgrade.c (e_config_upgrade): remove version detection and saving code (e_upgrade_detect_version): routine to do the version detection * e-config-upgrade.c: drop my-evolution upgrade code svn path=/trunk/; revision=24205 --- shell/e-config-upgrade.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'shell/e-config-upgrade.h') diff --git a/shell/e-config-upgrade.h b/shell/e-config-upgrade.h index c012e30526..f52801ce07 100644 --- a/shell/e-config-upgrade.h +++ b/shell/e-config-upgrade.h @@ -23,6 +23,8 @@ #ifndef _E_CONFIG_UPGRADE_H #define _E_CONFIG_UPGRADE_H -int e_config_upgrade(const char *edir); +gboolean e_upgrade_detect_version (int *major, int *minor, int *revision); + +int e_config_upgrade(int major, int minor, int revision); #endif /* _E_CONFIG_UPGRADE_H */ -- cgit v1.2.3