diff options
| author | Milan Crha <mcrha@redhat.com> | 2009-09-02 21:16:53 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2009-09-02 21:16:53 +0800 |
| commit | 633b40bea15ee55df754cd0a23fc848b9ddd3372 (patch) | |
| tree | bc29b0ccc8ba040384888ec8583c05fcfbb0b3af /modules/calendar/e-cal-shell-migrate.c | |
| parent | 8962868ff902e58456c545478e62796029d1fe5c (diff) | |
| download | gsoc2013-evolution-633b40bea15ee55df754cd0a23fc848b9ddd3372.tar gsoc2013-evolution-633b40bea15ee55df754cd0a23fc848b9ddd3372.tar.gz gsoc2013-evolution-633b40bea15ee55df754cd0a23fc848b9ddd3372.tar.bz2 gsoc2013-evolution-633b40bea15ee55df754cd0a23fc848b9ddd3372.tar.lz gsoc2013-evolution-633b40bea15ee55df754cd0a23fc848b9ddd3372.tar.xz gsoc2013-evolution-633b40bea15ee55df754cd0a23fc848b9ddd3372.tar.zst gsoc2013-evolution-633b40bea15ee55df754cd0a23fc848b9ddd3372.zip | |
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)
Diffstat (limited to 'modules/calendar/e-cal-shell-migrate.c')
| -rw-r--r-- | modules/calendar/e-cal-shell-migrate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/calendar/e-cal-shell-migrate.c b/modules/calendar/e-cal-shell-migrate.c index 5ec9c99bf3..ea0e6aa751 100644 --- a/modules/calendar/e-cal-shell-migrate.c +++ b/modules/calendar/e-cal-shell-migrate.c @@ -513,7 +513,7 @@ create_calendar_sources (EShellBackend *shell_backend, shell = e_shell_backend_get_shell (shell_backend); shell_settings = e_shell_get_shell_settings (shell); - base_dir = e_shell_backend_get_config_dir (shell_backend); + base_dir = e_shell_backend_get_data_dir (shell_backend); base_uri = g_build_filename (base_dir, "local", NULL); base_uri_proto = g_filename_to_uri (base_uri, NULL, NULL); @@ -733,7 +733,7 @@ e_cal_shell_backend_migrate (EShellBackend *shell_backend, gchar *old_path, *new_path; old_path = g_build_filename (g_get_home_dir (), "evolution", "local", "Calendar", NULL); - new_path = g_build_filename (e_shell_backend_get_config_dir (shell_backend), + new_path = g_build_filename (e_shell_backend_get_data_dir (shell_backend), "local", "system", NULL); migrate_pilot_data ("calendar", "calendar", old_path, new_path); g_free (new_path); |