From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 3 May 2009 02:41:19 +0000 (-0400)
Subject: Accept NULL as empty string list
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=2dfce324220bf7e1ea5ca465a74e58cf8146b808;p=dana%2Fcg-glib.git

Accept NULL as empty string list

Fixes bug 580656.
---

diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index 19301ce8..16939a9f 100644
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -1559,7 +1559,7 @@ g_key_file_get_string_list (GKeyFile     *key_file,
  * @length: number of string values in @list
  *
  * Associates a list of string values for @key under @group_name.
- * If @key cannot be found then it is created.  
+ * If @key cannot be found then it is created.
  * If @group_name cannot be found then it is created.
  *
  * Since: 2.6
@@ -1575,7 +1575,7 @@ g_key_file_set_string_list (GKeyFile            *key_file,
   gsize i;
 
   g_return_if_fail (key_file != NULL);
-  g_return_if_fail (list != NULL);
+  g_return_if_fail (list != NULL || length == 0);
 
   value_list = g_string_sized_new (length * 128);
   for (i = 0; i < length && list[i] != NULL; i++)
@@ -1601,7 +1601,7 @@ g_key_file_set_string_list (GKeyFile            *key_file,
  * @locale: a locale identifier
  * @string: a string
  *
- * Associates a string value for @key and @locale under @group_name.  
+ * Associates a string value for @key and @locale under @group_name.
  * If the translation for @key cannot be found then it is created.
  *
  * Since: 2.6