Add accessor to get the text from the layout

2000-11-12  Havoc Pennington  <hp@pobox.com>

* pango/pango-layout.c (pango_layout_get_text): Add accessor to
get the text from the layout

9 files changed, 53 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 1f1dac40..c8a41f1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-12  Havoc Pennington  <hp@pobox.com>
+
+	* pango/pango-layout.c (pango_layout_get_text): Add accessor to 
+	get the text from the layout
+
 2000-11-11  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32.c (pango_win32_render): Add code to call
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 1f1dac40..c8a41f1f 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,8 @@
+2000-11-12  Havoc Pennington  <hp@pobox.com>
+
+	* pango/pango-layout.c (pango_layout_get_text): Add accessor to 
+	get the text from the layout
+
 2000-11-11  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32.c (pango_win32_render): Add code to call
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 1f1dac40..c8a41f1f 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+2000-11-12  Havoc Pennington  <hp@pobox.com>
+
+	* pango/pango-layout.c (pango_layout_get_text): Add accessor to 
+	get the text from the layout
+
 2000-11-11  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32.c (pango_win32_render): Add code to call
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 1f1dac40..c8a41f1f 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,8 @@
+2000-11-12  Havoc Pennington  <hp@pobox.com>
+
+	* pango/pango-layout.c (pango_layout_get_text): Add accessor to 
+	get the text from the layout
+
 2000-11-11  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32.c (pango_win32_render): Add code to call
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 1f1dac40..c8a41f1f 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,8 @@
+2000-11-12  Havoc Pennington  <hp@pobox.com>
+
+	* pango/pango-layout.c (pango_layout_get_text): Add accessor to 
+	get the text from the layout
+
 2000-11-11  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32.c (pango_win32_render): Add code to call
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 1f1dac40..c8a41f1f 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+2000-11-12  Havoc Pennington  <hp@pobox.com>
+
+	* pango/pango-layout.c (pango_layout_get_text): Add accessor to 
+	get the text from the layout
+
 2000-11-11  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32.c (pango_win32_render): Add code to call
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 1f1dac40..c8a41f1f 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+2000-11-12  Havoc Pennington  <hp@pobox.com>
+
+	* pango/pango-layout.c (pango_layout_get_text): Add accessor to 
+	get the text from the layout
+
 2000-11-11  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32.c (pango_win32_render): Add code to call
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 2736a7e8..a235e4f2 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -573,6 +573,23 @@ pango_layout_set_text (PangoLayout *layout,
   pango_layout_clear_lines (layout);
 }
 
+/**
+ * pango_layout_get_text:
+ * @layout: a #PangoLayout
+ * 
+ * Gets the text in the layout. The returned text should not
+ * be freed or modified.
+ * 
+ * Return value: the text in the layout
+ **/
+const char*
+pango_layout_get_text (PangoLayout *layout)
+{
+  g_return_val_if_fail (PANGO_IS_LAYOUT (layout), NULL);
+
+  return layout->text;
+}
+
 void
 pango_layout_set_markup (PangoLayout *layout,
                          const char  *markup,
diff --git a/pango/pango-layout.h b/pango/pango-layout.h
index 43f40955..02475290 100644
--- a/pango/pango-layout.h
+++ b/pango/pango-layout.h
@@ -79,6 +79,7 @@ PangoAttrList *pango_layout_get_attributes (PangoLayout    *layout);
 void           pango_layout_set_text       (PangoLayout    *layout,
 					    const char     *text,
 					    int             length);
+const char    *pango_layout_get_text       (PangoLayout    *layout);
 
 void           pango_layout_set_markup     (PangoLayout    *layout,
                                             const char     *markup,