From 504604370a987e51442686a4de001ba28e5238fe Mon Sep 17 00:00:00 2001 From: Padraig O'Briain Date: Wed, 15 Aug 2001 15:01:23 +0000 Subject: [PATCH] Avoid warning when specifying NULL for "attributes" property * gtk/gtkcellrenderertext.c: Avoid warning when specifying NULL for "attributes" property --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkcellrenderertext.c | 3 ++- 8 files changed, 37 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 80d1c6df7d..f503828474 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-08-15 Padraig O'Briain + + * gtk/gtkcellrenderertext.c: + Avoid warning when specifying NULL for "attributes" property + 2001-08-15 Matthias Clasen * docs/debugging.txt: Add a warning about --enable-debug=no, diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 80d1c6df7d..f503828474 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2001-08-15 Padraig O'Briain + + * gtk/gtkcellrenderertext.c: + Avoid warning when specifying NULL for "attributes" property + 2001-08-15 Matthias Clasen * docs/debugging.txt: Add a warning about --enable-debug=no, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 80d1c6df7d..f503828474 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2001-08-15 Padraig O'Briain + + * gtk/gtkcellrenderertext.c: + Avoid warning when specifying NULL for "attributes" property + 2001-08-15 Matthias Clasen * docs/debugging.txt: Add a warning about --enable-debug=no, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 80d1c6df7d..f503828474 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2001-08-15 Padraig O'Briain + + * gtk/gtkcellrenderertext.c: + Avoid warning when specifying NULL for "attributes" property + 2001-08-15 Matthias Clasen * docs/debugging.txt: Add a warning about --enable-debug=no, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 80d1c6df7d..f503828474 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2001-08-15 Padraig O'Briain + + * gtk/gtkcellrenderertext.c: + Avoid warning when specifying NULL for "attributes" property + 2001-08-15 Matthias Clasen * docs/debugging.txt: Add a warning about --enable-debug=no, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 80d1c6df7d..f503828474 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2001-08-15 Padraig O'Briain + + * gtk/gtkcellrenderertext.c: + Avoid warning when specifying NULL for "attributes" property + 2001-08-15 Matthias Clasen * docs/debugging.txt: Add a warning about --enable-debug=no, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 80d1c6df7d..f503828474 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2001-08-15 Padraig O'Briain + + * gtk/gtkcellrenderertext.c: + Avoid warning when specifying NULL for "attributes" property + 2001-08-15 Matthias Clasen * docs/debugging.txt: Add a warning about --enable-debug=no, diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 2e20f3e16b..6cd6347e44 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -714,7 +714,8 @@ gtk_cell_renderer_text_set_property (GObject *object, pango_attr_list_unref (celltext->extra_attrs); celltext->extra_attrs = g_value_get_boxed (value); - pango_attr_list_ref (celltext->extra_attrs); + if (celltext->extra_attrs) + pango_attr_list_ref (celltext->extra_attrs); break; case PROP_MARKUP: {