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

[text] Avoid a Pango warning with empty markup

Browse Source 
When the markup string is empty Pango complains about invalid
characters.
This commit is contained in:
Emmanuele Bassi 2009-04-02 10:28:37 +01:00
parent bced9c65e7
commit ffefbe4661
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clutter/clutter-text.c
View File

@ -3213,7 +3213,8 @@ clutter_text_set_markup_internal (ClutterText *self,
/**
* clutter_text_set_text:
* @self: a #ClutterText
* @text: the text to set. Passing %NULL is the same as passing "" (the empty string)
* @text: the text to set. Passing %NULL is the same as passing "" (the
* empty string)
*
* Sets the contents of a #ClutterText actor.
*
@ -3236,7 +3237,8 @@ clutter_text_set_text (ClutterText *self,
/**
* clutter_text_set_markup:
* @self: a #ClutterText
* @markup: a string containing Pango markup. Passing %NULL is the same as passing "" (the empty string)
* @markup: a string containing Pango markup. Passing %NULL is the same
* as passing "" (the empty string)
*
* Sets @markup as the contents of a #ClutterText.
*
@ -3257,7 +3259,11 @@ clutter_text_set_markup (ClutterText *self,
g_return_if_fail (CLUTTER_IS_TEXT (self));
clutter_text_set_use_markup_internal (self, TRUE);
clutter_text_set_markup_internal (self, markup ? markup : "");
if (markup != NULL && *markup != '\0')
clutter_text_set_markup_internal (self, markup);
else
clutter_text_set_text_internal (self, "");
clutter_text_dirty_cache (self);