summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark McLoughlin <mark@skynet.ie>2005-01-18 10:44:17 +0000
committerMark McLoughlin <markmc@src.gnome.org>2005-01-18 10:44:17 +0000
commit20f38b99312949f4520478ea4049c1c6697fbc3b (patch)
tree74f81297a6766b60b0d7fee99cebde267ac4f503
parent87eaeabccbfe9f9f8ab709e29079ead4133779c5 (diff)
downloadgconf-20f38b99312949f4520478ea4049c1c6697fbc3b.tar.gz
Fixes problem where a path file which only includes another path file
2005-01-18 Mark McLoughlin <mark@skynet.ie> Fixes problem where a path file which only includes another path file wouldn't work. * gconf/gconf-internals.c: (gconf_load_source_path): assign the return value of g_slist_concat() to something.
-rw-r--r--ChangeLog8
-rw-r--r--gconf/gconf-internals.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 277a5480..ec70e208 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-18 Mark McLoughlin <mark@skynet.ie>
+
+ Fixes problem where a path file which only includes
+ another path file wouldn't work.
+
+ * gconf/gconf-internals.c: (gconf_load_source_path):
+ assign the return value of g_slist_concat() to something.
+
2005-01-17 Mark McLoughlin <mark@skynet.ie>
Fix double free with gconf_client_clear_cache()
diff --git a/gconf/gconf-internals.c b/gconf/gconf-internals.c
index 241204b6..f355153e 100644
--- a/gconf/gconf-internals.c
+++ b/gconf/gconf-internals.c
@@ -871,7 +871,7 @@ gconf_load_source_path(const gchar* filename, GError** err)
g_free (varsubst);
if (included != NULL)
- g_slist_concat (l, included);
+ l = g_slist_concat (l, included);
}
else
{