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

2007-04-26 Emmanuele Bassi <ebassi@openedhand.com>

Browse source 
Merge from clutter-0-2

	* clutter/clutter-label.c: Unbreak the "use-markup" property
	by actually passing the markup to pango_layout_set_markup().
This commit is contained in:
Emmanuele Bassi 2007-04-26 19:11:24 +00:00
parent a7a511ce79
commit 04ea1a98df
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2007-04-26 Emmanuele Bassi <ebassi@openedhand.com>
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 <ebassi@openedhand.com>
Merge from clutter.git/master

6
clutter/clutter-label.c
View file

@ -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);