diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-07-23 05:07:52 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-07-27 20:58:50 +0800 |
| commit | 6affbe33e90b4157380eff3dad6a9654c9a24443 (patch) | |
| tree | b82de645ced44be6c6aa28a0b0759ba17afb1624 /shell/e-shell-view.c | |
| parent | eba9b45f9e0e2a7f1a8d2d79f14d9e5f3aded19e (diff) | |
| download | gsoc2013-evolution-6affbe33e90b4157380eff3dad6a9654c9a24443.tar gsoc2013-evolution-6affbe33e90b4157380eff3dad6a9654c9a24443.tar.gz gsoc2013-evolution-6affbe33e90b4157380eff3dad6a9654c9a24443.tar.bz2 gsoc2013-evolution-6affbe33e90b4157380eff3dad6a9654c9a24443.tar.lz gsoc2013-evolution-6affbe33e90b4157380eff3dad6a9654c9a24443.tar.xz gsoc2013-evolution-6affbe33e90b4157380eff3dad6a9654c9a24443.tar.zst gsoc2013-evolution-6affbe33e90b4157380eff3dad6a9654c9a24443.zip | |
Migrate ~/.evolution to XDG base directories.
Migration runs just before the main loop starts.
It's just a sequence of local directory and file renames.
Diffstat (limited to 'shell/e-shell-view.c')
| -rw-r--r-- | shell/e-shell-view.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 5d1c44ecc8..e6731af1b4 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -111,7 +111,7 @@ shell_view_init_search_context (EShellViewClass *class) ERuleContext *search_context; EFilterRule *rule; EFilterPart *part; - const gchar *data_dir; + const gchar *config_dir; gchar *system_filename; gchar *user_filename; @@ -128,9 +128,9 @@ shell_view_init_search_context (EShellViewClass *class) EVOLUTION_RULEDIR, class->search_rules, NULL); /* The filename for custom saved searches is always of - * the form "$(shell_backend_data_dir)/searches.xml". */ - data_dir = e_shell_backend_get_data_dir (shell_backend); - user_filename = g_build_filename (data_dir, "searches.xml", NULL); + * the form "$(shell_backend_config_dir)/searches.xml". */ + config_dir = e_shell_backend_get_config_dir (shell_backend); + user_filename = g_build_filename (config_dir, "searches.xml", NULL); /* Create the search context instance. Subclasses may override * the GType so check that it's really an ERuleContext instance. */ @@ -175,7 +175,7 @@ shell_view_init_view_collection (EShellViewClass *class) base_dir = EVOLUTION_GALVIEWSDIR; system_dir = g_build_filename (base_dir, backend_name, NULL); - base_dir = e_shell_backend_get_data_dir (shell_backend); + base_dir = e_shell_backend_get_config_dir (shell_backend); local_dir = g_build_filename (base_dir, "views", NULL); /* The view collection is never destroyed. */ @@ -216,7 +216,7 @@ shell_view_load_state (EShellView *shell_view) shell_backend = e_shell_view_get_shell_backend (shell_view); config_dir = e_shell_backend_get_config_dir (shell_backend); - filename = g_build_filename (config_dir, "state", NULL); + filename = g_build_filename (config_dir, "state.ini", NULL); /* XXX Should do this asynchronously. */ key_file = shell_view->priv->state_key_file; @@ -277,7 +277,7 @@ shell_view_save_state (EShellView *shell_view) contents = g_key_file_to_data (key_file, NULL, NULL); g_return_val_if_fail (contents != NULL, NULL); - path = g_build_filename (config_dir, "state", NULL); + path = g_build_filename (config_dir, "state.ini", NULL); file = g_file_new_for_path (path); g_free (path); |