evolution r36819 - in trunk: . widgets/table

[friemann svn gnome org]

Author: friemann
Date: Fri Nov 28 09:53:49 2008
New Revision: 36819
URL: http://svn.gnome.org/viewvc/evolution?rev=36819&view=rev

Log:
2008-11-28  Felix Riemann  <friemann svn gnome org>

	** Fixes bug #554464

	* configure.in: Bump gtk+ minimum version to 2.14.0 which pulls
	in a recent enough Pango version.
	* widgets/table/e-cell-text.c: (build_layout): Let Pango handle
	the ellipsizing, which should be faster.


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/widgets/table/ChangeLog
   trunk/widgets/table/e-cell-text.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Nov 28 09:53:49 2008
@@ -22,7 +22,7 @@
 
 # Required Packages
 m4_define([glib_minimum_version], [2.18.0])
-m4_define([gtk_minimum_version], [2.12.0])
+m4_define([gtk_minimum_version], [2.14.0])
 m4_define([eds_minimum_version], [2.25.2])
 m4_define([gnome_icon_theme_minimum_version], [2.19.91])
 m4_define([libbonobo_minimum_version], [2.20.3])

Modified: trunk/widgets/table/e-cell-text.c
==============================================================================
--- trunk/widgets/table/e-cell-text.c	(original)
+++ trunk/widgets/table/e-cell-text.c	Fri Nov 28 09:53:49 2008
@@ -612,21 +612,8 @@
 	pango_layout_set_width (layout, width * PANGO_SCALE);
 	pango_layout_set_wrap (layout, PANGO_WRAP_CHAR);
 
-	if (pango_layout_get_line_count (layout) > 1) {
-		PangoLayoutLine *line = pango_layout_get_line (layout, 0);
-		gchar *line_text = g_strdup (pango_layout_get_text (layout));
-		gchar *last_char = g_utf8_find_prev_char (line_text, line_text + line->length - 1);
-		while (last_char && pango_layout_get_line_count (layout) > 1) {
-			gchar *new_text;
-			last_char = g_utf8_find_prev_char (line_text, last_char);
-			if (last_char)
-				*last_char = '\0';
-			new_text = g_strconcat (line_text, "...", NULL);
-			pango_layout_set_text (layout, new_text, -1);
-			g_free (new_text);
-		}
-		g_free (line_text);
-	}
+	pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
+	pango_layout_set_height (layout, 0);
 
 	switch (ect->justify) {
 	case GTK_JUSTIFY_RIGHT: