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.

diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c
index 597558b..f49fa66 100644 (file)
--- 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;
 }