sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

Allow NULL for clutter_text_set_text()

Browse source 
As a convenience, if NULL is passed for the text argument of
clutter_text_set_text() (and for consistency,
clutter_text_set_markup()), treat that the same as "".
This commit is contained in:
Owen W. Taylor 2009-02-27 11:56:39 -05:00 committed by Emmanuele Bassi
parent 0d874312d3
commit d88bc30b87
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
clutter/clutter-text.c
View file

@ -2887,11 +2887,9 @@ clutter_text_set_markup_internal (ClutterText *self,
/** /**
* clutter_text_set_text: * clutter_text_set_text:
* @self: a #ClutterText * @self: a #ClutterText
* @text: the text to set * @text: the text to set. Passing %NULL is the same as passing "" (the empty string)
* *
* Sets the contents of a #ClutterText actor. The @text string * Sets the contents of a #ClutterText actor.
* must not be %NULL; to unset the current contents of the
* #ClutterText actor simply pass "" (an empty string).
* *
* Since: 1.0 * Since: 1.0
*/ */
@ -2900,10 +2898,9 @@ clutter_text_set_text (ClutterText *self,
const gchar *text) const gchar *text)
{ {
g_return_if_fail (CLUTTER_IS_TEXT (self)); g_return_if_fail (CLUTTER_IS_TEXT (self));
g_return_if_fail (text != NULL);
clutter_text_set_use_markup_internal (self, FALSE); clutter_text_set_use_markup_internal (self, FALSE);
clutter_text_set_text_internal (self, text); clutter_text_set_text_internal (self, text ? text : "");
clutter_text_dirty_cache (self); clutter_text_dirty_cache (self);
@ -2913,7 +2910,7 @@ clutter_text_set_text (ClutterText *self,
/** /**
* clutter_text_set_markup: * clutter_text_set_markup:
* @self: a #ClutterText * @self: a #ClutterText
* @markup: a string containing Pango markup * @markup: a string containing Pango markup. Passing %NULL is the same as passing "" (the empty string)
* *
* Sets @markup as the contents of a #ClutterText. * Sets @markup as the contents of a #ClutterText.
* *
@ -2932,10 +2929,9 @@ clutter_text_set_markup (ClutterText *self,
const gchar *markup) const gchar *markup)
{ {
g_return_if_fail (CLUTTER_IS_TEXT (self)); g_return_if_fail (CLUTTER_IS_TEXT (self));
g_return_if_fail (markup != NULL);
clutter_text_set_use_markup_internal (self, TRUE); clutter_text_set_use_markup_internal (self, TRUE);
clutter_text_set_markup_internal (self, markup); clutter_text_set_markup_internal (self, markup ? markup : "");
clutter_text_dirty_cache (self); clutter_text_dirty_cache (self);