pango r2567 - in trunk: . pango

[behdad svn gnome org]

Author: behdad
Date: Fri Feb 15 17:45:30 2008
New Revision: 2567
URL: http://svn.gnome.org/viewvc/pango?rev=2567&view=rev

Log:
2008-02-15  Behdad Esfahbod  <behdad gnome org>

        * pango/pango-layout.c: Improve docs.



Modified:
   trunk/ChangeLog
   trunk/pango/pango-layout.c

Modified: trunk/pango/pango-layout.c
==============================================================================
--- trunk/pango/pango-layout.c	(original)
+++ trunk/pango/pango-layout.c	Fri Feb 15 17:45:30 2008
@@ -589,7 +589,7 @@
 /**
  * pango_layout_set_attributes:
  * @layout: a #PangoLayout
- * @attrs: a #PangoAttrList
+ * @attrs: a #PangoAttrList, can be %NULL
  *
  * Sets the text attributes for a layout object.
  * References @attrs, so the caller can unref its reference.
@@ -995,6 +995,12 @@
  *          positive.
  *
  * Sets the text of the layout.
+ *
+ * Note that if you have used
+ * pango_layout_set_markup() or pango_layout_set_markup_with_accel() on
+ * @layout before, you may want to call pango_layout_set_attributes() to clear
+ * the attributes set on the layout from the markup as this function does not
+ * clear attributes.
  **/
 void
 pango_layout_set_text (PangoLayout *layout,