aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2004-01-15 14:12:19 +0800
committerMichael Zucci <zucchi@src.gnome.org>2004-01-15 14:12:19 +0800
commitbbdcea50101fdf73c85a422af5e06c91d4204334 (patch)
tree67ba9cf63f01f00f0ecdb449902c93802693665f
parent26f971004070ba13a3e3570a2c12b676e5d3d238 (diff)
downloadgsoc2013-evolution-bbdcea50101fdf73c85a422af5e06c91d4204334.tar
gsoc2013-evolution-bbdcea50101fdf73c85a422af5e06c91d4204334.tar.gz
gsoc2013-evolution-bbdcea50101fdf73c85a422af5e06c91d4204334.tar.bz2
gsoc2013-evolution-bbdcea50101fdf73c85a422af5e06c91d4204334.tar.lz
gsoc2013-evolution-bbdcea50101fdf73c85a422af5e06c91d4204334.tar.xz
gsoc2013-evolution-bbdcea50101fdf73c85a422af5e06c91d4204334.tar.zst
gsoc2013-evolution-bbdcea50101fdf73c85a422af5e06c91d4204334.zip
fix the check for ~/evolution being a directory.
2004-01-15 Not Zed <NotZed@Ximian.com> * e-config-upgrade.c (e_upgrade_detect_version): fix the check for ~/evolution being a directory. svn path=/trunk/; revision=24232
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-config-upgrade.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index b4a964efe5..a13a03b7ea 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-15 Not Zed <NotZed@Ximian.com>
+
+ * e-config-upgrade.c (e_upgrade_detect_version): fix the check for
+ ~/evolution being a directory.
+
2004-01-13 JP Rosevear <jpr@ximian.com>
* main.c (attempt_upgrade): detect the version more completely
diff --git a/shell/e-config-upgrade.c b/shell/e-config-upgrade.c
index 34331987ab..7c51adf5ec 100644
--- a/shell/e-config-upgrade.c
+++ b/shell/e-config-upgrade.c
@@ -1865,7 +1865,7 @@ e_upgrade_detect_version (int *major, int *minor, int *revision)
/* 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)) {
+ } 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;