diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2023-02-04 07:48:24 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2023-02-04 07:48:24 +0000 |
| commit | e94dae8536e847b4478806981fb805b1e3db1867 (patch) | |
| tree | dfaa1894b7f96b477a542e7b6fefe3a1f416f796 | |
| parent | 0dd163254d6cfe8edbe199f3aa9920ec0c68bc2d (diff) | |
| parent | 9eac7ed8b9851a8bebc94f16ff65bee0d3c35ab9 (diff) | |
| download | gtk+-e94dae8536e847b4478806981fb805b1e3db1867.tar.gz | |
Merge branch 'rgba-free-checked' into 'main'
gtktextview: Avoid calling gdk_rgba_free for NULL values
See merge request GNOME/gtk!5474
| -rw-r--r-- | gtk/gtktextview.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 62043ad54b..fe7a63b69e 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -7787,8 +7787,7 @@ gtk_text_view_set_attributes_from_style (GtkTextView *text_view, else { values->appearance.underline = PANGO_UNDERLINE_NONE; - gdk_rgba_free (values->appearance.underline_rgba); - values->appearance.underline_rgba = NULL; + g_clear_pointer (&values->appearance.underline_rgba, gdk_rgba_free); } if (decoration_line & GTK_CSS_TEXT_DECORATION_LINE_OVERLINE) @@ -7802,8 +7801,7 @@ gtk_text_view_set_attributes_from_style (GtkTextView *text_view, else { values->appearance.overline = PANGO_OVERLINE_NONE; - gdk_rgba_free (values->appearance.overline_rgba); - values->appearance.overline_rgba = NULL; + g_clear_pointer (&values->appearance.overline_rgba, gdk_rgba_free); } if (decoration_line & GTK_CSS_TEXT_DECORATION_LINE_LINE_THROUGH) @@ -7817,8 +7815,7 @@ gtk_text_view_set_attributes_from_style (GtkTextView *text_view, else { values->appearance.strikethrough = FALSE; - gdk_rgba_free (values->appearance.strikethrough_rgba); - values->appearance.strikethrough_rgba = NULL; + g_clear_pointer (&values->appearance.strikethrough_rgba, gdk_rgba_free); } /* letter-spacing */ |