callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

backup-restore: Remove references to ~/.camel_certs.

Browse Source 
The path is now XDG-base-dir compliant: ~/.local/share/camel_certs
This commit is contained in:
Matthew Barnes
2012-12-08 18:34:15 -05:00
parent bf30024dd7
commit 8972ef83f6
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/backup-restore/evolution-backup-tool.c
View File

@ -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)