summaryrefslogtreecommitdiff
path: root/gconf/default.path.in
diff options
context:
space:
mode:
Diffstat (limited to 'gconf/default.path.in')
-rw-r--r--gconf/default.path.in9
1 files changed, 6 insertions, 3 deletions
diff --git a/gconf/default.path.in b/gconf/default.path.in
index f03b4aa3..b6487ceb 100644
--- a/gconf/default.path.in
+++ b/gconf/default.path.in
@@ -14,11 +14,14 @@ xml:readonly:@sysgconfdir@/gconf.xml.mandatory
include @sysgconfdir@/2/local-mandatory.path
# Now see where users want us to look - basically the user can stick arbitrary
-# sources in a ~/.gconf.path file and they're inserted here
+# sources in a ~/.config/gconf.path file and they're inserted here
+include "$(USERCONFIGDIR)/gconf/path"
+# Legacy file location
include "$(HOME)/.gconf.path"
-# Give users a default storage location, ~/.gconf
-xml:readwrite:$(HOME)/.gconf
+# Give users a default storage location,
+# $(USERCONFIGDIR)/gconf (or $(HOME)/.gconf when it exists, for backward compatibility)
+xml:readwrite:$(DEFAULTUSERSOURCE)
# Location for system-wide settings that are set by the defaults mechanism
xml:readonly:@sysgconfdir@/gconf.xml.system