diff --git a/ChangeLog b/ChangeLog
index 3c13a81e57..32f3e50ade 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-27  Sven Neumann  <sven@gimp.org>
+
+	* app/text/gimptext-compat.c (text_get_extents)
+	* app/text/gimptextlayout-render.c (gimp_text_layout_render):
+	use the readonly variant of pango_layout_iter_get_line().
+
 2008-07-27  Martin Nordholts  <martinn@svn.gnome.org>
 
 	* app/tools/gimprectangletool.c
diff --git a/app/text/gimptext-compat.c b/app/text/gimptext-compat.c
index 2e07b0a85e..b0675a59e5 100644
--- a/app/text/gimptext-compat.c
+++ b/app/text/gimptext-compat.c
@@ -176,7 +176,7 @@ text_get_extents (const gchar *fontname,
       PangoLayoutLine *line;
 
       iter = pango_layout_get_iter (layout);
-      line = pango_layout_iter_get_line (iter);
+      line = pango_layout_iter_get_line_readonly (iter);
       pango_layout_iter_free (iter);
 
       pango_layout_line_get_pixel_extents (line, NULL, &rect);
diff --git a/app/text/gimptextlayout-render.c b/app/text/gimptextlayout-render.c
index 0734ef12af..36dbcede99 100644
--- a/app/text/gimptextlayout-render.c
+++ b/app/text/gimptextlayout-render.c
@@ -91,7 +91,7 @@ gimp_text_layout_render (GimpTextLayout     *layout,
       PangoLayoutLine *line;
       gint             baseline;
 
-      line = pango_layout_iter_get_line (iter);
+      line = pango_layout_iter_get_line_readonly (iter);
 
       pango_layout_iter_get_line_extents (iter, NULL, &rect);
       baseline = pango_layout_iter_get_baseline (iter);