evolution r35060 - in trunk: . plugins/backup-restore

[jeffcai svn gnome org]

Author: jeffcai
Date: Wed Feb 20 07:49:22 2008
New Revision: 35060
URL: http://svn.gnome.org/viewvc/evolution?rev=35060&view=rev

Log:
Use "pkill -x" to kill the process and use "$HOME" instead
of "~".
Fix for bug #516648


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/plugins/backup-restore/ChangeLog
   trunk/plugins/backup-restore/backup.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Feb 20 07:49:22 2008
@@ -1203,7 +1203,7 @@
 
 case "$host" in
 *solaris*)
-	AC_PATH_PROGS(KILL_PROCESS_CMD, pkill)
+	KILL_PROCESS_CMD="/usr/bin/pkill -x"
 	;;
 *)
 	AC_PATH_PROGS(KILL_PROCESS_CMD, killall pkill)

Modified: trunk/plugins/backup-restore/backup.c
==============================================================================
--- trunk/plugins/backup-restore/backup.c	(original)
+++ trunk/plugins/backup-restore/backup.c	Wed Feb 20 07:49:22 2008
@@ -13,8 +13,8 @@
 #include <libgnome/gnome-util.h>
 
 #define EVOLUTION "evolution"
-#define EVOLUTION_DIR "~/.evolution/"
-#define EVOLUTION_DIR_BACKUP "~/.evolution-old/"
+#define EVOLUTION_DIR "$HOME/.evolution/"
+#define EVOLUTION_DIR_BACKUP "$HOME/.evolution-old/"
 #define GCONF_DUMP_FILE "backup-restore-gconf.xml"
 #define GCONF_DUMP_PATH EVOLUTION_DIR GCONF_DUMP_FILE
 #define GCONF_DIR "/apps/evolution"
@@ -81,7 +81,7 @@
 	/* FIXME compression type?" */
 	/* FIXME date/time stamp?" */
 	/* FIXME backup location?" */
-	command = g_strdup_printf ("cd ~ && tar zpcf %s .evolution .camel_certs", filename);
+	command = g_strdup_printf ("cd $HOME && tar zpcf %s .evolution .camel_certs", filename);
 	s (command);
 	g_free (command);
 
@@ -113,11 +113,11 @@
 	CANCEL (complete);
 	txt = _("Backup current Evolution data");
 	s ("mv " EVOLUTION_DIR " " EVOLUTION_DIR_BACKUP);
-	s ("mv ~/.camel_certs ~/.camel_certs_old");
+	s ("mv $HOME/.camel_certs ~/.camel_certs_old");
 
 	CANCEL (complete);
 	txt = _("Extracting files from backup");
-	command = g_strdup_printf ("cd ~ && tar zxf %s", filename);
+	command = g_strdup_printf ("cd $HOME && tar zxf %s", filename);
 	s (command);
 	g_free (command);
 
@@ -129,7 +129,7 @@
 	txt = _("Removing temporary backup files");
 	s ("rm -rf " GCONF_DUMP_PATH);
 	s ("rm -rf " EVOLUTION_DIR_BACKUP);
-	s ("rm -rf ~/.camel_certs_old");
+	s ("rm -rf $HOME/.camel_certs_old");
 
 	if (restart_arg) {
 		CANCEL (complete);