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
This commit is contained in:
Chris Lord 2010-05-13 15:51:42 +01:00 committed by Emmanuele Bassi
parent acea83d7ae
commit 47d5493016

View File

@ -507,7 +507,7 @@ clutter_text_create_layout (ClutterText *text,
* See http://bugzilla.gnome.org/show_bug.cgi?id=560931 * 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) if (allocation_height < 0 && priv->wrap)
; /* must not set ellipsization on wrap=true height request */ ; /* 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; oldest_cache = priv->cached_layouts + i;
} }
return priv->cached_layouts[i].layout;
} }
} }