1 Index: pango1.0-1.16.0/pango/modules.c
2 ===================================================================
3 --- pango1.0-1.16.0.orig/pango/modules.c 2007-01-23 00:41:43.000000000 +0100
4 +++ pango1.0-1.16.0/pango/modules.c 2007-03-07 11:16:16.000000000 +0100
6 #define PANGO_MODULE(module) (G_TYPE_CHECK_INSTANCE_CAST ((module), PANGO_TYPE_MODULE, PangoModule))
7 #define PANGO_IS_MODULE(module) (G_TYPE_CHECK_INSTANCE_TYPE ((module), PANGO_TYPE_MODULE))
9 +#define MODULEFILEEXT ".modules"
10 +#define MODULEFILEEXT_LEN ((int) strlen (MODULEFILEEXT))
12 typedef struct _PangoMapInfo PangoMapInfo;
13 typedef struct _PangoEnginePair PangoEnginePair;
14 typedef struct _PangoSubmap PangoSubmap;
19 - module_file = g_fopen (files[n], "r");
21 + GDir *dir = g_dir_open (files[n], 0, NULL);
24 - process_module_file(module_file);
25 - fclose(module_file);
28 + while ((dent = g_dir_read_name (dir)))
30 + int len = strlen (dent);
31 + if (len > MODULEFILEEXT_LEN && strcmp (dent + len - MODULEFILEEXT_LEN, MODULEFILEEXT) == 0)
33 + gchar *pathname = g_build_filename (files[n], dent, NULL);
34 + module_file = g_fopen (pathname, "r");
37 + process_module_file(module_file);
38 + fclose(module_file);
47 + module_file = g_fopen (files[n], "r");
50 + process_module_file(module_file);
51 + fclose(module_file);