[gtk+] GtkFontButton: Avoid criticals
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] GtkFontButton: Avoid criticals
- Date: Fri, 15 Aug 2014 19:16:24 +0000 (UTC)
commit 59fc2f0ac107c9affe63c9e5c26b9dee049ad424
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Aug 15 15:15:45 2014 -0400
GtkFontButton: Avoid criticals
The font_family and font_face members may be NULL, and we
shouldn't cause critical warnings in that case.
gtk/gtkfontbutton.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index cb0822f..867d82f 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -1146,8 +1146,14 @@ gtk_font_button_update_font_info (GtkFontButton *font_button)
const gchar *face_name;
gchar *family_style;
- fam_name = pango_font_family_get_name (priv->font_family);
- face_name = pango_font_face_get_face_name (priv->font_face);
+ if (priv->font_family)
+ 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)
family_style = g_strconcat (fam_name, " ", face_name, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]