summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraflinta2002-10-18 21:50:51 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commitd10d51ff5fb42922b99efcb78abead9f8bf7776d (patch)
tree45002f97a217002f4452796aea24c59680238077
parentc81f7abe6ca4c25db25710d077f901b38ca9c158 (diff)
downloadGConf2-d10d51ff5fb42922b99efcb78abead9f8bf7776d.zip
GConf2-d10d51ff5fb42922b99efcb78abead9f8bf7776d.tar.gz
- updated, it is not good idea to put path in config files to
directories which doesn't exist Changed files: GConf2-path.patch -> 1.2
-rw-r--r--GConf2-path.patch22
1 files changed, 12 insertions, 10 deletions
diff --git a/GConf2-path.patch b/GConf2-path.patch
index a5dfcb3..b0498f3 100644
--- a/GConf2-path.patch
+++ b/GConf2-path.patch
@@ -1,19 +1,21 @@
-diff -Nur GConf-1.2.1/gconf/default.path.in GConf-1.2.1-new/gconf/default.path.in
---- GConf-1.2.1/gconf/default.path.in Mon Jan 31 21:49:05 2000
-+++ GConf-1.2.1-new/gconf/default.path.in Thu Aug 29 12:41:18 2002
-@@ -8,6 +8,7 @@
- # Look first in systemwide mandatory settings directory
+diff -urN GConf-1.2.1.orig/gconf/default.path.in GConf-1.2.1/gconf/default.path.in
+--- GConf-1.2.1.orig/gconf/default.path.in Fri Oct 18 23:46:43 2002
++++ GConf-1.2.1/gconf/default.path.in Fri Oct 18 23:49:06 2002
+@@ -9,6 +9,9 @@
# (commented out until xml backend knows how to be read-only for users)
xml:readonly:@EXPANDED_SYSCONFDIR@/gconf/gconf.xml.mandatory
-+xml:readonly:/etc/X11/GNOME/gconf/gconf.xml.mandatory
++# Uncomment line below if GConf 1 is installed
++# xml:readonly:/etc/X11/GNOME/gconf/gconf.xml.mandatory
++
# 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
-@@ -20,6 +21,5 @@
- # Finally, look at the systemwide defaults
+ include "$(HOME)/.gconf.path"
+@@ -21,5 +24,6 @@
# (commented out for now)
xml:readonly:@EXPANDED_SYSCONFDIR@/gconf/gconf.xml.defaults
+
-
--
-+xml:readonly:/etc/X11/GNOME/gconf/gconf.xml.defaults
++# Uncomment line below if GConf 1 is installed
++# xml:readonly:/etc/X11/GNOME/gconf/gconf.xml.defaults