diff options
author | Havoc Pennington <hp@redhat.com> | 2000-12-15 19:47:45 +0000 |
---|---|---|
committer | Havoc Pennington <hp@src.gnome.org> | 2000-12-15 19:47:45 +0000 |
commit | f4c71c29b3b9b67d746ea23b17ce28b126911f54 (patch) | |
tree | 5fc26aaaeca165ebce07cf0dd3d20243bd19cbd3 /pango/pango-context.c | |
parent | a8ea5ad3907b28d0361957a4f165cf31cc4fc2fc (diff) | |
download | pango-f4c71c29b3b9b67d746ea23b17ce28b126911f54.tar.gz |
touch sysconfdir/pango/pango.modules even if there are no dynamic modules,
2000-12-15 Havoc Pennington <hp@redhat.com>
* modules/Makefile.am (install-data-local): touch
sysconfdir/pango/pango.modules even if there are no dynamic
modules, so pango won't spew warnings about pango.modules not
existing, and to simplify RPM file lists
* pango/pango-context.c (fallback_engine_shape): fix this to
avoid incrementing i twice
(fallback_shaper): fix initializer
* pango/querymodules.c (query_module): don't call g_module_close()
on a module that doesn't get opened successfully
* pango/modules.c: do not include modules.h
(init_modules): do not do the builtin modules here,
they are done by pangox
* pango/pangox.c (pango_x_get_context): register included modules
here
* pango/pangoxft-font.c: do not include modules.h
* pango/Makefile.am (libpango_la_SOURCES): move modules.c,
back in here (but not modules.h, which actually goes with
module-defs.c)
Diffstat (limited to 'pango/pango-context.c')
-rw-r--r-- | pango/pango-context.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pango/pango-context.c b/pango/pango-context.c index fb1e71e9..26bd386f 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -666,7 +666,7 @@ fallback_engine_shape (PangoFont *font, { int n_chars; int i; - char *p; + const char *p; g_return_if_fail (font != NULL); g_return_if_fail (text != NULL); @@ -675,9 +675,10 @@ fallback_engine_shape (PangoFont *font, n_chars = g_utf8_strlen (text, length); pango_glyph_string_set_size (glyphs, n_chars); - + p = text; - for (i = 0; i < n_chars; i++) + i = 0; + while (i < n_chars) { glyphs->glyphs[i].glyph = 0; @@ -707,9 +708,11 @@ fallback_engine_get_coverage (PangoFont *font, } static PangoEngineShape fallback_shaper = { - "FallbackScriptEngine", - PANGO_ENGINE_TYPE_SHAPE, - sizeof (PangoEngineShape), + { + "FallbackScriptEngine", + PANGO_ENGINE_TYPE_SHAPE, + sizeof (PangoEngineShape) + }, fallback_engine_shape, fallback_engine_get_coverage }; |