From 47d54930164f3c3478ccba66a01aadd0e72802d0 Mon Sep 17 00:00:00 2001 From: Chris Lord Date: Thu, 13 May 2010 15:51:42 +0100 Subject: [PATCH] text: Fix typos that were causing false-positive cache hits If a cached layout didn't actually match the layout we're looking for, it would be returned anyway. Remove this return so that it can correctly continue looking and get a cache miss if appropriate. http://bugzilla.openedhand.com/show_bug.cgi?id=2109 --- clutter/clutter-text.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/clutter/clutter-text.c b/clutter/clutter-text.c index 8b014a256..756a0e296 100644 --- a/clutter/clutter-text.c +++ b/clutter/clutter-text.c @@ -507,7 +507,7 @@ clutter_text_create_layout (ClutterText *text, * See http://bugzilla.gnome.org/show_bug.cgi?id=560931 */ - if (ellipsize != PANGO_ELLIPSIZE_NONE) + if (priv->ellipsize != PANGO_ELLIPSIZE_NONE) { if (allocation_height < 0 && priv->wrap) ; /* must not set ellipsization on wrap=true height request */ @@ -629,8 +629,6 @@ clutter_text_create_layout (ClutterText *text, { oldest_cache = priv->cached_layouts + i; } - - return priv->cached_layouts[i].layout; } }