summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--pango/pango-attributes.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f54b72bf..b1cacd91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-14 Morten Welinder <terra@gnome.org>
+
+ * pango/pango-attributes.c (pango_attr_list_splice): Apply fix for
+ #316054 on this branch too.
+
2005-08-15 Behdad Esfahbod <pango@behdad.org>
* pango/opentype/ftglue.h: Replace perror with perror_.
diff --git a/pango/pango-attributes.c b/pango/pango-attributes.c
index 5c1f5796..22fa749b 100644
--- a/pango/pango-attributes.c
+++ b/pango/pango-attributes.c
@@ -1399,7 +1399,7 @@ pango_attr_list_splice (PangoAttrList *list,
* an element could (in theory) suprise the caller, so
* we don't delete it.
*/
- attr->start_index = CLAMP_ADD (attr->end_index, ulen);
+ attr->start_index = CLAMP_ADD (attr->start_index, ulen);
attr->end_index = CLAMP_ADD (attr->end_index, ulen);
}