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.
This commit is contained in:
parent
e3785f4f45
commit
b4a3944b2b
@ -544,7 +544,16 @@ clutter_backend_set_font_name (ClutterBackend *backend,
|
|||||||
G_CONST_RETURN gchar *
|
G_CONST_RETURN gchar *
|
||||||
clutter_backend_get_font_name (ClutterBackend *backend)
|
clutter_backend_get_font_name (ClutterBackend *backend)
|
||||||
{
|
{
|
||||||
|
ClutterBackendPrivate *priv;
|
||||||
|
|
||||||
g_return_val_if_fail (CLUTTER_IS_BACKEND (backend), NULL);
|
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;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user