aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-03-25 23:41:55 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:41:49 +0800
commit566bb2aedfe66a2f9204dbdc1083361692f4a097 (patch)
tree809752b17286bb151c37e6a94f64431046530bba /e-util
parent4ce8eca63545c23900e516b2c09a340161c364e0 (diff)
downloadgsoc2013-evolution-566bb2aedfe66a2f9204dbdc1083361692f4a097.tar
gsoc2013-evolution-566bb2aedfe66a2f9204dbdc1083361692f4a097.tar.gz
gsoc2013-evolution-566bb2aedfe66a2f9204dbdc1083361692f4a097.tar.bz2
gsoc2013-evolution-566bb2aedfe66a2f9204dbdc1083361692f4a097.tar.lz
gsoc2013-evolution-566bb2aedfe66a2f9204dbdc1083361692f4a097.tar.xz
gsoc2013-evolution-566bb2aedfe66a2f9204dbdc1083361692f4a097.tar.zst
gsoc2013-evolution-566bb2aedfe66a2f9204dbdc1083361692f4a097.zip
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.
Diffstat (limited to 'e-util')
-rw-r--r--e-util/e-util.c13
1 files 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;
}