gtk+ r19920 - in trunk: . gtk

[bjornl svn gnome org]

Author: bjornl
Date: Sat Mar 22 01:27:07 2008
New Revision: 19920
URL: http://svn.gnome.org/viewvc/gtk+?rev=19920&view=rev

Log:
2008-03-22  BjÃrn Lindqvist  <bjourne gmail com>

	* gtk/gtkexpander.c (gtk_expander_get_label):
	gtk_label_get_label() should be used instead of
	gtk_label_get_text(). (#353088, Xan Lopez)



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkexpander.c

Modified: trunk/gtk/gtkexpander.c
==============================================================================
--- trunk/gtk/gtkexpander.c	(original)
+++ trunk/gtk/gtkexpander.c	Sat Mar 22 01:27:07 2008
@@ -1532,11 +1532,11 @@
  * gtk_expander_get_label:
  * @expander: a #GtkExpander
  *
- * Fetches the text from the label of the expander, as set by
- * gtk_expander_set_label(). If the label text has not
- * been set the return value will be %NULL. This will be the
- * case if you create an empty button with gtk_button_new() to
- * use as a container.
+ * Fetches the text from a label widget including any embedded
+ * underlines indicating mnemonics and Pango markup, as set by
+ * gtk_expander_set_label(). If the label text has not been set the
+ * return value will be %NULL. This will be the case if you create an
+ * empty button with gtk_button_new() to use as a container.
  *
  * Return value: The text of the label widget. This string is owned
  * by the widget and must not be modified or freed.
@@ -1553,7 +1553,7 @@
   priv = expander->priv;
 
   if (GTK_IS_LABEL (priv->label_widget))
-    return gtk_label_get_text (GTK_LABEL (priv->label_widget));
+    return gtk_label_get_label (GTK_LABEL (priv->label_widget));
   else
     return NULL;
 }