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/modules.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/modules.c')
| -rw-r--r-- | pango/modules.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/pango/modules.c b/pango/modules.c index 6e95027f..7e5c7ec5 100644 --- a/pango/modules.c +++ b/pango/modules.c @@ -31,7 +31,6 @@ #include "pango-modules.h" #include "pango-utils.h" -#include "modules.h" typedef struct _PangoMapInfo PangoMapInfo; typedef struct _PangoEnginePair PangoEnginePair; @@ -199,22 +198,11 @@ handle_included_module (PangoIncludedModule *module, pair->included = TRUE; pair->load_info = module; pair->engine = NULL; - + *engine_list = g_slist_prepend (*engine_list, pair); } } -static void -add_builtin_modules (void) -{ - int i; - - for (i = 0; _pango_included_modules[i].list; i++) - handle_included_module (&_pango_included_modules[i], &builtin_engines); - - builtin_engines = g_slist_reverse (builtin_engines); -} - static gboolean /* Returns true if succeeded, false if failed */ process_module_file (FILE *module_file) { @@ -392,8 +380,7 @@ init_modules (void) return; else init = TRUE; - - add_builtin_modules (); + read_modules (); } |