patches/gdm-06-no-system-gconf.diff
author Jon Tibble <meths@btinternet.com>
Sat, 06 Oct 2012 16:11:50 +0100
branchs11express-2010-11
changeset 22109 db10202d5f6d
parent 16338 7f746135863a
permissions -rw-r--r--
Added tag oi_151a_prestable7 for changeset 25dee50cecca
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
16338
7f746135863a 2009-08-24 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     1
--- gdm-2.26.1/data/gconf.path-orig	2009-04-28 20:36:41.977711000 -0500
7f746135863a 2009-08-24 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     2
+++ gdm-2.26.1/data/gconf.path	2009-04-28 20:37:24.422960000 -0500
7f746135863a 2009-08-24 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     3
@@ -1,5 +1,6 @@
7f746135863a 2009-08-24 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     4
 # treat system-wide settings as mandatory
7f746135863a 2009-08-24 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     5
-xml:readonly:/etc/gconf/gconf.xml.system
7f746135863a 2009-08-24 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     6
+# We don't use this default mechanism on opensolaris.
7f746135863a 2009-08-24 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     7
+# xml:readonly:/etc/gconf/gconf.xml.system
7f746135863a 2009-08-24 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     8
 
7f746135863a 2009-08-24 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     9
 # override some settings
7f746135863a 2009-08-24 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    10
 # we treat settings in this location as