--- deliantra/Deliantra-Client/pango-fontmap.c	2009/04/05 19:28:54	1.3
+++ deliantra/Deliantra-Client/pango-fontmap.c	2018/11/18 00:52:22	1.6
@@ -75,10 +75,7 @@
   PangoOpenGLFontMap *fontmap;
   FT_Error error;
   
-  /* Make sure that the type system is initialized */
-  g_type_init ();
-  
-  fontmap = g_object_new (PANGO_TYPE_OPENGL_FONT_MAP, NULL);
+  fontmap = (PangoOpenGLFontMap *)g_object_new (PANGO_TYPE_OPENGL_FONT_MAP, NULL);
   
   error = FT_Init_FreeType (&fontmap->library);
   if (error != FT_Err_Ok)
@@ -136,7 +133,7 @@
 {
   g_return_val_if_fail (PANGO_OPENGL_IS_FONT_MAP (fontmap), NULL);
   
-  return pango_fc_font_map_create_context (PANGO_FC_FONT_MAP (fontmap));
+  return pango_font_map_create_context (PANGO_FONT_MAP (fontmap));
 }
 
 FT_Library
@@ -159,7 +156,7 @@
 _pango_opengl_font_map_get_renderer (PangoOpenGLFontMap *fontmap)
 {
   if (!fontmap->renderer)
-    fontmap->renderer = g_object_new (PANGO_TYPE_OPENGL_RENDERER, NULL);
+    fontmap->renderer = (PangoRenderer *)g_object_new (PANGO_TYPE_OPENGL_RENDERER, NULL);
 
   return fontmap->renderer;
 }
@@ -175,11 +172,6 @@
   if (fontmap->substitute_func)
     fontmap->substitute_func (pattern, fontmap->substitute_data);
 
-#if 0
-  FcValue v;
-  if (FcPatternGet (pattern, FC_DPI, 0, &v) == FcResultNoMatch)
-    FcPatternAddDouble (pattern, FC_DPI, fontmap->dpi_y);
-#endif
   FcDefaultSubstitute (pattern);
 }
 
@@ -191,10 +183,10 @@
 }
 
 static void
-pango_opengl_font_map_class_init (PangoOpenGLFontMapClass *class)
+pango_opengl_font_map_class_init (PangoOpenGLFontMapClass *klass)
 {
-  GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-  PangoFcFontMapClass *fcfontmap_class = PANGO_FC_FONT_MAP_CLASS (class);
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  PangoFcFontMapClass *fcfontmap_class = PANGO_FC_FONT_MAP_CLASS (klass);
   
   gobject_class->finalize = pango_opengl_font_map_finalize;
   fcfontmap_class->default_substitute = pango_opengl_font_map_default_substitute;