Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Silbe <sascha-pgp@silbe.org>2010-05-03 17:42:24 (GMT)
committer Sascha Silbe <sascha-pgp@silbe.org>2010-05-03 17:42:24 (GMT)
commit411741d4f7b77311cc61424462505aecf528c99a (patch)
tree36a86296928bb516b292cb322614f9b56f8880f1
parentbbec59738b9d461ca482b08a328f000b7f4fe04d (diff)
fix GConf-dbus path - fixes metacity at least on Debian
-rw-r--r--config/modulesets/patches/gconf-dbus-defaultpath.patch13
1 files changed, 9 insertions, 4 deletions
diff --git a/config/modulesets/patches/gconf-dbus-defaultpath.patch b/config/modulesets/patches/gconf-dbus-defaultpath.patch
index d788e31..07a0186 100644
--- a/config/modulesets/patches/gconf-dbus-defaultpath.patch
+++ b/config/modulesets/patches/gconf-dbus-defaultpath.patch
@@ -1,5 +1,6 @@
---- gconf/default.path.in.orig 2008-10-11 13:12:47.000000000 +0200
-+++ gconf/default.path.in 2008-10-11 13:13:30.000000000 +0200
+diff -ur GConf-dbus-2.16.0/gconf/default.path.in GConf-dbus-2.16.0-defaultpath/gconf/default.path.in
+--- gconf/default.path.in.orig 2007-05-15 15:55:22.000000000 +0200
++++ gconf/default.path.in 2010-05-03 18:18:41.468971932 +0200
@@ -18,7 +18,7 @@
include "$(HOME)/.gconf.path"
@@ -9,10 +10,14 @@
# To read in any defaults settings that the Sys Admin may have created
# prior to a desktop system upgrade. The SysAdmin can stick default values
-@@ -26,6 +26,7 @@
+@@ -26,7 +26,9 @@
include @sysgconfdir@/2/local-defaults.path
# Finally, look at the systemwide defaults
+xml:readonly:/etc/gconf/gconf.xml.defaults
xml:readonly:@sysgconfdir@/gconf.xml.defaults
-
+
+-
++# Upstream application defaults (maybe Debian-specific)
++xml:readonly:/var/lib/gconf/defaults
+