From: Travis Reitter <travis.reitter@collabora.co.uk>
Date: Fri, 23 Sep 2011 01:26:06 +0000 (-0700)
Subject: Make sure we source GConf files installed next to us.
X-Git-Tag: FOLKS_0_6_3_1~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ec8bd42ca0b4e6f23e79ef66bd72ddd844ac4059;p=platform%2Fupstream%2Ffolks.git

Make sure we source GConf files installed next to us.
---

diff --git a/tests/data/gconf.path.in b/tests/data/gconf.path.in
index 36b92cf..9262115 100644
--- a/tests/data/gconf.path.in
+++ b/tests/data/gconf.path.in
@@ -48,4 +48,7 @@ include /etc/gconf/2/local-defaults.path
 xml:readonly:/etc/gconf/gconf.xml.defaults
 
 # Upstream application defaults
+# XXX: we would use @localstatedir@ here except we don't want "${prefix}" in the
+# generated file in case GConf doesn't know how to evaluate that
+xml:readonly:@prefix@/var/lib/gconf/defaults
 xml:readonly:/var/lib/gconf/defaults