Update the field mask in the merged description.

Tue Jan  1 20:52:00 2002  Owen Taylor  <otaylor@redhat.com>

        * pango/fonts.c (pango_font_description_merge[_static]):
        Update the field mask in the merged description.

8 files changed, 39 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index e57a6530..a5d46a67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan  1 20:52:00 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/fonts.c (pango_font_description_merge[_static]):
+	Update the field mask in the merged description.
+
 2002-01-02  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32.c (pango_win32_render_layout_line): Silence gcc
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index e57a6530..a5d46a67 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,8 @@
+Tue Jan  1 20:52:00 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/fonts.c (pango_font_description_merge[_static]):
+	Update the field mask in the merged description.
+
 2002-01-02  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32.c (pango_win32_render_layout_line): Silence gcc
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index e57a6530..a5d46a67 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+Tue Jan  1 20:52:00 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/fonts.c (pango_font_description_merge[_static]):
+	Update the field mask in the merged description.
+
 2002-01-02  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32.c (pango_win32_render_layout_line): Silence gcc
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index e57a6530..a5d46a67 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,8 @@
+Tue Jan  1 20:52:00 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/fonts.c (pango_font_description_merge[_static]):
+	Update the field mask in the merged description.
+
 2002-01-02  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32.c (pango_win32_render_layout_line): Silence gcc
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index e57a6530..a5d46a67 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,8 @@
+Tue Jan  1 20:52:00 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/fonts.c (pango_font_description_merge[_static]):
+	Update the field mask in the merged description.
+
 2002-01-02  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32.c (pango_win32_render_layout_line): Silence gcc
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index e57a6530..a5d46a67 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+Tue Jan  1 20:52:00 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/fonts.c (pango_font_description_merge[_static]):
+	Update the field mask in the merged description.
+
 2002-01-02  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32.c (pango_win32_render_layout_line): Silence gcc
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index e57a6530..a5d46a67 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+Tue Jan  1 20:52:00 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/fonts.c (pango_font_description_merge[_static]):
+	Update the field mask in the merged description.
+
 2002-01-02  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32.c (pango_win32_render_layout_line): Silence gcc
diff --git a/pango/fonts.c b/pango/fonts.c
index e693605e..2f7c85aa 100644
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -443,6 +443,8 @@ pango_font_description_merge (PangoFontDescription       *desc,
     desc->stretch = desc_to_merge->stretch;
   if (new_mask & PANGO_FONT_MASK_SIZE)
     desc->size = desc_to_merge->size;
+
+  desc->mask |= new_mask;
 }
 
 /**
@@ -484,6 +486,8 @@ pango_font_description_merge_static (PangoFontDescription       *desc,
     desc->stretch = desc_to_merge->stretch;
   if (new_mask & PANGO_FONT_MASK_SIZE)
     desc->size = desc_to_merge->size;
+
+  desc->mask |= new_mask;
 }
 
 static gint