brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

text: Clean up the set_font_description_internal() semantics

Browse Source 
The current semantics are ridiculous, and clearly a case of (mistaken)
premature optimization. All setters should copy, not transfer ownership.

https://bugzilla.gnome.org/show_bug.cgi?id=695119
This commit is contained in:
Emmanuele Bassi 2013-03-04 13:02:44 +00:00
parent 1f3e56b3be
commit 315a73edf5
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
clutter/clutter-text.c
View File

@ -555,8 +555,7 @@ clutter_text_dirty_cache (ClutterText *text)
* @desc: a #PangoFontDescription * @desc: a #PangoFontDescription
* *
* Sets @desc as the font description to be used by the #ClutterText * Sets @desc as the font description to be used by the #ClutterText
* actor. The font description ownership is transferred to @self so * actor. The #PangoFontDescription is copied.
* the #PangoFontDescription must not be freed after this function
* *
* This function will also set the :font-name field as a side-effect * This function will also set the :font-name field as a side-effect
* *
@ -576,7 +575,7 @@ clutter_text_set_font_description_internal (ClutterText *self,
if (priv->font_desc != NULL) if (priv->font_desc != NULL)
pango_font_description_free (priv->font_desc); pango_font_description_free (priv->font_desc);
priv->font_desc = desc; priv->font_desc = pango_font_description_copy (desc);
/* update the font name string we use */ /* update the font name string we use */
g_free (priv->font_name); g_free (priv->font_name);
@ -618,6 +617,7 @@ clutter_text_settings_changed_cb (ClutterText *text)
font_desc = pango_font_description_from_string (font_name); font_desc = pango_font_description_from_string (font_name);
clutter_text_set_font_description_internal (text, font_desc); clutter_text_set_font_description_internal (text, font_desc);
pango_font_description_free (font_desc);
g_free (font_name); g_free (font_name);
} }
@ -4917,12 +4917,9 @@ void
clutter_text_set_font_description (ClutterText *self, clutter_text_set_font_description (ClutterText *self,
PangoFontDescription *font_desc) PangoFontDescription *font_desc)
{ {
PangoFontDescription *copy;
g_return_if_fail (CLUTTER_IS_TEXT (self)); g_return_if_fail (CLUTTER_IS_TEXT (self));
copy = pango_font_description_copy (font_desc); clutter_text_set_font_description_internal (self, font_desc);
clutter_text_set_font_description_internal (self, copy);
} }
/** /**
@ -5020,7 +5017,7 @@ clutter_text_set_font_name (ClutterText *self,
goto out; goto out;
desc = pango_font_description_from_string (font_name); desc = pango_font_description_from_string (font_name);
if (!desc) if (desc == NULL)
{ {
g_warning ("Attempting to create a PangoFontDescription for " g_warning ("Attempting to create a PangoFontDescription for "
"font name '%s', but failed.", "font name '%s', but failed.",
@ -5034,6 +5031,8 @@ clutter_text_set_font_name (ClutterText *self,
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_FONT_NAME]); g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_FONT_NAME]);
pango_font_description_free (desc);
out: out:
if (is_default_font) if (is_default_font)
g_free ((gchar *) font_name); g_free ((gchar *) font_name);