From 566bb2aedfe66a2f9204dbdc1083361692f4a097 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Fri, 25 Mar 2011 11:41:55 -0400
Subject: Change the accelerator map file location.

From: $HOME/.gnome2/accels/evolution
  To: $XDG_CONFIG_HOME/evolution/accels

Custom keyboard accelerator maps is a well-hidden feature these
days, especially in GNOME 3.  Not worth migrating the old file.
---
 e-util/e-util.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/e-util/e-util.c b/e-util/e-util.c
index 5fdfed901b..7c203ec7b3 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -97,15 +97,10 @@ e_get_accels_filename (void)
 {
 	static gchar *filename = NULL;
 
-	/* XXX The directory corresponds to gnome_user_accels_dir_get()
-	 *     from libgnome.  Continue using this location until GNOME
-	 *     decides on an XDG-compliant location.  Perhaps something
-	 *     like $(XDG_CONFIG_DIR)/accels. */
-
-	if (G_UNLIKELY (filename == NULL))
-		filename = g_build_filename (
-			e_get_gnome2_user_dir (),
-			"accels", PACKAGE, NULL);
+	if (G_UNLIKELY (filename == NULL)) {
+		const gchar *config_dir = e_get_user_config_dir ();
+		filename = g_build_filename (config_dir, "accels", NULL);
+	}
 
 	return filename;
 }
-- 
cgit v1.2.3