Index: gtk/gtksettings.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtksettings.c,v
retrieving revision 1.78
diff -u -p -r1.78 gtksettings.c
--- gtk/gtksettings.c	24 Oct 2005 20:01:57 -0000	1.78
+++ gtk/gtksettings.c	22 Nov 2005 08:30:54 -0000
@@ -1417,6 +1417,10 @@ settings_update_font_options (GtkSetting
 
   options = cairo_font_options_create ();
   
+  /* hint_metrics = FALSE should never be set for user interface code.
+   */
+  cairo_font_options_set_hint_metrics (options, CAIRO_HINT_METRICS_ON);
+
   if (hinting >= 0 && !hinting)
     {
       hint_style = CAIRO_HINT_STYLE_NONE;