[ev-daemon] Respect GNOME22_USER_DIR env variable

1 files changed, 14 insertions, 8 deletions

diff --git a/shell/ev-daemon.c b/shell/ev-daemon.c
index 8844027..d767c49 100644
--- a/shell/ev-daemon.c
+++ b/shell/ev-daemon.c
@@ -385,14 +385,20 @@ convert_metadata (const gchar *metadata)
 static void
 ev_migrate_metadata (void)
 {
-	gchar *updated;
-	gchar *metadata;
-	gchar *dot_dir;
-
-	dot_dir = g_build_filename (g_get_home_dir (),
-				    ".gnome2",
-				    "evince",
-				    NULL);
+	gchar       *updated;
+	gchar       *metadata;
+	gchar       *dot_dir;
+	const gchar *userdir;
+
+	userdir = g_getenv ("GNOME22_USER_DIR");
+	if (userdir) {
+		dot_dir = g_build_filename (userdir, "evince", NULL);
+	} else {
+		dot_dir = g_build_filename (g_get_home_dir (),
+					    ".gnome2",
+					    "evince",
+					    NULL);
+	}
 
 	updated = g_build_filename (dot_dir, "migrated-to-gvfs", NULL);
 	if (g_file_test (updated, G_FILE_TEST_EXISTS)) {