diff options
| author | Vincent Untz <vuntz@gnome.org> | 2011-10-12 21:31:17 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-10-12 21:36:11 +0800 |
| commit | e92b9ed8d85b555eaac65cb80eed8a7e0ddb5ddc (patch) | |
| tree | 8cd3c9aeb1b45a92b2a75cb2e35c45851297d5f3 | |
| parent | 51d019cc1931bf5d475e06d90382b7ac0848dad4 (diff) | |
| download | gsoc2013-evolution-e92b9ed8d85b555eaac65cb80eed8a7e0ddb5ddc.tar.gz gsoc2013-evolution-e92b9ed8d85b555eaac65cb80eed8a7e0ddb5ddc.tar.zst gsoc2013-evolution-e92b9ed8d85b555eaac65cb80eed8a7e0ddb5ddc.zip | |
Bug 661542 - Weird "Cannot upgrade from version 0.xxxx" on first use
GConf's default value for the version key is an empty string, which
causes "sscanf (string, "%d.%d.%d", major, minor, micro)" to fail and
leaves the major/minor/micro variables uninitialized.
Instead, initialize the up front before reading the GConf key.
(cherry picked from commit c2288452b3a7181057935fdb9f28c191f7a78658)
| -rw-r--r-- | shell/e-shell-migrate.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c index 89f94b0f83..dd75a40b82 100644 --- a/shell/e-shell-migrate.c +++ b/shell/e-shell-migrate.c @@ -739,6 +739,10 @@ shell_migrate_get_version (EShell *shell, const gchar *key; gchar *string; + *major = 0; + *minor = 0; + *micro = 0; + key = GCONF_VERSION_KEY; client = e_shell_get_gconf_client (shell); string = gconf_client_get_string (client, key, NULL); @@ -747,12 +751,6 @@ shell_migrate_get_version (EShell *shell, /* Since 1.4.0 we've kept the version key in GConf. */ sscanf (string, "%d.%d.%d", major, minor, micro); g_free (string); - - } else { - /* Otherwise, assume it's a new installation. */ - *major = 0; - *minor = 0; - *micro = 0; } } |