diff options
| author | Sven Neumann <sven@gimp.org> | 2003-11-20 11:32:33 +0000 |
|---|---|---|
| committer | Sven Neumann <neo@src.gnome.org> | 2003-11-20 11:32:33 +0000 |
| commit | d184525586667206c6caca56245283dd09095b15 (patch) | |
| tree | 025b7aca5d37e5d122207870f71ec3f0a25625e7 /pango/pangoft2-fontmap.c | |
| parent | f4186548325987e5213ae3d25764f1b9fbe97274 (diff) | |
| download | pango-d184525586667206c6caca56245283dd09095b15.tar.gz | |
reverted the patch for bug #123602 since I only applied it accidentally. I
2003-11-20 Sven Neumann <sven@gimp.org>
* pango/pangoft2-fontmap.c: reverted the patch for bug #123602
since I only applied it accidentally. I still believe the patch
should go in though.
* pango/pangoft2.c: really applied the fix for #101856 as
described below.
Diffstat (limited to 'pango/pangoft2-fontmap.c')
| -rw-r--r-- | pango/pangoft2-fontmap.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c index 3460eee8..7efe0287 100644 --- a/pango/pangoft2-fontmap.c +++ b/pango/pangoft2-fontmap.c @@ -68,7 +68,6 @@ struct _PangoFT2FontMapClass }; static void pango_ft2_font_map_class_init (PangoFT2FontMapClass *class); -static void pango_ft2_font_map_init (PangoFT2FontMap *fontmap); static void pango_ft2_font_map_finalize (GObject *object); static void pango_ft2_font_map_default_substitute (PangoFcFontMap *fcfontmap, FcPattern *pattern); @@ -96,9 +95,9 @@ pango_ft2_font_map_get_type (void) NULL, /* class_data */ sizeof (PangoFT2FontMap), 0, /* n_preallocs */ - (GInstanceInitFunc) pango_ft2_font_map_init, + (GInstanceInitFunc) NULL, }; - + object_type = g_type_register_static (PANGO_TYPE_FC_FONT_MAP, "PangoFT2FontMap", &object_info, 0); @@ -121,14 +120,6 @@ pango_ft2_font_map_class_init (PangoFT2FontMapClass *class) } static void -pango_ft2_font_map_init (PangoFT2FontMap *fontmap) -{ - fontmap->library = NULL; - fontmap->dpi_x = 72.0; - fontmap->dpi_y = 72.0; -} - -static void pango_ft2_font_map_finalize (GObject *object) { PangoFT2FontMap *ft2fontmap = PANGO_FT2_FONT_MAP (object); |