[evolution] Hard-code the directory returned by gnome_user_accels_dir_get().



commit 12d1810be39661750956ec1e041f7f572ea86698
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Sep 18 11:12:49 2009 -0400

    Hard-code the directory returned by gnome_user_accels_dir_get().
    
    This drops support for the GNOME22_USER_DIR environment variable,
    but I don't imagine that's widely used these days anyway.

 e-util/e-util.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/e-util/e-util.c b/e-util/e-util.c
index f92869e..b2daca9 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -38,7 +38,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
-#include <libgnome/gnome-init.h>
 
 #include <camel/camel-url.h>
 
@@ -85,9 +84,14 @@ 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 (
-			gnome_user_dir_get (),
+			g_get_home_dir (), ".gnome2",
 			"accels", PACKAGE, NULL);
 
 	return filename;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]