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

Fix the build with older pango

Browse Source 
pango_font_family_get_face() was only introduced
in pango 1.46. Work around this for older releases.
This commit is contained in:
Matthias Clasen 2020-10-29 22:22:33 -04:00
parent 9536d3aeaa
commit 0f0dad24f4
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gtk/gtkfontchooserwidget.c
View File

@ -942,8 +942,6 @@ gtk_font_chooser_widget_load_fonts (GtkFontChooserWidget *fontchooser,
for (i = 0; i < n_families; i++)
{
GtkTreeIter iter;
PangoFontFace **faces;
int j, n_faces;
const gchar *fam_name = pango_font_family_get_name (families[i]);
if ((priv->level & GTK_FONT_CHOOSER_LEVEL_STYLE) == 0)
@ -951,7 +949,25 @@ gtk_font_chooser_widget_load_fonts (GtkFontChooserWidget *fontchooser,
GtkDelayedFontDescription *desc;
PangoFontFace *face;
#if PANGO_VERSION_CHECK(1,46,0)
face = pango_font_family_get_face (families[i], NULL);
#else
{
PangoFontFace **faces;
int j, n_faces;
pango_font_family_list_faces (families[i], &faces, &n_faces);
face = faces[0];
for (j = 0; j < n_faces; j++)
{
if (strcmp (pango_font_face_get_face_name (faces[j]), "Regular") == 0)
{
face = faces[j];
break;
}
}
g_free (faces);
}
#endif
desc = gtk_delayed_font_description_new (face);
gtk_list_store_insert_with_values (list_store, &iter, -1,
@ -965,6 +981,9 @@ gtk_font_chooser_widget_load_fonts (GtkFontChooserWidget *fontchooser,
}
else
{
PangoFontFace **faces;
int j, n_faces;
pango_font_family_list_faces (families[i], &faces, &n_faces);
for (j = 0; j < n_faces; j++)