gconf r2779 - in trunk: . gconf

[halfline svn gnome org]

Author: halfline
Date: Mon Feb 16 19:36:12 2009
New Revision: 2779
URL: http://svn.gnome.org/viewvc/gconf?rev=2779&view=rev

Log:
2009-02-16  Ray Strode  <rstrode redhat com>

	* gconf/default.path.in: move the directory used by the
	defaults mechanism, so that its effects are mandatory
	(bug 558490).


Modified:
   trunk/ChangeLog
   trunk/gconf/default.path.in

Modified: trunk/gconf/default.path.in
==============================================================================
--- trunk/gconf/default.path.in	(original)
+++ trunk/gconf/default.path.in	Mon Feb 16 19:36:12 2009
@@ -13,9 +13,6 @@
 # wide sources in this file.
 include @sysgconfdir@/2/local-mandatory.path
 
-# Location for system-wide settings that are set by the defaults mechanism
-xml:readonly:/etc/gconf/gconf.xml.system
-
 # 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"
@@ -23,6 +20,9 @@
 # Give users a default storage location, ~/.gconf
 xml:readwrite:$(HOME)/.gconf
 
+# Location for system-wide settings that are set by the defaults mechanism
+xml:readonly:/etc/gconf/gconf.xml.system
+
 # 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.