Fix a g_assert() with a side-effect. (Maybe #121742?)

Tue Sep  9 12:21:02 2003  Owen Taylor  <otaylor@redhat.com>

        * pango/pangofc-fontmap.cI (pango_fc_font_description_from_pattern):
        Fix a g_assert() with a side-effect. (Maybe #121742?)

8 files changed, 65 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 2f56ec5f..c83a25db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep  9 12:21:02 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangofc-fontmap.cI (pango_fc_font_description_from_pattern): 
+	Fix a g_assert() with a side-effect. (Maybe #121742?)
+	
 2003-09-02  Noah Levitt  <nlevitt@columbia.edu>
 
 	* tests/.cvsignore:
@@ -5,6 +10,12 @@
 	* tests/pangorc: Fix tests so that can be run before "make install"
 	has been. (#119831)
 
+Wed Aug 27 11:37:26 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.2.5 ===
+
+	* configure.in: Version 1.2.5, interface age 5.
+
 Tue Aug 26 16:38:22 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/indic/Makefile.am (xft_sources): Add mprefixups.[ch]
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 2f56ec5f..c83a25db 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+Tue Sep  9 12:21:02 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangofc-fontmap.cI (pango_fc_font_description_from_pattern): 
+	Fix a g_assert() with a side-effect. (Maybe #121742?)
+	
 2003-09-02  Noah Levitt  <nlevitt@columbia.edu>
 
 	* tests/.cvsignore:
@@ -5,6 +10,12 @@
 	* tests/pangorc: Fix tests so that can be run before "make install"
 	has been. (#119831)
 
+Wed Aug 27 11:37:26 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.2.5 ===
+
+	* configure.in: Version 1.2.5, interface age 5.
+
 Tue Aug 26 16:38:22 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/indic/Makefile.am (xft_sources): Add mprefixups.[ch]
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 2f56ec5f..c83a25db 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,8 @@
+Tue Sep  9 12:21:02 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangofc-fontmap.cI (pango_fc_font_description_from_pattern): 
+	Fix a g_assert() with a side-effect. (Maybe #121742?)
+	
 2003-09-02  Noah Levitt  <nlevitt@columbia.edu>
 
 	* tests/.cvsignore:
@@ -5,6 +10,12 @@
 	* tests/pangorc: Fix tests so that can be run before "make install"
 	has been. (#119831)
 
+Wed Aug 27 11:37:26 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.2.5 ===
+
+	* configure.in: Version 1.2.5, interface age 5.
+
 Tue Aug 26 16:38:22 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/indic/Makefile.am (xft_sources): Add mprefixups.[ch]
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 2f56ec5f..c83a25db 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+Tue Sep  9 12:21:02 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangofc-fontmap.cI (pango_fc_font_description_from_pattern): 
+	Fix a g_assert() with a side-effect. (Maybe #121742?)
+	
 2003-09-02  Noah Levitt  <nlevitt@columbia.edu>
 
 	* tests/.cvsignore:
@@ -5,6 +10,12 @@
 	* tests/pangorc: Fix tests so that can be run before "make install"
 	has been. (#119831)
 
+Wed Aug 27 11:37:26 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.2.5 ===
+
+	* configure.in: Version 1.2.5, interface age 5.
+
 Tue Aug 26 16:38:22 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/indic/Makefile.am (xft_sources): Add mprefixups.[ch]
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 2f56ec5f..c83a25db 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+Tue Sep  9 12:21:02 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangofc-fontmap.cI (pango_fc_font_description_from_pattern): 
+	Fix a g_assert() with a side-effect. (Maybe #121742?)
+	
 2003-09-02  Noah Levitt  <nlevitt@columbia.edu>
 
 	* tests/.cvsignore:
@@ -5,6 +10,12 @@
 	* tests/pangorc: Fix tests so that can be run before "make install"
 	has been. (#119831)
 
+Wed Aug 27 11:37:26 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 1.2.5 ===
+
+	* configure.in: Version 1.2.5, interface age 5.
+
 Tue Aug 26 16:38:22 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/indic/Makefile.am (xft_sources): Add mprefixups.[ch]
diff --git a/NEWS b/NEWS
index 35f1206b..9c8b33e2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Overview of Changes in Pango 1.2.5
+==================================
+* Fix a problem where the indic-xft shaper didn't get linked
+  against all necessary files.
+
 Overview of Changes in Pango 1.2.4
 ==================================
 * Win32 [Tor Lillqvist]
diff --git a/configure.in b/configure.in
index 5e229309..21f11c6e 100644
--- a/configure.in
+++ b/configure.in
@@ -23,7 +23,7 @@ dnl
 dnl The triplet 
 m4_define([pango_major_version],1)
 m4_define([pango_minor_version],2)
-m4_define([pango_micro_version],4)
+m4_define([pango_micro_version],5)
 
 PANGO_MAJOR_VERSION=pango_major_version()
 PANGO_MINOR_VERSION=pango_minor_version()
@@ -34,7 +34,7 @@ dnl The X.Y in -lpango-X.Y line. This is expected to stay 1.0 until Pango 2.
 PANGO_API_VERSION=1.0
 
 dnl Number of releases since we've added interfaces
-PANGO_INTERFACE_AGE=4
+PANGO_INTERFACE_AGE=5
 
 dnl Number of releases since we've broken binary compatibility.
 # PANGO_BINARY_AGE=0
diff --git a/pango/pangofc-fontmap.cI b/pango/pangofc-fontmap.cI
index 28d5fa20..60e41dc7 100644
--- a/pango/pangofc-fontmap.cI
+++ b/pango/pangofc-fontmap.cI
@@ -862,10 +862,12 @@ _pango_fc_font_desc_from_pattern (FcPattern *pattern, gboolean include_size)
   
   char *s;
   int i;
+  FcResult res;
 
   desc = pango_font_description_new ();
 
-  g_assert (FcPatternGetString (pattern, FC_FAMILY, 0, (FcChar8 **) &s) == FcResultMatch);
+  res = FcPatternGetString (pattern, FC_FAMILY, 0, (FcChar8 **) &s);
+  g_assert (res == FcResultMatch);
 
   pango_font_description_set_family (desc, s);