diff options
| author | tnut <thierryn1 at hispeed dot ch> | 2010-10-23 17:19:53 +0200 |
|---|---|---|
| committer | tnut <thierryn1 at hispeed dot ch> | 2010-10-23 17:19:53 +0200 |
| commit | 532c1eab7b9f903c25cd3a70219099a54c184404 (patch) | |
| tree | 6aa496cbf6e952f08a1cd897f80704d953263ba5 /extra/gconf/GConf-2.26.2-sysconfdir-1.patch | |
| parent | 25faada8813b3992dba2e0c85d98a2b4d3d2d3a2 (diff) | |
| download | nutyx-extra-532c1eab7b9f903c25cd3a70219099a54c184404.tar.gz nutyx-extra-532c1eab7b9f903c25cd3a70219099a54c184404.tar.bz2 nutyx-extra-532c1eab7b9f903c25cd3a70219099a54c184404.tar.xz nutyx-extra-532c1eab7b9f903c25cd3a70219099a54c184404.zip | |
gconf, port nettoyé
Diffstat (limited to 'extra/gconf/GConf-2.26.2-sysconfdir-1.patch')
| -rwxr-xr-x | extra/gconf/GConf-2.26.2-sysconfdir-1.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/extra/gconf/GConf-2.26.2-sysconfdir-1.patch b/extra/gconf/GConf-2.26.2-sysconfdir-1.patch deleted file mode 100755 index 7a0009be6..000000000 --- a/extra/gconf/GConf-2.26.2-sysconfdir-1.patch +++ /dev/null @@ -1,31 +0,0 @@ -Submitted By: Wayne Blaszczyk -Date: 2009-09-06 -Initial Package Version: 2.26.2 -Origin: Wayne Blaszczyk -Upstream Status: Unknown -Description: Removed hardcoded /etc/gconf paths. - -diff -Naur a/gconf/default.path.in b/gconf/default.path.in ---- a/gconf/default.path.in 2009-04-25 16:44:06.000000000 +1000 -+++ b/gconf/default.path.in 2009-09-06 12:32:07.000000000 +1000 -@@ -21,7 +21,7 @@ - xml:readwrite:$(HOME)/.gconf - - # Location for system-wide settings that are set by the defaults mechanism --xml:readonly:/etc/gconf/gconf.xml.system -+xml:readonly:@sysgconfdir@/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 -diff -Naur a/gconf/gconfd.c b/gconf/gconfd.c ---- a/gconf/gconfd.c 2009-04-25 16:44:06.000000000 +1000 -+++ b/gconf/gconfd.c 2009-09-06 12:29:41.000000000 +1000 -@@ -655,7 +655,7 @@ - - gconf_log (GCL_DEBUG, "System defaults changed. Notifying."); - -- addresses.data = "xml:merged:/etc/gconf/gconf.xml.system"; -+ addresses.data = g_strconcat("xml:merged:", GCONF_ETCDIR, "/gconf.xml.system", NULL); - addresses.next = NULL; - system_sources = gconf_sources_new_from_addresses (&addresses, NULL); - |