summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2008-02-23 05:25:27 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2008-02-23 05:25:27 +0000
commita24587ad098dcdf76d1b4c4fb7d007fc2cc11dc5 (patch)
tree26d528ccc4fad81791c6a418033f7b8c0582d503
parent11d7305d5ab03ce2a17bcbc76400feb7319c62b5 (diff)
Return NULL when the key is not found. (#513171, Дилян
2008-02-23 Matthias Clasen <mclasen@redhat.com> * glib/gkeyfile.c (g_key_file_get_string_list): Return NULL when the key is not found. (#513171, Дилян Палаузов) svn path=/trunk/; revision=6563
-rw-r--r--ChangeLog5
-rw-r--r--glib/gkeyfile.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e21e28217..bc9f0dd2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-23 Matthias Clasen <mclasen@redhat.com>
+
+ * glib/gkeyfile.c (g_key_file_get_string_list): Return
+ NULL when the key is not found. (#513171, Дилян Палаузов)
+
2008-02-23 Matthias Clasen <mclasen@redhat.com>
* tests/testglib.c: Don't test user directories for being
diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index 6cdf158b0..f0a263740 100644
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -1520,6 +1520,8 @@ g_key_file_get_string_list (GKeyFile *key_file,
}
else
g_propagate_error (error, key_file_error);
+
+ return NULL;
}
len = g_slist_length (pieces);