Migrate ~/.evolution to XDG base directories.

Migration runs just before the main loop starts.
It's just a sequence of local directory and file renames.

4 files changed, 38 insertions, 9 deletions

diff --git a/e-util/e-datetime-format.c b/e-util/e-datetime-format.c
index 37226d471a..f927a275b8 100644
--- a/e-util/e-datetime-format.c
+++ b/e-util/e-datetime-format.c
@@ -25,7 +25,7 @@
 #include "e-datetime-format.h"
 #include "e-util.h"
 
-#define KEYS_FILENAME "datetime-formats"
+#define KEYS_FILENAME "datetime-formats.ini"
 #define KEYS_GROUPNAME "formats"
 
 #ifdef G_OS_WIN32
diff --git a/e-util/e-print.c b/e-util/e-print.c
index bb5ce9067a..756381f805 100644
--- a/e-util/e-print.c
+++ b/e-util/e-print.c
@@ -37,7 +37,7 @@
 static gchar *
 key_file_get_filename (void)
 {
-	return g_build_filename (e_get_user_data_dir (), "printing", NULL);
+	return g_build_filename (e_get_user_data_dir (), "printing.ini", NULL);
 }
 
 static void
diff --git a/e-util/e-signature.c b/e-util/e-signature.c
index c4ae7ed69d..6eb84c3704 100644
--- a/e-util/e-signature.c
+++ b/e-util/e-signature.c
@@ -32,6 +32,7 @@
 #include <gconf/gconf-client.h>
 
 #include <libedataserver/e-uid.h>
+#include <libedataserver/e-data-server-util.h>
 
 #include "e-signature.h"
 
@@ -493,6 +494,24 @@ e_signature_set_from_xml (ESignature *signature, const gchar *xml)
 			break;
 		}
 
+		/* If the signature is not a script, replace the directory
+		 * part with the current signatures directory.  This makes
+		 * moving the signatures directory transparent. */
+		if (!e_signature_get_is_script (signature)) {
+			const gchar *user_data_dir;
+			gchar *basename;
+			gchar *filename;
+
+			user_data_dir = e_get_user_data_dir ();
+
+			filename = signature->priv->filename;
+			basename = g_path_get_basename (filename);
+			signature->priv->filename = g_build_filename (
+				user_data_dir, "signatures", basename, NULL);
+			g_free (basename);
+			g_free (filename);
+		}
+
 		cur = cur->next;
 	}
 
@@ -544,13 +563,25 @@ e_signature_to_xml (ESignature *signature)
 
 		string = e_signature_get_filename (signature);
 		if (string != NULL) {
-			node = xmlNewTextChild (
-				root, NULL, (xmlChar *) "filename",
-				(xmlChar *) string);
-			if (e_signature_get_is_script (signature))
+
+			/* For scripts we save the full filename,
+			 * for normal signatures just the basename. */
+			if (e_signature_get_is_script (signature)) {
+				node = xmlNewTextChild (
+					root, NULL, (xmlChar *) "filename",
+					(xmlChar *) string);
 				xmlSetProp (
 					node, (xmlChar *) "script",
 					(xmlChar *) "true");
+			} else {
+				gchar *basename;
+
+				basename = g_path_get_basename (string);
+				node = xmlNewTextChild (
+					root, NULL, (xmlChar *) "filename",
+					(xmlChar *) basename);
+				g_free (basename);
+			}
 		}
 	} else {
 		/* this is to make Evolution-1.4 and older 1.5 versions happy */
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 7d45709d2d..3f27c52941 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -1301,8 +1301,6 @@ get_font_options (void)
 
 /* Evolution Locks for crash recovery */
 
-#define LOCK_FILE ".running"
-
 static const gchar *
 get_lock_filename (void)
 {
@@ -1310,7 +1308,7 @@ get_lock_filename (void)
 
 	if (G_UNLIKELY (filename == NULL))
 		filename = g_build_filename (
-			e_get_user_data_dir (), LOCK_FILE, NULL);
+			e_get_user_config_dir (), ".running", NULL);
 
 	return filename;
 }