From e38ac184d05c7b000d3d6a4693f4a5bd5b463b85 Mon Sep 17 00:00:00 2001 From: Pierre Wieser Date: Fri, 10 Jun 2011 20:39:13 +0200 Subject: [PATCH] No more obsolete reading of GConf after migration It may be needed to re-migrate a newly inserted item in GConf after a first successfull migration, we so keep GConf readable. --- ChangeLog | 3 +++ src/utils/na-gconf2key.sh.in | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bdb9234c..9d497b2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2011-06-10 Pierre Wieser + * src/utils/na-gconf2key.sh.in: No more obsolete the GConf reading, + as it may sometimes be needed to re-migrate a newly inserted item. + * src/io-gconf/nagp-reader.c (get_boxed_from_path): Only allocate a new box when a non-null value has been read. diff --git a/src/utils/na-gconf2key.sh.in b/src/utils/na-gconf2key.sh.in index f436f880..9665ed35 100644 --- a/src/utils/na-gconf2key.sh.in +++ b/src/utils/na-gconf2key.sh.in @@ -606,7 +606,6 @@ if [ $(id -u) -eq 0 ]; then # as a security - while we are root -, we force the GConf i/o provider to be locked cat <${my_tmproot}.io-provider_na-gconf # Starting with 3.1.0, GConf as I/O provider is deprecated -readable = false writable = false ! fi -- 2.11.4.GIT