summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--pango/pango-markup.c2
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c2c7dc10..e676a627 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2007-06-11 Behdad Esfahbod <behdad@gnome.org>
+ Bug 446355 – the parsing with pango_parse_markup is not coherent
+
+ * pango/pango-markup.c (pango_parse_markup): Use
+ pango_attr_list_insert() instead of pango_attr_list_change() as
+ merging adjacent attributes of the same kind is not a safe operation
+ and can change the derived font of a segment in an unexpected and
+ incorrect way.
+
+2007-06-11 Behdad Esfahbod <behdad@gnome.org>
+
* pango/pangocairo-fontmap.c: Make sure all enabled font backends
included (reported by Vincent Isambart).
diff --git a/pango/pango-markup.c b/pango/pango-markup.c
index 31086214..7f4f75cf 100644
--- a/pango/pango-markup.c
+++ b/pango/pango-markup.c
@@ -664,7 +664,7 @@ pango_parse_markup (const char *markup_text,
PangoAttribute *attr = tmp_list->data;
/* Innermost tags before outermost */
- pango_attr_list_change (md->attr_list, attr);
+ pango_attr_list_insert (md->attr_list, attr);
tmp_list = g_slist_next (tmp_list);
}