rpms/evolution/devel evolution-2.3.5.1-fix-150458.patch, 1.1, 1.2 evolution.spec, 1.80, 1.81

[fedora-cvs-commits redhat com]

Author: dmalcolm

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6334

Modified Files:
	evolution-2.3.5.1-fix-150458.patch evolution.spec 
Log Message:
* Mon Aug  1 2005 David Malcolm <dmalcolm redhat com> - 2.3.6.1-3
- Improved version of evolution-2.3.5.1-fix-150458.patch (#150458)



evolution-2.3.5.1-fix-150458.patch:
 e-cell-text.c             |   99 ++++++++++++++++++++++++++--------------------
 e-table-group-container.c |   31 +++++++++++---
 2 files changed, 80 insertions(+), 50 deletions(-)

Index: evolution-2.3.5.1-fix-150458.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.3.5.1-fix-150458.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.3.5.1-fix-150458.patch	29 Jul 2005 03:16:14 -0000	1.1
+++ evolution-2.3.5.1-fix-150458.patch	2 Aug 2005 00:32:47 -0000	1.2
@@ -1,83 +1,14 @@
---- gal-2.5.3/gal/e-table/e-table-group-container.c.fix-150458	2005-04-29 10:16:03.000000000 -0400
-+++ gal-2.5.3/gal/e-table/e-table-group-container.c	2005-07-28 00:52:56.000000000 -0400
-@@ -27,6 +27,7 @@
- #include <gtk/gtk.h>
- #include <libgnome/libgnome.h>
- #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
-+#include <libgnomeprint/gnome-print-pango.h>
- 
- #include "gal/e-text/e-text.h"
- #include "gal/util/e-i18n.h"
-@@ -1159,7 +1160,18 @@
- 	GList *child;
- 	EPrintable *child_printable;
- 	gchar *string;
--	GnomeFont *font = gnome_font_find ("Helvetica", TEXT_HEIGHT);
-+
-+	PangoLayout *pl;
-+
-+	PangoFontDescription *font_desc = pango_font_description_from_string ("Helvetica");
-+	#define MAGIC_SCALE_FACTOR (0.86)
-+	pango_font_description_set_size (font_desc,
-+					 TEXT_HEIGHT * MAGIC_SCALE_FACTOR * PANGO_SCALE );
-+
-+	pl = gnome_print_pango_create_layout (context);
-+	pango_layout_set_font_description (pl, font_desc);
-+	pango_layout_set_width (pl, -1); /* ensure no line-wrapping occurs */
-+	pango_layout_set_indent (pl, 0);
- 
- 	child_printable = groupcontext->child_printable;
- 	child = groupcontext->child;
-@@ -1223,9 +1235,8 @@
- 		if (gnome_print_clip(context) == -1)
- 			/* FIXME */;
- 
--		if (gnome_print_moveto(context, 2, yd - (TEXT_AREA_HEIGHT + gnome_font_get_ascender(font) - gnome_font_get_descender(font)) / 2) == -1)
--			/* FIXME */;
--		if (gnome_print_setfont(context, font))
-+		/* FIXME: get correct Y coordinate: */
-+		if (gnome_print_moveto(context, 2, yd) == -1)
- 			/* FIXME */;
- 		if (groupcontext->etgc->ecol->text)
- 			string = g_strdup_printf ("%s : %s (%d item%s)",
-@@ -1238,9 +1249,13 @@
- 						  child_node->string,
- 						  (gint) child_node->count,
- 						  child_node->count == 1 ? "" : "s");
--		if (gnome_print_show(context, string))
--			/* FIXME */;
-+
-+		pango_layout_set_text (pl, string, -1);
-+
- 		g_free(string);
-+
-+		gnome_print_pango_layout (context, pl);
-+
- 		if (gnome_print_grestore(context) == -1)
- 			/* FIXME */;
- 
-@@ -1294,7 +1309,9 @@
- 		g_object_unref (groupcontext->child_printable);
- 	groupcontext->child_printable = child_printable;
- 	groupcontext->child = child;
--			
-+
-+	pango_font_description_free (font_desc);
-+	g_object_unref (G_OBJECT (pl));			
- }
- 
- static gboolean
---- gal-2.5.3/gal/e-table/e-cell-text.c.fix-150458	2005-07-28 00:51:11.000000000 -0400
-+++ gal-2.5.3/gal/e-table/e-cell-text.c	2005-07-28 00:52:32.000000000 -0400
+--- evolution-2.3.5.1/widgets/table/e-cell-text.c.fix-150458	2005-06-25 06:24:31.000000000 -0400
++++ evolution-2.3.5.1/widgets/table/e-cell-text.c	2005-08-01 20:25:03.000000000 -0400
 @@ -45,6 +45,7 @@
  #include <gtk/gtk.h>
  #include <libgnomecanvas/gnome-canvas.h>
  #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 +#include <libgnomeprint/gnome-print-pango.h>
  
- #include "gal/a11y/e-table/gal-a11y-e-cell-registry.h"
- #include "gal/a11y/e-table/gal-a11y-e-cell-text.h"
-@@ -1288,23 +1289,18 @@
+ #include "a11y/e-table/gal-a11y-e-cell-registry.h"
+ #include "a11y/e-table/gal-a11y-e-cell-text.h"
+@@ -1286,23 +1287,18 @@
  
  #define FONT_NAME "Sans Regular"
  
