53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
|
From 039c40e6ec96020e568fb6c1e45dc48f3c4fa6de Mon Sep 17 00:00:00 2001
|
||
|
|
From: Emmanuele Bassi <ebassi@gnome.org>
|
||
|
|
Date: Fri, 21 Jul 2017 15:33:37 +0100
|
||
|
|
Subject: [PATCH] =?UTF-8?q?Revert=20"GKeyFile=20=E2=80=93=20Add=20array=20?=
|
||
|
|
=?UTF-8?q?length=20annotations=20to=20to=5Fdata(),=20get=5Fkeys()=20and?=
|
||
|
|
=?UTF-8?q?=20get=5Fgroups()"?=
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
This reverts commit fd329f4853f180eb92746f39fc96fd5d91394009.
|
||
|
|
|
||
|
|
The commit changed the Introspection ABI, and it requires a change in
|
||
|
|
any application using an introspection-based language binding.
|
||
|
|
---
|
||
|
|
glib/gkeyfile.c | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
|
||
|
|
index 4ac7c087a..9831fbe6c 100644
|
||
|
|
--- a/glib/gkeyfile.c
|
||
|
|
+++ b/glib/gkeyfile.c
|
||
|
|
@@ -1489,7 +1489,7 @@ g_key_file_flush_parse_buffer (GKeyFile *key_file,
|
||
|
|
* Note that this function never reports an error,
|
||
|
|
* so it is safe to pass %NULL as @error.
|
||
|
|
*
|
||
|
|
- * Returns: (array length=length): a newly allocated string holding
|
||
|
|
+ * Returns: a newly allocated string holding
|
||
|
|
* the contents of the #GKeyFile
|
||
|
|
*
|
||
|
|
* Since: 2.6
|
||
|
|
@@ -1559,7 +1559,7 @@ g_key_file_to_data (GKeyFile *key_file,
|
||
|
|
* be found, %NULL is returned and @error is set to
|
||
|
|
* #G_KEY_FILE_ERROR_GROUP_NOT_FOUND.
|
||
|
|
*
|
||
|
|
- * Returns: (array zero-terminated=1 length=length) (transfer full): a newly-allocated %NULL-terminated array of strings.
|
||
|
|
+ * Returns: (array zero-terminated=1) (transfer full): a newly-allocated %NULL-terminated array of strings.
|
||
|
|
* Use g_strfreev() to free it.
|
||
|
|
*
|
||
|
|
* Since: 2.6
|
||
|
|
@@ -1654,7 +1654,7 @@ g_key_file_get_start_group (GKeyFile *key_file)
|
||
|
|
* The array of returned groups will be %NULL-terminated, so
|
||
|
|
* @length may optionally be %NULL.
|
||
|
|
*
|
||
|
|
- * Returns: (array zero-terminated=1 length=length) (transfer full): a newly-allocated %NULL-terminated array of strings.
|
||
|
|
+ * Returns: (array zero-terminated=1) (transfer full): a newly-allocated %NULL-terminated array of strings.
|
||
|
|
* Use g_strfreev() to free it.
|
||
|
|
* Since: 2.6
|
||
|
|
**/
|
||
|
|
--
|
||
|
|
2.13.0
|
||
|
|
|