aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-12-09 07:34:15 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-12-09 07:34:15 +0800
commit8972ef83f634f22fc72d78a279fd613d98da73ec (patch)
treec3b48b1db3944e28fe0f620bab9b088e2929e592
parentbf30024dd7973006bf99d0ae509a7f0022368a41 (diff)
downloadgsoc2013-evolution-8972ef83f634f22fc72d78a279fd613d98da73ec.tar
gsoc2013-evolution-8972ef83f634f22fc72d78a279fd613d98da73ec.tar.gz
gsoc2013-evolution-8972ef83f634f22fc72d78a279fd613d98da73ec.tar.bz2
gsoc2013-evolution-8972ef83f634f22fc72d78a279fd613d98da73ec.tar.lz
gsoc2013-evolution-8972ef83f634f22fc72d78a279fd613d98da73ec.tar.xz
gsoc2013-evolution-8972ef83f634f22fc72d78a279fd613d98da73ec.tar.zst
gsoc2013-evolution-8972ef83f634f22fc72d78a279fd613d98da73ec.zip
backup-restore: Remove references to ~/.camel_certs.
The path is now XDG-base-dir compliant: ~/.local/share/camel_certs
-rw-r--r--modules/backup-restore/evolution-backup-tool.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/modules/backup-restore/evolution-backup-tool.c b/modules/backup-restore/evolution-backup-tool.c
index 8ff027ca19..d38492a1b1 100644
--- a/modules/backup-restore/evolution-backup-tool.c
+++ b/modules/backup-restore/evolution-backup-tool.c
@@ -348,7 +348,7 @@ backup (const gchar *filename,
/* FIXME backup location?" */
command = g_strdup_printf (
"cd $HOME && tar chf - $STRIPDATADIR "
- "$STRIPCONFIGDIR .camel_certs " EVOLUTION_DIR_FILE " | "
+ "$STRIPCONFIGDIR " EVOLUTION_DIR_FILE " | "
"gzip > %s", quotedfname);
run_cmd (command);
g_free (command);
@@ -517,7 +517,6 @@ restore (const gchar *filename,
txt = _("Back up current Evolution data");
run_cmd ("mv $DATADIR $DATADIR_old");
run_cmd ("mv $CONFIGDIR $CONFIGDIR_old");
- run_cmd ("mv $HOME/.camel_certs $HOME/.camel_certs_old");
if (g_cancellable_is_cancelled (cancellable))
return;
@@ -576,11 +575,6 @@ restore (const gchar *filename,
run_cmd (command);
g_free (command);
- command = g_strdup_printf (
- "cd $HOME && tar xzf %s .camel_certs", quotedfname);
- run_cmd (command);
- g_free (command);
-
/* If the back file had version information, set the last
* used version in GSettings before restarting Evolution. */
if (restored_version != NULL && *restored_version != '\0') {
@@ -678,7 +672,6 @@ restore (const gchar *filename,
txt = _("Removing temporary back up files");
run_cmd ("rm -rf $DATADIR_old");
run_cmd ("rm -rf $CONFIGDIR_old");
- run_cmd ("rm -rf $HOME/.camel_certs_old");
run_cmd ("rm $DATADIR/.running");
if (!is_new_format)