const char *str = g_value_get_string (value);
clutter_text_set_contents (self, str);
+
if (self->priv->use_markup)
- clutter_text_set_markup_internal (self, str);
+ clutter_text_set_markup_internal (self, str ? str : "");
else
- clutter_text_set_text_internal (self, str);
+ clutter_text_set_text_internal (self, str ? str : "");
}
break;
* Pango markup, and it is logically equivalent to:
*
* |[
+ * /* the order is important */
* clutter_text_set_text (CLUTTER_TEXT (actor), markup);
* clutter_text_set_use_markup (CLUTTER_TEXT (actor), TRUE);
* ]|
clutter_text_set_use_markup_internal (self, TRUE);
clutter_text_set_contents (self, markup);
-
- if (markup != NULL && *markup != '\0')
- clutter_text_set_markup_internal (self, markup);
- else
- clutter_text_set_text_internal (self, "");
+ clutter_text_set_markup_internal (self, markup ? markup : "");
}
/**