From b4a3944b2b6bde5b57f86519135b959f4607cad3 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 23 Dec 2008 16:27:54 +0000 Subject: [PATCH] Return the default font name if no font name is set When calling clutter_backend_get_font_name(), if no default font name has previously been set, we just set the default and return a pointer to it - like we do for the font options. --- clutter/clutter-backend.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c index 597558b..f49fa66 100644 --- a/clutter/clutter-backend.c +++ b/clutter/clutter-backend.c @@ -544,7 +544,16 @@ clutter_backend_set_font_name (ClutterBackend *backend, G_CONST_RETURN gchar * clutter_backend_get_font_name (ClutterBackend *backend) { + ClutterBackendPrivate *priv; + g_return_val_if_fail (CLUTTER_IS_BACKEND (backend), NULL); - return backend->priv->font_name; + priv = backend->priv; + + if (G_LIKELY (priv->font_name)) + return priv->font_name; + + priv->font_name = g_strdup (DEFAULT_FONT_NAME); + + return priv->font_name; } -- 2.7.4