AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'rgba-free-checked' into 'main'

Browse Source 
gtktextview: Avoid calling gdk_rgba_free for NULL values

See merge request GNOME/gtk!5474
This commit is contained in:
Matthias Clasen 2023-02-04 07:48:24 +00:00
commit e94dae8536
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtktextview.c
View File

@ -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 */