diff options
| author | Benjamin Otte <otte@redhat.com> | 2013-01-15 15:33:53 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2013-01-15 15:33:53 +0100 |
| commit | a763738f1571059204b1a1fb3d319c4d72f9025f (patch) | |
| tree | 556d7075aa7f1ccd727f175dcafa89a44abe8892 /gtk/gtkcsscolorvalue.c | |
| parent | 301e22121a3061d00df440a86b1f7041171f3667 (diff) | |
| download | gtk+-a763738f1571059204b1a1fb3d319c4d72f9025f.tar.gz | |
cssvalue: Remove NULL check
The value cannot ever be NULL here.
Diffstat (limited to 'gtk/gtkcsscolorvalue.c')
| -rw-r--r-- | gtk/gtkcsscolorvalue.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/gtk/gtkcsscolorvalue.c b/gtk/gtkcsscolorvalue.c index cc7d0d2a06..9ff0a05210 100644 --- a/gtk/gtkcsscolorvalue.c +++ b/gtk/gtkcsscolorvalue.c @@ -268,20 +268,17 @@ _gtk_css_color_value_resolve (GtkCssValue *color, g_assert_not_reached (); } - if (value != NULL) + if (color->last_value != NULL && + _gtk_css_value_equal (color->last_value, value)) { - if (color->last_value != NULL && - _gtk_css_value_equal (color->last_value, value)) - { - _gtk_css_value_unref (value); - value = _gtk_css_value_ref (color->last_value); - } - else - { - if (color->last_value != NULL) - _gtk_css_value_unref (color->last_value); - color->last_value = _gtk_css_value_ref (value); - } + _gtk_css_value_unref (value); + value = _gtk_css_value_ref (color->last_value); + } + else + { + if (color->last_value != NULL) + _gtk_css_value_unref (color->last_value); + color->last_value = _gtk_css_value_ref (value); } return value; |