summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2002-01-11 21:18:55 +0000
committerHavoc Pennington <hp@src.gnome.org>2002-01-11 21:18:55 +0000
commit00eb979f80984b122ab734c081b4116a246be071 (patch)
tree80e85a05fa5e5c56e6e682cfeb6f2c954b994c7b
parenteee75e94a4d0cc97354a6d5fcc7898b0ac0fa2ce (diff)
downloadpango-00eb979f80984b122ab734c081b4116a246be071.tar.gz
allow setting attrs to NULL
2002-01-11 Havoc Pennington <hp@redhat.com> * pango/pango-layout.c (pango_layout_set_attributes): allow setting attrs to NULL
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-1-05
-rw-r--r--ChangeLog.pre-1-105
-rw-r--r--ChangeLog.pre-1-25
-rw-r--r--ChangeLog.pre-1-45
-rw-r--r--ChangeLog.pre-1-65
-rw-r--r--ChangeLog.pre-1-85
-rw-r--r--pango/pango-layout.c3
8 files changed, 37 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3fc7a2bc..345d9dda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2002-01-11 Havoc Pennington <hp@redhat.com>
+ * pango/pango-layout.c (pango_layout_set_attributes): allow
+ setting attrs to NULL
+
+2002-01-11 Havoc Pennington <hp@redhat.com>
+
* pango/pango-layout.c (pango_layout_iter_get_index): docs tweak
(pango_layout_iter_next_cluster): update iter->index here
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 3fc7a2bc..345d9dda 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,5 +1,10 @@
2002-01-11 Havoc Pennington <hp@redhat.com>
+ * pango/pango-layout.c (pango_layout_set_attributes): allow
+ setting attrs to NULL
+
+2002-01-11 Havoc Pennington <hp@redhat.com>
+
* pango/pango-layout.c (pango_layout_iter_get_index): docs tweak
(pango_layout_iter_next_cluster): update iter->index here
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 3fc7a2bc..345d9dda 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,5 +1,10 @@
2002-01-11 Havoc Pennington <hp@redhat.com>
+ * pango/pango-layout.c (pango_layout_set_attributes): allow
+ setting attrs to NULL
+
+2002-01-11 Havoc Pennington <hp@redhat.com>
+
* pango/pango-layout.c (pango_layout_iter_get_index): docs tweak
(pango_layout_iter_next_cluster): update iter->index here
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 3fc7a2bc..345d9dda 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,5 +1,10 @@
2002-01-11 Havoc Pennington <hp@redhat.com>
+ * pango/pango-layout.c (pango_layout_set_attributes): allow
+ setting attrs to NULL
+
+2002-01-11 Havoc Pennington <hp@redhat.com>
+
* pango/pango-layout.c (pango_layout_iter_get_index): docs tweak
(pango_layout_iter_next_cluster): update iter->index here
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 3fc7a2bc..345d9dda 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,5 +1,10 @@
2002-01-11 Havoc Pennington <hp@redhat.com>
+ * pango/pango-layout.c (pango_layout_set_attributes): allow
+ setting attrs to NULL
+
+2002-01-11 Havoc Pennington <hp@redhat.com>
+
* pango/pango-layout.c (pango_layout_iter_get_index): docs tweak
(pango_layout_iter_next_cluster): update iter->index here
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 3fc7a2bc..345d9dda 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,5 +1,10 @@
2002-01-11 Havoc Pennington <hp@redhat.com>
+ * pango/pango-layout.c (pango_layout_set_attributes): allow
+ setting attrs to NULL
+
+2002-01-11 Havoc Pennington <hp@redhat.com>
+
* pango/pango-layout.c (pango_layout_iter_get_index): docs tweak
(pango_layout_iter_next_cluster): update iter->index here
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 3fc7a2bc..345d9dda 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,5 +1,10 @@
2002-01-11 Havoc Pennington <hp@redhat.com>
+ * pango/pango-layout.c (pango_layout_set_attributes): allow
+ setting attrs to NULL
+
+2002-01-11 Havoc Pennington <hp@redhat.com>
+
* pango/pango-layout.c (pango_layout_iter_get_index): docs tweak
(pango_layout_iter_next_cluster): update iter->index here
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 068bd7fb..f26c8080 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -501,7 +501,8 @@ pango_layout_set_attributes (PangoLayout *layout,
old_attrs = layout->attrs;
layout->attrs = attrs;
- pango_attr_list_ref (layout->attrs);
+ if (layout->attrs)
+ pango_attr_list_ref (layout->attrs);
pango_layout_clear_lines (layout);
if (old_attrs)