diff options
| author | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2010-11-23 17:47:42 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2010-11-23 17:49:30 +0800 |
| commit | d3d6d96ed54b29787d79863e4808dbaab56a0f02 (patch) | |
| tree | a5365e1c5d18650204547094038c9263afdc18b0 | |
| parent | 9f9d69559d85becd389c20ab43aac90ea8545f7e (diff) | |
| download | gsoc2013-evolution-d3d6d96ed54b29787d79863e4808dbaab56a0f02.tar gsoc2013-evolution-d3d6d96ed54b29787d79863e4808dbaab56a0f02.tar.gz gsoc2013-evolution-d3d6d96ed54b29787d79863e4808dbaab56a0f02.tar.bz2 gsoc2013-evolution-d3d6d96ed54b29787d79863e4808dbaab56a0f02.tar.lz gsoc2013-evolution-d3d6d96ed54b29787d79863e4808dbaab56a0f02.tar.xz gsoc2013-evolution-d3d6d96ed54b29787d79863e4808dbaab56a0f02.tar.zst gsoc2013-evolution-d3d6d96ed54b29787d79863e4808dbaab56a0f02.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 f4ac0b7de5..7853127e2b 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. ***/ |