Merge branch 'gtk3-fontchooser-fix' into 'gtk-3-24'
Fix a critical in GtkFontChooserWidget See merge request GNOME/gtk!5027
This commit is contained in:
commit
cbfec14df4
@ -963,11 +963,12 @@ gtk_font_chooser_widget_load_fonts (GtkFontChooserWidget *fontchooser,
|
||||
if ((priv->level & GTK_FONT_CHOOSER_LEVEL_STYLE) == 0)
|
||||
{
|
||||
GtkDelayedFontDescription *desc;
|
||||
PangoFontFace *face;
|
||||
PangoFontFace *face = NULL;
|
||||
|
||||
#if PANGO_VERSION_CHECK(1,46,0)
|
||||
face = pango_font_family_get_face (families[i], NULL);
|
||||
#else
|
||||
#endif
|
||||
if (!face)
|
||||
{
|
||||
PangoFontFace **faces;
|
||||
int j, n_faces;
|
||||
@ -981,9 +982,10 @@ gtk_font_chooser_widget_load_fonts (GtkFontChooserWidget *fontchooser,
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
g_free (faces);
|
||||
}
|
||||
#endif
|
||||
|
||||
desc = gtk_delayed_font_description_new (face);
|
||||
|
||||
gtk_list_store_insert_with_values (list_store, &iter, -1,
|
||||
|
Loading…
Reference in New Issue
Block a user