Index: pango/pango-layout.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-layout.c,v
retrieving revision 1.135
diff -p -u -2 -r1.135 pango-layout.c
--- pango/pango-layout.c	24 Jun 2005 21:19:30 -0000	1.135
+++ pango/pango-layout.c	18 Jul 2005 06:31:28 -0000
@@ -3720,5 +3720,5 @@ pango_layout_line_get_empty_extents (Pan
       int index;
       PangoLayout *layout = line->layout;
-      PangoFont *font;
+      PangoFontset *fontset;
       PangoFontDescription *font_desc = NULL;
       gboolean free_font_desc = FALSE;
@@ -3771,16 +3771,16 @@ pango_layout_line_get_empty_extents (Pan
 	}
 
-      font = pango_context_load_font (layout->context, font_desc);
-      if (font)
+      fontset = pango_context_load_fontset (layout->context, font_desc,
+					 pango_context_get_language (layout->context));
+      if (fontset)
 	{
 	  PangoFontMetrics *metrics;
 
-	  metrics = pango_font_get_metrics (font,
-					    pango_context_get_language (layout->context));
+	  metrics = pango_fontset_get_metrics (fontset);
 
 	  logical_rect->y = - pango_font_metrics_get_ascent (metrics);
 	  logical_rect->height = - logical_rect->y + pango_font_metrics_get_descent (metrics);
 
-	  g_object_unref (font);
+	  g_object_unref (fontset);
 	  pango_font_metrics_unref (metrics);
 	}
