gdm r5736 - in trunk: . data

[mccann svn gnome org]

Author: mccann
Date: Fri Feb  8 16:29:58 2008
New Revision: 5736
URL: http://svn.gnome.org/viewvc/gdm?rev=5736&view=rev

Log:
2008-02-08  William Jon McCann  <jmccann redhat com>

	* data/Makefile.am:
	* data/gconf.path:
	Unset existing values in the mandatory gconf source
	so that we'll be able to change values as needed.



Modified:
   trunk/ChangeLog
   trunk/data/Makefile.am
   trunk/data/gconf.path

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Fri Feb  8 16:29:58 2008
@@ -197,6 +197,7 @@
 	fi
 
 	$(INSTALL_DATA) $(srcdir)/gconf.path $(DESTDIR)$(workingdir)/.gconf.path
+	gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --recursive-unset /
 	gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --load $(srcdir)/session-setup.entries
 
 

Modified: trunk/data/gconf.path
==============================================================================
--- trunk/data/gconf.path	(original)
+++ trunk/data/gconf.path	Fri Feb  8 16:29:58 2008
@@ -2,4 +2,7 @@
 xml:readonly:/etc/gconf/gconf.xml.system
 
 # override some settings
+# we treat settings in this location as
+# owned by GDM.  Sysadmins should create
+# another source if they wish to override them.
 xml:readonly:$(HOME)/.gconf.mandatory