diff options
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | shell/e-shell-migrate.c | 8 |
2 files changed, 3 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index fcebc585ef..e61ee5807d 100644 --- a/configure.ac +++ b/configure.ac @@ -16,10 +16,6 @@ dnl the way it is so that GETTEXT_PACKAGE will be parsed correctly. BASE_VERSION=3.6 m4_define([base_version], [3.6]) -dnl Upgrade Revision: This is for triggering migration calls between -dnl varying versions. Reset to 0 whenever BASE_VERSION changes. -m4_define([upgrade_revision], [0]) - dnl Autoconf / Automake Initialization AC_PREREQ([2.64]) AC_INIT([evolution],[evo_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution],[evolution],[http://www.gnome.org/projects/evolution/]) @@ -134,9 +130,6 @@ fi AC_SUBST([BASE_VERSION], [base_version]) AC_DEFINE_UNQUOTED(BASE_VERSION, ["$BASE_VERSION"], [Base version (Major.Minor)]) -AC_SUBST([UPGRADE_REVISION],[upgrade_revision]) -AC_DEFINE_UNQUOTED(UPGRADE_REVISION, ["$UPGRADE_REVISION"], [The number of times we've upgraded since the BASE_VERSION release]) - AC_PROG_CC AC_C_INLINE AC_PROG_CPP diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c index 5fb5ca0993..b05e8a293f 100644 --- a/shell/e-shell-migrate.c +++ b/shell/e-shell-migrate.c @@ -799,7 +799,7 @@ e_shell_migrate_attempt (EShell *shell) ESEvent *ese; GSettings *settings; gint major, minor, micro; - gint curr_major, curr_minor, curr_micro; + gint curr_major, curr_minor; gchar *string; g_return_val_if_fail (E_IS_SHELL (shell), FALSE); @@ -811,8 +811,6 @@ e_shell_migrate_attempt (EShell *shell) return TRUE; } - curr_micro = atoi (UPGRADE_REVISION); - shell_migrate_get_version (shell, &major, &minor, µ); /* Migrate to XDG Base Directories first, so shell backends @@ -830,7 +828,7 @@ e_shell_migrate_attempt (EShell *shell) /* Record a successful migration. */ string = g_strdup_printf ( - "%d.%d.%d", curr_major, curr_minor, curr_micro); + "%d.%d.%d", curr_major, curr_minor, 0); g_settings_set_string (settings, "version", string); g_free (string); @@ -847,7 +845,7 @@ e_shell_migrate_attempt (EShell *shell) e_event_emit ( (EEvent *) ese, "upgrade.done", (EEventTarget *) es_event_target_new_upgrade ( - ese, curr_major, curr_minor, curr_micro)); + ese, curr_major, curr_minor, 0)); return TRUE; } |