From 5e90bb269d6e7034a58994c66d290eed1d63cb1a Mon Sep 17 00:00:00 2001
From: Paolo Borelli <pborelli@gnome.org>
Date: Fri, 1 Oct 2010 10:00:13 +0200
Subject: [PATCH] Get rid of unused shaped_object list in _GtkTextLineDisplay

https://bugzilla.gnome.org/show_bug.cgi?id=631076
---
 gtk/gtktextlayout.c | 8 +-------
 gtk/gtktextlayout.h | 3 +--
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index 283d8f6910..8344a1b642 100644
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -1582,9 +1582,6 @@ add_pixbuf_attrs (GtkTextLayout      *layout,
   attr->start_index = start;
   attr->end_index = start + seg->byte_count;
   pango_attr_list_insert (attrs, attr);
-
-  display->shaped_objects =
-    g_slist_append (display->shaped_objects, pixbuf->pixbuf);
 }
 
 static void
@@ -1643,8 +1640,6 @@ add_child_attrs (GtkTextLayout      *layout,
       widget = NULL;
     }
 
-  display->shaped_objects = g_slist_append (display->shaped_objects, widget);
-  
   logical_rect.x = 0;
   logical_rect.y = -height * PANGO_SCALE;
   logical_rect.width = width * PANGO_SCALE;
@@ -2510,8 +2505,7 @@ gtk_text_layout_free_line_display (GtkTextLayout      *layout,
           g_slist_foreach (display->cursors, (GFunc)g_free, NULL);
           g_slist_free (display->cursors);
         }
-      g_slist_free (display->shaped_objects);
-      
+
       if (display->pg_bg_color)
         gdk_color_free (display->pg_bg_color);
 
diff --git a/gtk/gtktextlayout.h b/gtk/gtktextlayout.h
index dd51e47700..4d835324af 100644
--- a/gtk/gtktextlayout.h
+++ b/gtk/gtktextlayout.h
@@ -237,8 +237,7 @@ struct _GtkTextLineDisplay
 {
   PangoLayout *layout;
   GSList *cursors;
-  GSList *shaped_objects;	/* Only for backwards compatibility */
-  
+
   GtkTextDirection direction;
 
   gint width;                   /* Width of layout */