--- calendar/gui/print.c.orig	2010-06-21 16:04:38.256309815 -0700
+++ calendar/gui/print.c	2010-06-22 09:21:20.383783895 -0700
@@ -1459,7 +1459,7 @@
 				    buffer, sizeof (buffer));
 
 		x1 += 4;
-		x1 += print_text_size (context, buffer, PANGO_ALIGN_LEFT, x1, x2, y1, y1 + row_height);
+		x1 += print_text (context, font, buffer, PANGO_ALIGN_LEFT, x1, x2, y1, y1 + row_height);
 	}
 
 	/* If the event ends before the end of the last day being printed,
@@ -1477,12 +1477,12 @@
 				    buffer, sizeof (buffer));
 
 		x2 -= 4;
-		x2 -= print_text_size (context, buffer, PANGO_ALIGN_RIGHT, x1, x2, y1, y1 + row_height);
+		x2 -= print_text (context, font, buffer, PANGO_ALIGN_RIGHT, x1, x2, y1, y1 + row_height);
 	}
 
 	x1 += 4;
 	x2 -= 4;
-	print_text_size (context, text, PANGO_ALIGN_CENTER, x1, x2, y1, y1 + row_height);
+	print_text (context, font, text, PANGO_ALIGN_CENTER, x1, x2, y1, y1 + row_height);
 }
 
 static void
@@ -1506,7 +1506,7 @@
 	e_time_format_time (&date_tm, psi->use_24_hour_format, FALSE,
 			    buffer, sizeof (buffer));
 	print_rectangle (context, x1, y1, x2 - x1, row_height, red, green, blue);
-	x1 += print_text_size (context, buffer, PANGO_ALIGN_LEFT, x1, x2, y1, y1 + row_height) + 4;
+	x1 += print_text (context, font, buffer, PANGO_ALIGN_LEFT, x1, x2, y1, y1 + row_height) + 4;
 
 	if (psi->weeks_shown <= 2) {
 		date_tm.tm_hour = event->end_minute / 60;
@@ -1516,10 +1516,10 @@
 				    buffer, sizeof (buffer));
 
 		print_rectangle (context, x1, y1, x2 - x1, row_height, red, green, blue);
-		x1 += print_text_size (context, buffer, PANGO_ALIGN_LEFT, x1, x2, y1, y1 + row_height) + 4;
+		x1 += print_text (context, font, buffer, PANGO_ALIGN_LEFT, x1, x2, y1, y1 + row_height) + 4;
 	}
 
-	print_text_size (context, text, PANGO_ALIGN_LEFT, x1, x2, y1, y1 + row_height);
+	print_text (context, font, text, PANGO_ALIGN_LEFT, x1, x2, y1, y1 + row_height);
 }
 
 static void
@@ -1712,7 +1712,7 @@
 
 		e_utf8_strftime (buffer, sizeof (buffer), format_string, &tm);
 
-		 print_text_size (context, buffer, PANGO_ALIGN_RIGHT,
+		 print_text (context, font, buffer, PANGO_ALIGN_RIGHT,
 				 x1, x2 - 4, y1 + 2, y1 + 2 + font_size);
 	}
 }
