From ee5963ce9cf98bc5ab795d19d0f432d613c86708 Mon Sep 17 00:00:00 2001
From: Alberto Ruiz <aruiz@gnome.org>
Date: Mon, 25 Apr 2011 15:49:03 +0100
Subject: [PATCH] adding allow-none and out caller-allocate introspection
 metadata to pango_layout_set_markup_with_accel. Correct some documentation
 typos.

---
 pango/pango-layout.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index a10c08f..e62b4a1 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -1100,7 +1100,7 @@ pango_layout_get_text (PangoLayout *layout)
  * @layout: a #PangoLayout
  * @markup: marked-up text
  * @length: length of marked-up text in bytes, or -1 if @markup is
- * nul-terminated
+ *          null-terminated
  *
  * Same as pango_layout_set_markup_with_accel(), but
  * the markup text isn't scanned for accelerators.
@@ -1120,9 +1120,10 @@ pango_layout_set_markup (PangoLayout *layout,
  * @markup: marked-up text
  * (see <link linkend="PangoMarkupFormat">markup format</link>)
  * @length: length of marked-up text in bytes, or -1 if @markup is
- * nul-terminated
+ *          null-terminated
  * @accel_marker: marker for accelerators in the text
- * @accel_char: return location for first located accelerator, or %NULL
+ * @accel_char: (out caller-allocates) (allow-none): return location
+ *                    for first located accelerator, or %NULL
  *
  * Sets the layout text and attribute list from marked-up text (see
  * <link linkend="PangoMarkupFormat">markup format</link>). Replaces
-- 
2.7.4