@@ -103,13 +34,13 @@
 -	return font;
 +	#define MAGIC_SCALE_FACTOR (0.86)
 +	pango_font_description_set_size (font_desc,
-+					 h * MAGIC_SCALE_FACTOR * PANGO_SCALE );
++					 h * (MAGIC_SCALE_FACTOR * PANGO_SCALE) );
 + 
 +	return font_desc;
  }
  
  static void
-@@ -1312,13 +1308,54 @@
+@@ -1310,13 +1306,54 @@
  	   int model_col, int view_col, int row,
  	   double width, double height)
  {
@@ -166,7 +97,7 @@
  	gnome_print_gsave(context);
  	if (gnome_print_moveto(context, 2, 2) == -1)
  				/* FIXME */;
-@@ -1333,38 +1370,15 @@
+@@ -1331,38 +1368,14 @@
  	if (gnome_print_clip(context) == -1)
  				/* FIXME */;
  
@@ -195,8 +126,7 @@
 -		gnome_print_setlinewidth (context, gnome_font_get_underline_thickness (font));
 -		gnome_print_stroke (context);
 -	}
-+	/* ty = (height - gnome_font_get_ascender(font) - gnome_font_get_descender(font)) / 2; */
-+	ty = 0; /* FIXME: get appropriate y coordinate */
++	ty = height;
  
  	gnome_print_moveto(context, 2, ty);
 -	gnome_print_setfont(context, font);
@@ -210,3 +140,72 @@
  }
  
  static gdouble
+--- evolution-2.3.5.1/widgets/table/e-table-group-container.c.fix-150458	2005-06-25 06:24:31.000000000 -0400
++++ evolution-2.3.5.1/widgets/table/e-table-group-container.c	2005-07-28 15:00:03.000000000 -0400
+@@ -27,6 +27,7 @@
+ #include <gtk/gtk.h>
+ #include <libgnome/libgnome.h>
+ #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
++#include <libgnomeprint/gnome-print-pango.h>
+ 
+ #include "text/e-text.h"
+ #include "e-util/e-i18n.h"
+@@ -1159,7 +1160,18 @@
+ 	GList *child;
+ 	EPrintable *child_printable;
+ 	gchar *string;
+-	GnomeFont *font = gnome_font_find ("Helvetica", TEXT_HEIGHT);
++
++	PangoLayout *pl;
++
++	PangoFontDescription *font_desc = pango_font_description_from_string ("Helvetica");
++	#define MAGIC_SCALE_FACTOR (0.86)
++	pango_font_description_set_size (font_desc,
++					 TEXT_HEIGHT * MAGIC_SCALE_FACTOR * PANGO_SCALE );
++
++	pl = gnome_print_pango_create_layout (context);
++	pango_layout_set_font_description (pl, font_desc);
++	pango_layout_set_width (pl, -1); /* ensure no line-wrapping occurs */
++	pango_layout_set_indent (pl, 0);
+ 
+ 	child_printable = groupcontext->child_printable;
+ 	child = groupcontext->child;
+@@ -1223,9 +1235,8 @@
+ 		if (gnome_print_clip(context) == -1)
+ 			/* FIXME */;
+ 
+-		if (gnome_print_moveto(context, 2, yd - (TEXT_AREA_HEIGHT + gnome_font_get_ascender(font) - gnome_font_get_descender(font)) / 2) == -1)
+-			/* FIXME */;
+-		if (gnome_print_setfont(context, font))
++		/* FIXME: get correct Y coordinate: */
++		if (gnome_print_moveto(context, 2, yd) == -1)
+ 			/* FIXME */;
+ 		if (groupcontext->etgc->ecol->text)
+ 			string = g_strdup_printf ("%s : %s (%d item%s)",
+@@ -1238,9 +1249,13 @@
+ 						  child_node->string,
+ 						  (gint) child_node->count,
+ 						  child_node->count == 1 ? "" : "s");
+-		if (gnome_print_show(context, string))
+-			/* FIXME */;
++
++		pango_layout_set_text (pl, string, -1);
++
+ 		g_free(string);
++
++		gnome_print_pango_layout (context, pl);
++
+ 		if (gnome_print_grestore(context) == -1)
+ 			/* FIXME */;
+ 
+@@ -1294,7 +1309,9 @@
+ 		g_object_unref (groupcontext->child_printable);
+ 	groupcontext->child_printable = child_printable;
+ 	groupcontext->child = child;
+-			
++
++	pango_font_description_free (font_desc);
++	g_object_unref (G_OBJECT (pl));			
+ }
+ 
+ static gboolean


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- evolution.spec	30 Jul 2005 17:19:09 -0000	1.80
+++ evolution.spec	2 Aug 2005 00:32:47 -0000	1.81
@@ -27,7 +27,7 @@
 
 Name: evolution
 Version: 2.3.6.1
-Release: 2
+Release: 3
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -349,6 +349,9 @@
 %{_libdir}/evolution/%{evo_major}/*.so
 
 %changelog
+* Mon Aug  1 2005 David Malcolm <dmalcolm redhat com> - 2.3.6.1-3
+- Improved version of evolution-2.3.5.1-fix-150458.patch (#150458)
+
 * Sat Jul 30 2005 David Malcolm <dmalcolm redhat com> 2.3.6.1-2
 - Fixed version numbers in GConf schema files (#164622); added 
   apps-evolution-mail-prompts-checkdefault-2.4.schemas