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/pangox.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/pangox.c')
| -rw-r--r-- | pango/pangox.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/pango/pangox.c b/pango/pangox.c index fe72da5e..7dd7f00c 100644 --- a/pango/pangox.c +++ b/pango/pangox.c @@ -29,6 +29,7 @@ #include "pango-utils.h" #include "pangox-private.h" #include "pango-intset.h" +#include "modules.h" #define PANGO_LIGATURE_HACK_DEBUG @@ -246,9 +247,19 @@ pango_x_get_context (Display *display) { PangoContext *result; PangoXContextInfo *info; - - g_return_val_if_fail (display != NULL, NULL); - + int i; + static gboolean registered_modules = FALSE; + + g_return_val_if_fail (display != NULL, NULL); + + if (!registered_modules) + { + registered_modules = TRUE; + + for (i = 0; _pango_included_modules[i].list; i++) + pango_module_register (&_pango_included_modules[i]); + } + result = pango_context_new (); info = g_new (PangoXContextInfo, 1); |