[evolution/gnome-3-6] backup-restore: Remove references to ~/.camel_certs.



commit 673901abe40935585976f60c3708d4f8fc4c1c4c
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Dec 8 18:34:15 2012 -0500

    backup-restore: Remove references to ~/.camel_certs.
    
    The path is now XDG-base-dir compliant: ~/.local/share/camel_certs
    
    (cherry picked from commit 8972ef83f634f22fc72d78a279fd613d98da73ec)

 modules/backup-restore/evolution-backup-tool.c |    9 +--------
 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 8ff027c..d38492a 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)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]