From 04ea1a98df2fce9b9948ef919957bc56a6fa913f Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 26 Apr 2007 19:11:24 +0000 Subject: [PATCH] 2007-04-26 Emmanuele Bassi Merge from clutter-0-2 * clutter/clutter-label.c: Unbreak the "use-markup" property by actually passing the markup to pango_layout_set_markup(). --- ChangeLog | 7 +++++++ clutter/clutter-label.c | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 21c49ba11..972e24cf1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-04-26 Emmanuele Bassi + + Merge from clutter-0-2 + + * clutter/clutter-label.c: Unbreak the "use-markup" property + by actually passing the markup to pango_layout_set_markup(). + 2007-04-25 Emmanuele Bassi Merge from clutter.git/master diff --git a/clutter/clutter-label.c b/clutter/clutter-label.c index 44f07b2fb..07bbc155d 100644 --- a/clutter/clutter-label.c +++ b/clutter/clutter-label.c @@ -209,7 +209,11 @@ clutter_label_ensure_layout (ClutterLabel *label, gint width) priv->single_line_mode); pango_layout_set_font_description (priv->layout, priv->desc); - pango_layout_set_text (priv->layout, priv->text, -1); + + if (!priv->use_markup) + pango_layout_set_text (priv->layout, priv->text, -1); + else + pango_layout_set_markup (priv->layout, priv->text, -1); if (priv->wrap) pango_layout_set_wrap (priv->layout, priv->wrap_mode);