diff options
| author | Mark McLoughlin <mark@skynet.ie> | 2004-04-01 13:41:49 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@src.gnome.org> | 2004-04-01 13:41:49 +0000 |
| commit | dfba1983b6891ce1077211f598fcdfd05c45bdd8 (patch) | |
| tree | df2bbb91f38212ab9991f21cb1e2c7ce4e36af0b | |
| parent | ffabbb1a452da3c246a33e2c9277090884dffc9e (diff) | |
| download | gconf-dfba1983b6891ce1077211f598fcdfd05c45bdd8.tar.gz | |
fix the position of the local-defaults.path include. Bug #137578.
2004-04-01 Mark McLoughlin <mark@skynet.ie>
* gconf/default.path.in: fix the position of the
local-defaults.path include. Bug #137578.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | gconf/default.path.in | 13 |
2 files changed, 8 insertions, 10 deletions
@@ -1,3 +1,8 @@ +2004-04-01 Mark McLoughlin <mark@skynet.ie> + + * gconf/default.path.in: fix the position of the + local-defaults.path include. Bug #137578. + 2004-03-29 Mark McLoughlin <mark@skynet.ie> * gconf/gconf-database.c: diff --git a/gconf/default.path.in b/gconf/default.path.in index f726b0e2..c5c9c8e8 100644 --- a/gconf/default.path.in +++ b/gconf/default.path.in @@ -12,26 +12,19 @@ xml:readonly:@EXPANDED_SYSCONFDIR@/gconf/gconf.xml.mandatory # To read in any mandatory settings that the Sys Admin may have created # prior to a desktop system upgrade. The SysAdmin can stick read-only system # wide sources in this file. - include @EXPANDED_SYSCONFDIR@/gconf/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 include "$(HOME)/.gconf.path" +# Give users a default storage location, ~/.gconf +xml:readwrite:$(HOME)/.gconf + # 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 # system-wide in this file. - include @EXPANDED_SYSCONFDIR@/gconf/2/local-defaults.path -# Give users a default storage location, ~/.gconf - -xml:readwrite:$(HOME)/.gconf - # Finally, look at the systemwide defaults -# (commented out for now) xml:readonly:@EXPANDED_SYSCONFDIR@/gconf/gconf.xml.defaults - - - |