From 38070eff87be3dd0c592ba53b11a10618b092250 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 8 Aug 2002 23:27:37 +0000 Subject: Fix accidentally exported set_unicode_charmap() and Thu Aug 8 19:14:09 2002 Owen Taylor * pango/pangoxft-font.c (load_fallback_font): Fix accidentally exported set_unicode_charmap() and load_fallback_face/font(). (Jacob Berkman, #90245) * configure.in: Up PANGO_MODULE_VERSION to 1.1.0. --- ChangeLog | 8 ++++++++ ChangeLog.pre-1-10 | 8 ++++++++ ChangeLog.pre-1-2 | 8 ++++++++ ChangeLog.pre-1-4 | 8 ++++++++ ChangeLog.pre-1-6 | 8 ++++++++ ChangeLog.pre-1-8 | 8 ++++++++ configure.in | 2 +- pango/pangoft2.c | 4 ++-- pango/pangoxft-font.c | 4 ++-- 9 files changed, 53 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 130e0c18..f1736e33 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Aug 8 19:14:09 2002 Owen Taylor + + * pango/pangoxft-font.c (load_fallback_font): Fix + accidentally exported set_unicode_charmap() and + load_fallback_face/font(). (Jacob Berkman, #90245) + + * configure.in: Up PANGO_MODULE_VERSION to 1.1.0. + Thu Aug 8 19:00:49 2002 Owen Taylor * pango/pangoxft-fontmap.c: Up MAX_FREED_FONTS to 128 diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 130e0c18..f1736e33 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,11 @@ +Thu Aug 8 19:14:09 2002 Owen Taylor + + * pango/pangoxft-font.c (load_fallback_font): Fix + accidentally exported set_unicode_charmap() and + load_fallback_face/font(). (Jacob Berkman, #90245) + + * configure.in: Up PANGO_MODULE_VERSION to 1.1.0. + Thu Aug 8 19:00:49 2002 Owen Taylor * pango/pangoxft-fontmap.c: Up MAX_FREED_FONTS to 128 diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 130e0c18..f1736e33 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,11 @@ +Thu Aug 8 19:14:09 2002 Owen Taylor + + * pango/pangoxft-font.c (load_fallback_font): Fix + accidentally exported set_unicode_charmap() and + load_fallback_face/font(). (Jacob Berkman, #90245) + + * configure.in: Up PANGO_MODULE_VERSION to 1.1.0. + Thu Aug 8 19:00:49 2002 Owen Taylor * pango/pangoxft-fontmap.c: Up MAX_FREED_FONTS to 128 diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 130e0c18..f1736e33 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,11 @@ +Thu Aug 8 19:14:09 2002 Owen Taylor + + * pango/pangoxft-font.c (load_fallback_font): Fix + accidentally exported set_unicode_charmap() and + load_fallback_face/font(). (Jacob Berkman, #90245) + + * configure.in: Up PANGO_MODULE_VERSION to 1.1.0. + Thu Aug 8 19:00:49 2002 Owen Taylor * pango/pangoxft-fontmap.c: Up MAX_FREED_FONTS to 128 diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 130e0c18..f1736e33 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,11 @@ +Thu Aug 8 19:14:09 2002 Owen Taylor + + * pango/pangoxft-font.c (load_fallback_font): Fix + accidentally exported set_unicode_charmap() and + load_fallback_face/font(). (Jacob Berkman, #90245) + + * configure.in: Up PANGO_MODULE_VERSION to 1.1.0. + Thu Aug 8 19:00:49 2002 Owen Taylor * pango/pangoxft-fontmap.c: Up MAX_FREED_FONTS to 128 diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 130e0c18..f1736e33 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,11 @@ +Thu Aug 8 19:14:09 2002 Owen Taylor + + * pango/pangoxft-font.c (load_fallback_font): Fix + accidentally exported set_unicode_charmap() and + load_fallback_face/font(). (Jacob Berkman, #90245) + + * configure.in: Up PANGO_MODULE_VERSION to 1.1.0. + Thu Aug 8 19:00:49 2002 Owen Taylor * pango/pangoxft-fontmap.c: Up MAX_FREED_FONTS to 128 diff --git a/configure.in b/configure.in index 4dfe137f..9261cf3e 100644 --- a/configure.in +++ b/configure.in @@ -34,7 +34,7 @@ dnl This is the last version with which we have compatibility with dnl with the modules for; it isn't the same as dnl PANGO_API_VERSION.'PANGO_MICRO_VERSION - PANGO_BINARY_AGE' since we have dnl engine only API -PANGO_MODULE_VERSION=1.0.0 +PANGO_MODULE_VERSION=1.1.0 AC_SUBST(PANGO_MAJOR_VERSION) AC_SUBST(PANGO_MINOR_VERSION) diff --git a/pango/pangoft2.c b/pango/pangoft2.c index c27ef2db..fce91a5e 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -119,7 +119,7 @@ _pango_ft2_font_new (PangoFontMap *fontmap, return ft2font; } -gboolean +static gboolean set_unicode_charmap (FT_Face face) { int charmap; @@ -134,7 +134,7 @@ set_unicode_charmap (FT_Face face) return FALSE; } -void +static void load_fallback_face (PangoFT2Font *ft2font, const char *original_file) { diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c index c82ba44e..315e0795 100644 --- a/pango/pangoxft-font.c +++ b/pango/pangoxft-font.c @@ -722,7 +722,7 @@ pango_xft_font_find_shaper (PangoFont *font, return (PangoEngineShape *)pango_map_get_engine (shape_map, ch); } -gboolean +static gboolean set_unicode_charmap (FT_Face face) { int charmap; @@ -737,7 +737,7 @@ set_unicode_charmap (FT_Face face) return FALSE; } -void +static void load_fallback_font (PangoXftFont *xfont) { Display *display; -- cgit v1.2.1