diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-07-21 20:49:50 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-07-21 20:49:50 +0000 |
| commit | 5d9ddcfbeb8c892eb994a64efdd2e7f94ff8d9be (patch) | |
| tree | 068b926a923edf338245e4f4c6e9fb4fc51eb346 | |
| parent | ae6dfa1fa07024d568ca4fbfedf210b3ec0b0494 (diff) | |
| download | pango-5d9ddcfbeb8c892eb994a64efdd2e7f94ff8d9be.tar.gz | |
pango/pangowin32-fontmap.c (pango_win32_font_map_class_init) Move
2005-07-21 Owen Taylor <otaylor@redhat.com>
* pango/pangowin32-fontmap.c (pango_win32_font_map_class_init)
Move registration of included modules to here from
pango/pangowin32.c (pango_win32_get_context). (#309337, Hans
Breuer)
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 9 | ||||
| -rw-r--r-- | pango/pangowin32-fontmap.c | 3 | ||||
| -rw-r--r-- | pango/pangowin32.c | 9 |
4 files changed, 19 insertions, 11 deletions
@@ -1,5 +1,12 @@ 2005-07-21 Owen Taylor <otaylor@redhat.com> - + + * pango/pangowin32-fontmap.c (pango_win32_font_map_class_init) + Move registration of included modules to here from + pango/pangowin32.c (pango_win32_get_context). (#309337, Hans + Breuer) + +2005-07-21 Owen Taylor <otaylor@redhat.com> + * modules/indic/indic-ot-class-tables.c: Change the char class for U+0A5C from _cn (consonant with nukta) to _ct. (#309459, Sukhjinder Sidhu) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index f2b4af45..2394e779 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,5 +1,12 @@ 2005-07-21 Owen Taylor <otaylor@redhat.com> - + + * pango/pangowin32-fontmap.c (pango_win32_font_map_class_init) + Move registration of included modules to here from + pango/pangowin32.c (pango_win32_get_context). (#309337, Hans + Breuer) + +2005-07-21 Owen Taylor <otaylor@redhat.com> + * modules/indic/indic-ot-class-tables.c: Change the char class for U+0A5C from _cn (consonant with nukta) to _ct. (#309459, Sukhjinder Sidhu) diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c index a618c0ae..d29ee20d 100644 --- a/pango/pangowin32-fontmap.c +++ b/pango/pangowin32-fontmap.c @@ -192,6 +192,9 @@ pango_win32_font_map_class_init (PangoWin32FontMapClass *class) fontmap_class->shape_engine_type = PANGO_RENDER_TYPE_WIN32; pango_win32_get_dc (); + + for (i = 0; _pango_included_win32_modules[i].list; i++) + pango_module_register (&_pango_included_win32_modules[i]); } static PangoWin32FontMap *default_fontmap = NULL; diff --git a/pango/pangowin32.c b/pango/pangowin32.c index a3a706e0..536542f6 100644 --- a/pango/pangowin32.c +++ b/pango/pangowin32.c @@ -132,17 +132,8 @@ PangoContext * pango_win32_get_context (void) { PangoContext *result; - static gboolean registered_modules = FALSE; int i; - if (!registered_modules) - { - registered_modules = TRUE; - - for (i = 0; _pango_included_win32_modules[i].list; i++) - pango_module_register (&_pango_included_win32_modules[i]); - } - result = pango_context_new (); pango_context_set_font_map (result, pango_win32_font_map_for_display ()); |