diff -Naur mozilla/gfx/src/gtk/mozilla-decoder.cpp mozilla.tpg/gfx/src/gtk/mozilla-decoder.cpp --- mozilla/gfx/src/gtk/mozilla-decoder.cpp 2004-11-07 23:59:23.000000000 +0000 +++ mozilla.tpg/gfx/src/gtk/mozilla-decoder.cpp 2007-07-31 14:36:42.000000000 +0000 @@ -40,7 +40,7 @@ #define PANGO_ENABLE_ENGINE #include "mozilla-decoder.h" -#include <pango/pangoxft.h> +#include <pango/pangocairo.h> #include <pango/pangofc-fontmap.h> #include <pango/pangofc-font.h> #include <gdk/gdkx.h> @@ -208,7 +208,7 @@ } } - pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())), + pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()), mozilla_find_decoder, NULL, NULL);