From 633b40bea15ee55df754cd0a23fc848b9ddd3372 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 2 Sep 2009 15:16:53 +0200 Subject: Bug #593761 - Wrong dir for calendar local sources - using _get_data_dir, not _get_config_dir in calendar's and similar ensure_sources functions - current executable version is stored in gconf, thus not every start is migrating done - applied changes which were using e_source_list_ensure_group calls - e_source_list_sync is called at the end of those ensure_sources, as it didn't work to me to see the Personal source after start when I had no "On this computer" group (the group was added, but the source wasn't) --- shell/e-shell-migrate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'shell') diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c index 18e085f0cc..10cea586b6 100644 --- a/shell/e-shell-migrate.c +++ b/shell/e-shell-migrate.c @@ -223,7 +223,7 @@ e_shell_migrate_attempt (EShell *shell) if (!(curr_major > major || (curr_major == major && curr_minor > minor) || - (curr_minor == minor && curr_micro > micro))) + (curr_major == major && curr_minor == minor && curr_micro > micro))) goto check_old; /* If upgrading from < 1.5, we need to copy most data from @@ -257,7 +257,7 @@ e_shell_migrate_attempt (EShell *shell) _exit (EXIT_SUCCESS); /* Record a successful migration. */ - string = g_strdup_printf ("%d.%d.%d", major, minor, micro); + string = g_strdup_printf ("%d.%d.%d", curr_major, curr_minor, curr_micro); gconf_client_set_string (client, GCONF_VERSION_KEY, string, NULL); g_free (string); -- cgit