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

GtkFontButton: Avoid criticals

Browse Source 
The font_family and font_face members may be NULL, and we
shouldn't cause critical warnings in that case.
This commit is contained in:
Matthias Clasen 2014-08-15 15:15:45 -04:00
parent 1815790bd3
commit 59fc2f0ac1
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkfontbutton.c
View File

@ -1146,8 +1146,14 @@ gtk_font_button_update_font_info (GtkFontButton *font_button)
const gchar *face_name; const gchar *face_name;
gchar *family_style; gchar *family_style;
fam_name = pango_font_family_get_name (priv->font_family); if (priv->font_family)
face_name = pango_font_face_get_face_name (priv->font_face); fam_name = pango_font_family_get_name (priv->font_family);
else
fam_name = _("None");
if (priv->font_face)
face_name = pango_font_face_get_face_name (priv->font_face);
else
face_name = "";
if (priv->show_style) if (priv->show_style)
family_style = g_strconcat (fam_name, " ", face_name, NULL); family_style = g_strconcat (fam_name, " ", face_name, NULL);