From: Behdad Esfahbod <behdad@behdad.org>
Date: Wed, 15 Jun 2011 15:29:48 +0000 (-0400)
Subject: Revert "layout: Make sure all lines are ellipsized"
X-Git-Tag: 1.29.1~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b895d225346084dd9bd167c39ae1f3e2c2526252;p=platform%2Fupstream%2Fpango.git

Revert "layout: Make sure all lines are ellipsized"

This reverts commit 00d2842d8a5ded059fc058d05b2cffcf16186710.
---

diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 4e21e25..40f92fa 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -5220,7 +5220,8 @@ pango_layout_line_postprocess (PangoLayoutLine *line,
 
   /* Ellipsize the line if necessary
    */
-  if (G_UNLIKELY (state->line_width >= 0 && line->layout->ellipsize))
+  if (G_UNLIKELY (state->line_width >= 0 &&
+		  should_ellipsize_current_line (line->layout, state)))
     {
       ellipsized = _pango_layout_line_ellipsize (line, state->attrs, state->line_width);
     }