diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-07-02 23:52:01 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-07-02 23:52:01 +0800 |
| commit | 62a4fb09124725720aa1bd5d46f594786df92c6f (patch) | |
| tree | 4cba108cf27f3285467d344bc2f30eac214c22e4 /shell | |
| parent | 05724f4273c8b76ce3b2bd98def409de7e6d107e (diff) | |
| download | gsoc2013-evolution-62a4fb09124725720aa1bd5d46f594786df92c6f.tar.gz gsoc2013-evolution-62a4fb09124725720aa1bd5d46f594786df92c6f.tar.zst gsoc2013-evolution-62a4fb09124725720aa1bd5d46f594786df92c6f.zip | |
Remove "last-upgraded-version" GSettings key.
AFAICT, this key does nothing useful and only confuses me every time I
read the EShell migration code.
The "version" key records the most recently used Evolution version.
That's all we need for migration. And since downgrading Evolution is
not supported, we can assume this value will only increase over time.
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/e-shell-migrate.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c index 2fe9cd69ee..5fb5ca0993 100644 --- a/shell/e-shell-migrate.c +++ b/shell/e-shell-migrate.c @@ -799,9 +799,7 @@ e_shell_migrate_attempt (EShell *shell) ESEvent *ese; GSettings *settings; gint major, minor, micro; - gint last_major, last_minor, last_micro; gint curr_major, curr_minor, curr_micro; - gboolean migrated = FALSE; gchar *string; g_return_val_if_fail (E_IS_SHELL (shell), FALSE); @@ -836,23 +834,6 @@ e_shell_migrate_attempt (EShell *shell) g_settings_set_string (settings, "version", string); g_free (string); - migrated = TRUE; - - /* Try to retrieve the last migrated version from GSettings. */ - string = g_settings_get_string (settings, "last-upgraded-version"); - if (migrated || string == NULL || sscanf (string, "%d.%d.%d", - &last_major, &last_minor, &last_micro) != 3) { - last_major = major; - last_minor = minor; - last_micro = micro; - } - g_free (string); - - string = g_strdup_printf ( - "%d.%d.%d", last_major, last_minor, last_micro); - g_settings_set_string (settings, "last-upgraded-version", string); - g_free (string); - g_object_unref (settings); /** @Event: Shell attempted upgrade |