Index: pango/querymodules.c
===================================================================
RCS file: /cvs/gnome/pango/pango/querymodules.c,v
retrieving revision 1.30
diff -u -r1.30 querymodules.c
--- pango/querymodules.c	15 Feb 2006 05:39:20 -0000	1.30
+++ pango/querymodules.c	17 Mar 2006 15:07:58 -0000
@@ -239,10 +239,30 @@
       
       path = pango_config_key_get ("Pango/ModulesPath");
       if (!path)
-	path = g_build_filename (pango_get_lib_subdirectory (),
-				 MODULE_VERSION,
-				 "modules",
-				 NULL);
+        {
+          path = g_build_filename (pango_get_lib_subdirectory (),
+                                   MODULE_VERSION,
+                                   "modules",
+                                   NULL);
+          GDir *dir = g_dir_open (path, 0, NULL);
+          char *dpath;
+          if (dir)
+            {
+              const char *dent;
+
+              while ((dent = g_dir_read_name (dir)))
+                {
+                  if (g_file_test (dent, G_FILE_TEST_IS_DIR))
+                    {
+                      dpath = path;
+                      path = g_strconcat (dpath, ":", dent, NULL);
+                      g_free (dpath);
+                    }
+                }
+              
+              g_dir_close (dir);
+            }
+        }
 
       g_printf ("# ModulesPath = %s\n#\n", path);
 
