[evolution-patches] patch for e-clipped-label.c

[Chris Toshok <toshok ximian com>]

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/ChangeLog,v
retrieving revision 1.317
diff -u -r1.317 ChangeLog
--- ChangeLog	1 Jul 2004 14:51:57 -0000	1.317
+++ ChangeLog	14 Jul 2004 17:01:50 -0000
@@ -1,3 +1,10 @@
+2004-07-14  Chris Toshok  <toshok ximian com>
+
+	* e-clipped-label.c (e_clipped_label_recalc_chars_displayed):
+	remove debug spew and fix the display when
+	pango_layout_line_x_to_index returns FALSE (before we were drawing
+	both the ellipses and the text).
+
 2004-06-24  Rodney Dawes  <dobey novell com>
 
 	* e-error.c (e_error_newv): Fix alignment of the icon to be 0x0
Index: e-clipped-label.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-clipped-label.c,v
retrieving revision 1.15
diff -u -r1.15 e-clipped-label.c
--- e-clipped-label.c	27 Jan 2003 04:59:48 -0000	1.15
+++ e-clipped-label.c	14 Jul 2004 17:01:51 -0000
@@ -390,11 +390,11 @@
 		return;
 	}
 
-	if (max_width <= 0) {
-		label->chars_displayed = 0;
-		label->ellipsis_x = 0;
+	label->chars_displayed = 0;
+	label->ellipsis_x = 0;
+
+	if (max_width <= 0)
 		return;
-	}
 
 	max_width -= label->ellipsis_width;
 
@@ -405,14 +405,8 @@
 					   max_width * PANGO_SCALE,
 					   &index,
 					   NULL)) {
-		g_warning ("pango_layout_line_x_to_index returned false");
 		return;
 	}
-
-#if 0
-	g_slist_foreach (lines, (GFunc)pango_layout_line_unref, NULL);
-	g_slist_free (lines);
-#endif
 
 	label->chars_displayed = index;