Index: gdk/gdkpango.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/gdkpango.c,v
retrieving revision 1.60
diff -u -p -d -r1.60 gdkpango.c
--- gdk/gdkpango.c	22 Dec 2006 17:06:30 -0000	1.60
+++ gdk/gdkpango.c	24 Dec 2006 03:39:50 -0000
@@ -1246,7 +1246,7 @@ layout_iter_get_line_clip_region (PangoL
   gint baseline;
   gint i;
 
-  line = pango_layout_iter_get_line (iter);
+  line = pango_layout_iter_get_line_readonly (iter);
 
   clip_region = gdk_region_new ();
 
@@ -1330,7 +1330,7 @@ gdk_pango_layout_line_get_clip_region (P
   g_return_val_if_fail (index_ranges != NULL, NULL);
   
   iter = pango_layout_get_iter (line->layout);
-  while (pango_layout_iter_get_line (iter) != line)
+  while (pango_layout_iter_get_line_readonly (iter) != line)
     pango_layout_iter_next_line (iter);
   
   clip_region = layout_iter_get_line_clip_region(iter, x_origin, y_origin, index_ranges, n_ranges);
Index: gtk/gtkcalendar.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkcalendar.c,v
retrieving revision 1.117
diff -u -p -d -r1.117 gtkcalendar.c
--- gtk/gtkcalendar.c	22 Dec 2006 19:10:39 -0000	1.117
+++ gtk/gtkcalendar.c	24 Dec 2006 03:39:52 -0000
@@ -1643,7 +1643,7 @@ gtk_calendar_size_request (GtkWidget	  *
     for (i = 0; i < 7; i++)
       {
 	pango_layout_set_text (layout, default_abbreviated_dayname[i], -1);
-	pango_layout_line_get_pixel_extents (pango_layout_get_lines (layout)->data, NULL, &logical_rect);
+	pango_layout_line_get_pixel_extents (pango_layout_get_lines_readonly (layout)->data, NULL, &logical_rect);
 
 	priv->min_day_width = MAX (priv->min_day_width, logical_rect.width);
 	priv->max_label_char_ascent = MAX (priv->max_label_char_ascent,
Index: gtk/gtkentry.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkentry.c,v
retrieving revision 1.327
diff -u -p -d -r1.327 gtkentry.c
--- gtk/gtkentry.c	22 Dec 2006 19:10:40 -0000	1.327
+++ gtk/gtkentry.c	24 Dec 2006 03:39:55 -0000
@@ -1523,7 +1523,7 @@ gtk_entry_get_pixel_ranges (GtkEntry  *e
   if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start_char, &end_char))
     {
       PangoLayout *layout = gtk_entry_ensure_layout (entry, TRUE);
-      PangoLayoutLine *line = pango_layout_get_lines (layout)->data;
+      PangoLayoutLine *line = pango_layout_get_lines_readonly (layout)->data;
       const char *text = pango_layout_get_text (layout);
       gint start_index = g_utf8_offset_to_pointer (text, start_char) - text;
       gint end_index = g_utf8_offset_to_pointer (text, end_char) - text;
@@ -3349,7 +3349,7 @@ get_layout_position (GtkEntry *entry,
 
   area_height = PANGO_SCALE * (area_height - inner_border.top - inner_border.bottom);
 
-  line = pango_layout_get_lines (layout)->data;
+  line = pango_layout_get_lines_readonly (layout)->data;
   pango_layout_line_get_extents (line, NULL, &logical_rect);
   
   /* Align primarily for locale's ascent/descent */
@@ -3571,7 +3571,7 @@ gtk_entry_find_position (GtkEntry *entry
   text = pango_layout_get_text (layout);
   cursor_index = g_utf8_offset_to_pointer (text, entry->current_pos) - text;
   
-  line = pango_layout_get_lines (layout)->data;
+  line = pango_layout_get_lines_readonly (layout)->data;
   pango_layout_line_x_to_index (line, x * PANGO_SCALE, &index, &trailing);
 
   if (index >= cursor_index && entry->preedit_length)
@@ -3667,7 +3667,7 @@ gtk_entry_adjust_scroll (GtkEntry *entry
     text_area_width = 0;
 
   layout = gtk_entry_ensure_layout (entry, TRUE);
-  line = pango_layout_get_lines (layout)->data;
+  line = pango_layout_get_lines_readonly (layout)->data;
 
   pango_layout_line_get_extents (line, NULL, &logical_rect);
 
Index: gtk/gtkiconview.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkiconview.c,v
retrieving revision 1.108
diff -u -p -d -r1.108 gtkiconview.c
--- gtk/gtkiconview.c	22 Dec 2006 19:10:40 -0000	1.108
+++ gtk/gtkiconview.c	24 Dec 2006 03:39:57 -0000
@@ -7216,7 +7216,7 @@ get_pango_text_offsets (PangoLayout     
   iter = pango_layout_get_iter (layout);
   do
     {
-      line = pango_layout_iter_get_line (iter);
+      line = pango_layout_iter_get_line_readonly (iter);
       start_index = line->start_index;
       end_index = start_index + line->length;
 
@@ -7257,7 +7257,7 @@ get_pango_text_offsets (PangoLayout     
                 {
                 case ATK_TEXT_BOUNDARY_LINE_START:
                   if (pango_layout_iter_next_line (iter))
-                    end_index = pango_layout_iter_get_line (iter)->start_index;
+                    end_index = pango_layout_iter_get_line_readonly (iter)->start_index;
                   break;
                 case ATK_TEXT_BOUNDARY_LINE_END:
                   if (prev_line)
@@ -7274,13 +7274,13 @@ get_pango_text_offsets (PangoLayout     
                 */
               if (pango_layout_iter_next_line (iter))
                 {
-                  line = pango_layout_iter_get_line (iter);
+                  line = pango_layout_iter_get_line_readonly (iter);
                   switch (boundary_type)
                     {
                     case ATK_TEXT_BOUNDARY_LINE_START:
                       start_index = line->start_index;
                       if (pango_layout_iter_next_line (iter))
-                        end_index = pango_layout_iter_get_line (iter)->start_index;
+                        end_index = pango_layout_iter_get_line_readonly (iter)->start_index;
                       else
                         end_index = start_index + line->length;
                       break;
Index: gtk/gtklabel.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtklabel.c,v
retrieving revision 1.204
diff -u -p -d -r1.204 gtklabel.c
--- gtk/gtklabel.c	16 Nov 2006 12:56:29 -0000	1.204
+++ gtk/gtklabel.c	24 Dec 2006 03:40:00 -0000
@@ -2327,7 +2327,7 @@ get_cursor_direction (GtkLabel *label)
 
   gtk_label_ensure_layout (label);
 
-  for (l = pango_layout_get_lines (label->layout); l; l = l->next)
+  for (l = pango_layout_get_lines_readonly (label->layout); l; l = l->next)
     {
       PangoLayoutLine *line = l->data;
 
Index: gtk/gtkstyle.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkstyle.c,v
retrieving revision 1.202
diff -u -p -d -r1.202 gtkstyle.c
--- gtk/gtkstyle.c	26 Nov 2006 19:43:12 -0000	1.202
+++ gtk/gtkstyle.c	24 Dec 2006 03:40:02 -0000
@@ -4938,7 +4938,7 @@ get_insensitive_layout (GdkDrawable *dra
       gboolean need_stipple = FALSE;
       ByteRange *br;
       
-      run = pango_layout_iter_get_run (iter);
+      run = pango_layout_iter_get_run_readonly (iter);
 
       if (run)
         {
Index: gtk/gtktextdisplay.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktextdisplay.c,v
retrieving revision 1.56
diff -u -p -d -r1.56 gtktextdisplay.c
--- gtk/gtktextdisplay.c	6 Jul 2006 05:14:03 -0000	1.56
+++ gtk/gtktextdisplay.c	24 Dec 2006 03:40:02 -0000
@@ -481,7 +481,7 @@ render_para (GtkTextRenderer    *text_re
 
   do
     {
-      PangoLayoutLine *line = pango_layout_iter_get_line (iter);
+      PangoLayoutLine *line = pango_layout_iter_get_line_readonly (iter);
       int selection_y, selection_height;
       int first_y, last_y;
       PangoRectangle line_rect;
Index: gtk/gtktextlayout.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktextlayout.c,v
retrieving revision 1.118
diff -u -p -d -r1.118 gtktextlayout.c
--- gtk/gtktextlayout.c	20 Jul 2006 18:42:17 -0000	1.118
+++ gtk/gtktextlayout.c	24 Dec 2006 03:40:04 -0000
@@ -1651,7 +1651,7 @@ allocate_child_widgets (GtkTextLayout   
   
   do
     {
-      PangoLayoutRun *run = pango_layout_iter_get_run (iter);
+      PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
 
       if (run && is_shape (run))
         {
@@ -2565,7 +2565,7 @@ find_display_line_below (GtkTextLayout *
       do
         {
           gint first_y, last_y;
-          PangoLayoutLine *layout_line = pango_layout_iter_get_line (layout_iter);
+          PangoLayoutLine *layout_line = pango_layout_iter_get_line_readonly (layout_iter);
 
           found_byte = layout_line->start_index;
           
@@ -2636,7 +2636,7 @@ find_display_line_above (GtkTextLayout *
       do
         {
           gint first_y, last_y;
-          PangoLayoutLine *layout_line = pango_layout_iter_get_line (layout_iter);
+          PangoLayoutLine *layout_line = pango_layout_iter_get_line_readonly (layout_iter);
 
           found_byte = layout_line->start_index;
 
@@ -2767,7 +2767,7 @@ gtk_text_layout_move_iter_to_previous_li
       update_byte = TRUE;
     }
   
-  tmp_list = pango_layout_get_lines (display->layout);
+  tmp_list = pango_layout_get_lines_readonly (display->layout);
   layout_line = tmp_list->data;
 
   if (update_byte)
@@ -2793,7 +2793,7 @@ gtk_text_layout_move_iter_to_previous_li
 
           if (display->height > 0)
             {
-              tmp_list = g_slist_last (pango_layout_get_lines (display->layout));
+              tmp_list = g_slist_last (pango_layout_get_lines_readonly (display->layout));
               layout_line = tmp_list->data;
 
               line_display_index_to_iter (layout, display, iter,
@@ -2879,7 +2879,7 @@ gtk_text_layout_move_iter_to_next_line (
       else
 	line_byte = 0;
 	
-      tmp_list = pango_layout_get_lines (display->layout);
+      tmp_list = pango_layout_get_lines_readonly (display->layout);
       while (tmp_list && !found_after)
         {
           PangoLayoutLine *layout_line = tmp_list->data;
@@ -2939,7 +2939,7 @@ gtk_text_layout_move_iter_to_line_end (G
   display = gtk_text_layout_get_line_display (layout, line, FALSE);
   line_byte = line_display_iter_to_index (layout, display, iter);
 
-  tmp_list = pango_layout_get_lines (display->layout);
+  tmp_list = pango_layout_get_lines_readonly (display->layout);
   while (tmp_list)
     {
       PangoLayoutLine *layout_line = tmp_list->data;
@@ -2995,7 +2995,7 @@ gtk_text_layout_iter_starts_line (GtkTex
   display = gtk_text_layout_get_line_display (layout, line, FALSE);
   line_byte = line_display_iter_to_index (layout, display, iter);
 
-  tmp_list = pango_layout_get_lines (display->layout);
+  tmp_list = pango_layout_get_lines_readonly (display->layout);
   while (tmp_list)
     {
       PangoLayoutLine *layout_line = tmp_list->data;
@@ -3064,7 +3064,7 @@ gtk_text_layout_move_iter_to_x (GtkTextL
 
   do
     {
-      PangoLayoutLine *layout_line = pango_layout_iter_get_line (layout_iter);
+      PangoLayoutLine *layout_line = pango_layout_iter_get_line_readonly (layout_iter);
 
       if (line_byte < layout_line->start_index + layout_line->length ||
           pango_layout_iter_at_last_line (layout_iter))
Index: gtk/gtktextutil.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktextutil.c,v
retrieving revision 1.16
diff -u -p -d -r1.16 gtktextutil.c
--- gtk/gtktextutil.c	7 Mar 2006 13:45:55 -0000	1.16
+++ gtk/gtktextutil.c	24 Dec 2006 03:40:04 -0000
@@ -157,7 +157,7 @@ limit_layout_lines (PangoLayout *layout)
     {
       text  = pango_layout_get_text (layout);
       str   = g_string_new (NULL);
-      lines = pango_layout_get_lines (layout);
+      lines = pango_layout_get_lines_readonly (layout);
 
       /* get first lines */
       elem = lines;
