Add an example to the docs.

Fri Sep 17 11:20:03 2004  Jonathan Blandford  <jrb@gnome.org>

        * gtk/gtklabel.c (gtk_label_set_markup): Add an example to the
        docs.

diff --git a/ChangeLog b/ChangeLog
index fbb87839fcf021910e789abcc08c576471e43a3b..5df425c9f5b556d562891b441286b865d57f570c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 17 11:20:03 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtklabel.c (gtk_label_set_markup): Add an example to the
+       docs.
+
 Thu Sep 16 23:20:05 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkselection.c (selection_get_text_plain): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fbb87839fcf021910e789abcc08c576471e43a3b..5df425c9f5b556d562891b441286b865d57f570c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Sep 17 11:20:03 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtklabel.c (gtk_label_set_markup): Add an example to the
+       docs.
+
 Thu Sep 16 23:20:05 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkselection.c (selection_get_text_plain): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fbb87839fcf021910e789abcc08c576471e43a3b..5df425c9f5b556d562891b441286b865d57f570c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Sep 17 11:20:03 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtklabel.c (gtk_label_set_markup): Add an example to the
+       docs.
+
 Thu Sep 16 23:20:05 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkselection.c (selection_get_text_plain): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fbb87839fcf021910e789abcc08c576471e43a3b..5df425c9f5b556d562891b441286b865d57f570c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Sep 17 11:20:03 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtklabel.c (gtk_label_set_markup): Add an example to the
+       docs.
+
 Thu Sep 16 23:20:05 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkselection.c (selection_get_text_plain): 

diff --git a/docs/reference/gtk/tmpl/gtklabel.sgml b/docs/reference/gtk/tmpl/gtklabel.sgml
index 2d3149e2c7b7fd9036668b9ecd976d67bd695705..1853bbaa759d25b0cb1c4f540020d31eaa0dbdf2 100644 (file)
--- a/docs/reference/gtk/tmpl/gtklabel.sgml
+++ b/docs/reference/gtk/tmpl/gtklabel.sgml
@@ -83,11 +83,11 @@ linkend="PangoMarkupFormat">complete documentation</link> of available
 tags in the Pango manual.)
 </para>
 <para>
-The markup passed to gtk_label_set_markup() must be valid; for
-example, literal &lt;/&gt;/&amp; characters must be escaped as 
-&amp;lt;, &amp;gt;, and &amp;amp;. If you pass text obtained from 
-the user, file, or a network to gtk_label_set_markup(), 
-you'll want to escape it with g_markup_escape_text().
+The markup passed to gtk_label_set_markup() must be valid; for example,
+literal &lt;/&gt;/&amp; characters must be escaped as &amp;lt;,
+&amp;gt;, and &amp;amp;. If you pass text obtained from the user, file,
+or a network to gtk_label_set_markup(), you'll want to escape it with
+g_markup_escape_text() or g_markup_printf_escaped().
 </para>
 <para>
 Markup strings are just a convenient way to set the #PangoAttrList on

diff --git a/docs/reference/gtk/tmpl/gtkrange.sgml b/docs/reference/gtk/tmpl/gtkrange.sgml
index ea7f8c4440a2c822279c9d0b11b89b6fc1a548cd..8020434a356d59b2ecc9b37ebb002bb9fe6c527b 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkrange.sgml
+++ b/docs/reference/gtk/tmpl/gtkrange.sgml
@@ -28,6 +28,16 @@ Base class for widgets which visualize an adjustment
 @range: the object which received the signal.
 @arg1: 
 
+<!-- ##### SIGNAL GtkRange::change-value ##### -->
+<para>
+
+</para>
+
+@range: the object which received the signal.
+@arg1: 
+@arg2: 
+@Returns: 
+
 <!-- ##### SIGNAL GtkRange::move-slider ##### -->
 <para>
 Virtual function that moves the slider. Used for keybindings.

diff --git a/docs/reference/gtk/tmpl/gtksettings.sgml b/docs/reference/gtk/tmpl/gtksettings.sgml
index ee6f0c5dcd05918dcad3329f9bbd920f8bb3f1f2..d13f54866a1ca48f86cf0804d06148f3e80075a2 100644 (file)
--- a/docs/reference/gtk/tmpl/gtksettings.sgml
+++ b/docs/reference/gtk/tmpl/gtksettings.sgml
@@ -110,6 +110,11 @@ Sharing settings between applications
 
 </para>
 
+<!-- ##### ARG GtkSettings:gtk-modules ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkSettings:gtk-split-cursor ##### -->
 <para>
 

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 900668a0a0c5cad4d484517cf0ffb325cb37ac5c..0f7befa383b1596222f31676d4162db8e22d7d2e 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1122,8 +1122,18 @@ set_markup (GtkLabel    *label,
  * @label: a #GtkLabel
  * @str: a markup string (see <link linkend="PangoMarkupFormat">Pango markup format</link>)
  * 
- * Parses @str which is marked up with the <link linkend="PangoMarkupFormat">Pango text markup language</link>,
- * setting the label's text and attribute list based on the parse results.
+ * Parses @str which is marked up with the <link
+ * linkend="PangoMarkupFormat">Pango text markup language</link>, setting the
+ * label's text and attribute list based on the parse results.  If the @str is
+ * external data, you may need to escape it with g_markup_escape_text() or
+ * g_markup_printf_escaped()<!-- -->:
+ * <informalexample><programlisting>
+ * char *markup;
+ * <!-- -->
+ * markup = g_markup_printf_escaped ("&lt;span style=\"italic\"&gt;%s&lt;/span&gt;", str);
+ * gtk_label_set_markup (GTK_LABEL (label), markup);
+ * g_free (markup);
+ * </programlisting></informalexample>
  **/
 void
 gtk_label_set_markup (GtkLabel    *label,