Actually advance through list. (Problem noticed by Erwann Chenede)

Thu May 31 12:31:20 2001  Owen Taylor  <otaylor@redhat.com>

	* pango/pangox-fontmap.c (pango_x_font_map_for_display):
	Actually advance through list. (Problem noticed
	by Erwann Chenede)

	* modules/Makefile.am (install-data-local): Move rule
	for generation of /etc/pango/pango.modules to here,
	since we are now built _after_ the library. (Problem
	noticed by KUSANO Takayuki)

10 files changed, 90 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 5e3a1b7d..c969bae9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Thu May 31 12:31:20 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangox-fontmap.c (pango_x_font_map_for_display):
+	Actually advance through list. (Problem noticed 
+	by Erwann Chenede)
+
+	* modules/Makefile.am (install-data-local): Move rule
+	for generation of /etc/pango/pango.modules to here,
+	since we are now built _after_ the library. (Problem
+	noticed by KUSANO Takayuki)
+
 Tue May 29 18:17:11 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* autogen.sh (have_libtool): Fix GNU sedism
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 5e3a1b7d..c969bae9 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,14 @@
+Thu May 31 12:31:20 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangox-fontmap.c (pango_x_font_map_for_display):
+	Actually advance through list. (Problem noticed 
+	by Erwann Chenede)
+
+	* modules/Makefile.am (install-data-local): Move rule
+	for generation of /etc/pango/pango.modules to here,
+	since we are now built _after_ the library. (Problem
+	noticed by KUSANO Takayuki)
+
 Tue May 29 18:17:11 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* autogen.sh (have_libtool): Fix GNU sedism
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 5e3a1b7d..c969bae9 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,14 @@
+Thu May 31 12:31:20 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangox-fontmap.c (pango_x_font_map_for_display):
+	Actually advance through list. (Problem noticed 
+	by Erwann Chenede)
+
+	* modules/Makefile.am (install-data-local): Move rule
+	for generation of /etc/pango/pango.modules to here,
+	since we are now built _after_ the library. (Problem
+	noticed by KUSANO Takayuki)
+
 Tue May 29 18:17:11 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* autogen.sh (have_libtool): Fix GNU sedism
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 5e3a1b7d..c969bae9 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,14 @@
+Thu May 31 12:31:20 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangox-fontmap.c (pango_x_font_map_for_display):
+	Actually advance through list. (Problem noticed 
+	by Erwann Chenede)
+
+	* modules/Makefile.am (install-data-local): Move rule
+	for generation of /etc/pango/pango.modules to here,
+	since we are now built _after_ the library. (Problem
+	noticed by KUSANO Takayuki)
+
 Tue May 29 18:17:11 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* autogen.sh (have_libtool): Fix GNU sedism
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 5e3a1b7d..c969bae9 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,14 @@
+Thu May 31 12:31:20 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangox-fontmap.c (pango_x_font_map_for_display):
+	Actually advance through list. (Problem noticed 
+	by Erwann Chenede)
+
+	* modules/Makefile.am (install-data-local): Move rule
+	for generation of /etc/pango/pango.modules to here,
+	since we are now built _after_ the library. (Problem
+	noticed by KUSANO Takayuki)
+
 Tue May 29 18:17:11 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* autogen.sh (have_libtool): Fix GNU sedism
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 5e3a1b7d..c969bae9 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,14 @@
+Thu May 31 12:31:20 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangox-fontmap.c (pango_x_font_map_for_display):
+	Actually advance through list. (Problem noticed 
+	by Erwann Chenede)
+
+	* modules/Makefile.am (install-data-local): Move rule
+	for generation of /etc/pango/pango.modules to here,
+	since we are now built _after_ the library. (Problem
+	noticed by KUSANO Takayuki)
+
 Tue May 29 18:17:11 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* autogen.sh (have_libtool): Fix GNU sedism
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 5e3a1b7d..c969bae9 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,14 @@
+Thu May 31 12:31:20 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangox-fontmap.c (pango_x_font_map_for_display):
+	Actually advance through list. (Problem noticed 
+	by Erwann Chenede)
+
+	* modules/Makefile.am (install-data-local): Move rule
+	for generation of /etc/pango/pango.modules to here,
+	since we are now built _after_ the library. (Problem
+	noticed by KUSANO Takayuki)
+
 Tue May 29 18:17:11 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* autogen.sh (have_libtool): Fix GNU sedism
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 999912f7..4f7f259d 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -12,6 +12,17 @@ SUBDIRS = 		\
 EXTRA_DIST =		\
 	module.def
 
+install-data-local:
+	($(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango; \
+	if ls $(DESTDIR)$(libdir)/pango/modules/*.so | grep 'so' > /dev/null ; then \
+          echo "Wrote $(DESTDIR)$(sysconfdir)/pango/pango.modules."; \
+          $(top_builddir)/pango/pango-querymodules $(DESTDIR)$(libdir)/pango/modules/*.so \
+		> $(DESTDIR)$(sysconfdir)/pango/pango.modules; \
+        else \
+          echo "No dynamic modules were installed; all modules were linked statically."; \
+	  echo "# This is an empty file, because Pango was installed with no dynamic modules" > $(DESTDIR)$(sysconfdir)/pango/pango.modules; \
+        fi)
+
 included-modules:
 	@for d in $(SUBDIRS) ; do \
 		( cd $$d && $(MAKE) $(AM_MAKEFLAGS) included-modules ) ; \
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 4a8f6107..02d13254 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -191,17 +191,6 @@ EXTRA_DIST =			\
 	pangowin32.rc.in
 
 
-install-data-local:
-	($(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango; \
-	if ls $(DESTDIR)$(libdir)/pango/modules/*.so | grep 'so' > /dev/null ; then \
-          echo "Wrote $(DESTDIR)$(sysconfdir)/pango/pango.modules."; \
-          $(top_builddir)/pango/pango-querymodules $(DESTDIR)$(libdir)/pango/modules/*.so \
-		> $(DESTDIR)$(sysconfdir)/pango/pango.modules; \
-        else \
-          echo "No dynamic modules were installed; all modules were linked statically."; \
-	  echo "# This is an empty file, because Pango was installed with no dynamic modules" > $(DESTDIR)$(sysconfdir)/pango/pango.modules; \
-        fi)
-
 if HAVE_INCLUDED_MODULES
 included-modules:
 	@cd $(top_builddir)/modules && $(MAKE) $(AM_MAKEFLAGS) included-modules
diff --git a/pango/pangox-fontmap.c b/pango/pangox-fontmap.c
index 360e4e6b..631591f4 100644
--- a/pango/pangox-fontmap.c
+++ b/pango/pangox-fontmap.c
@@ -228,6 +228,8 @@ pango_x_font_map_for_display (Display *display)
 
       if (xfontmap->display == display)
 	return PANGO_FONT_MAP (xfontmap);
+
+      tmp_list = tmp_list->next;
     }
 
   xfontmap = (PangoXFontMap *)g_type_create_instance (PANGO_TYPE_X_FONT_MAP);