diff options
| author | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2010-11-23 17:46:54 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2010-11-23 17:46:54 +0800 |
| commit | 863b9bf6391eb64bb28106b37df206d24312e54d (patch) | |
| tree | 06acbd6a898378c810c2267e3067e57e48397881 | |
| parent | e3dda0436d981d9632a529aa5ca7230cb343694b (diff) | |
| download | gsoc2013-evolution-863b9bf6391eb64bb28106b37df206d24312e54d.tar gsoc2013-evolution-863b9bf6391eb64bb28106b37df206d24312e54d.tar.gz gsoc2013-evolution-863b9bf6391eb64bb28106b37df206d24312e54d.tar.bz2 gsoc2013-evolution-863b9bf6391eb64bb28106b37df206d24312e54d.tar.lz gsoc2013-evolution-863b9bf6391eb64bb28106b37df206d24312e54d.tar.xz gsoc2013-evolution-863b9bf6391eb64bb28106b37df206d24312e54d.tar.zst gsoc2013-evolution-863b9bf6391eb64bb28106b37df206d24312e54d.zip | |
Bug #635087 - Leftover files after migration of config/data/cache to XDG directories
| -rw-r--r-- | shell/e-shell-migrate.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c index 3f3f6f563b..878b121488 100644 --- a/shell/e-shell-migrate.c +++ b/shell/e-shell-migrate.c @@ -433,14 +433,15 @@ shell_xdg_migrate_config_dir_mail (EShell *shell, } static void -shell_xdg_migrate_config_dir_cleanup (EShell *shell, +shell_xdg_migrate_dir_cleanup (EShell *shell, const gchar *old_base_dir, - const gchar *backend_name) + const gchar *backend_name, + const gchar *dir_name) { gchar *dirname; dirname = g_build_filename ( - old_base_dir, backend_name, "config", NULL); + old_base_dir, backend_name, dir_name, NULL); shell_xdg_migrate_rmdir (dirname); @@ -467,10 +468,13 @@ shell_xdg_migrate_config_dir (EShell *shell, /* Handle backend-specific files. */ shell_xdg_migrate_config_dir_mail (shell, old_base_dir); - /* Remove leftover "config" directories. */ - for (ii = 0; shell_backend_names[ii] != NULL; ii++) - shell_xdg_migrate_config_dir_cleanup ( - shell, old_base_dir, shell_backend_names[ii]); + /* Remove leftover config directories. */ + for (ii = 0; shell_backend_names[ii] != NULL; ii++) { + shell_xdg_migrate_dir_cleanup ( + shell, old_base_dir, shell_backend_names[ii], "config"); + shell_xdg_migrate_dir_cleanup ( + shell, old_base_dir, shell_backend_names[ii], "views"); + } /*** Miscellaneous configuration files. ***/ |