diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2007-06-12 17:45:22 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2007-06-12 17:45:22 +0000 |
| commit | 0713b108da9cb2306f63dceeff585c1185874f84 (patch) | |
| tree | a290e85f9e3862edbd92476752001c8156b28221 | |
| parent | 395113c20099ac48fa4b838f00f8244776edb78a (diff) | |
| download | pango-0713b108da9cb2306f63dceeff585c1185874f84.tar.gz | |
Compare set fields of two font descriptions for equality too, as
2007-06-12 Behdad Esfahbod <behdad@gnome.org>
* pango/pango-attributes.c (pango_attr_font_desc_equal):
Compare set fields of two font descriptions for equality
too, as pango_font_description_equal() doesn't check the
mask.
svn path=/trunk/; revision=2351
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | pango/pango-attributes.c | 4 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2007-06-12 Behdad Esfahbod <behdad@gnome.org> + + * pango/pango-attributes.c (pango_attr_font_desc_equal): + Compare set fields of two font descriptions for equality + too, as pango_font_description_equal() doesn't check the + mask. + 2007-06-12 Richard Hult <richard@imendio.com> * pango/pangocairo-atsuifontmap.c: Implement diff --git a/pango/pango-attributes.c b/pango/pango-attributes.c index 0e0e3c40..ba3973dd 100644 --- a/pango/pango-attributes.c +++ b/pango/pango-attributes.c @@ -613,7 +613,9 @@ pango_attr_font_desc_equal (const PangoAttribute *attr1, const PangoAttrFontDesc *desc_attr1 = (const PangoAttrFontDesc *)attr1; const PangoAttrFontDesc *desc_attr2 = (const PangoAttrFontDesc *)attr2; - return pango_font_description_equal (desc_attr1->desc, desc_attr2->desc); + return pango_font_description_get_set_fields (desc_attr1->desc) == + pango_font_description_get_set_fields (desc_attr2->desc) && + pango_font_description_equal (desc_attr1->desc, desc_attr2->desc); } /** |