summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael@ximian.com>2002-05-09 15:41:33 +0000
committerMichael Meeks <michael@src.gnome.org>2002-05-09 15:41:33 +0000
commit403eb9f139ecc17deefbcbeb1a8c2eaf8b6c8565 (patch)
tree58a76a5774520ff9ff98ceab075ade79026fb253
parentce85e0a900faf43208c90fad0b2854f982c4df43 (diff)
downloadgconf-403eb9f139ecc17deefbcbeb1a8c2eaf8b6c8565.tar.gz
ensure we don't print a NULL.
2002-05-09 Michael Meeks <michael@ximian.com> * backends/xml-entry.c (entry_get_value): ensure we don't print a NULL.
-rw-r--r--ChangeLog5
-rw-r--r--backends/xml-entry.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a44cfabf..2cfaaa19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-09 Michael Meeks <michael@ximian.com>
+
+ * backends/xml-entry.c (entry_get_value): ensure we
+ don't print a NULL.
+
2002-04-29 Pablo Saratxaga <pablo@mandrakesoft.com>
* configure.in: Added Basque (eu) to ALL_LINGUAS
diff --git a/backends/xml-entry.c b/backends/xml-entry.c
index 946e554a..b9b4c708 100644
--- a/backends/xml-entry.c
+++ b/backends/xml-entry.c
@@ -123,7 +123,7 @@ entry_get_value(Entry* e, const gchar** locales, GError** err)
gconf_log (GCL_DEBUG, "Cached schema value has locale \"%s\", looking for %s",
sl ? sl : "null",
- locales ? locales[0] : "null");
+ locales && locales [0] ? locales[0] : "null");
/* optimize most common cases first */
if (sl == NULL && (locales == NULL ||