From 8972ef83f634f22fc72d78a279fd613d98da73ec Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 8 Dec 2012 18:34:15 -0500 Subject: backup-restore: Remove references to ~/.camel_certs. The path is now XDG-base-dir compliant: ~/.local/share/camel_certs --- modules/backup-restore/evolution-backup-tool.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'modules/backup-restore') 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) -- cgit v1.2.3