callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtk_label_get_label() should be used instead of gtk_label_get_text().

Browse Source 
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)


svn path=/trunk/; revision=19920
This commit is contained in:
Björn Lindqvist
2008-03-22 01:27:07 +00:00
committed by Björn Lindqvist
parent 029511a756
commit 9aaece8479
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
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)
2008-03-21 Tor Lillqvist <tml@novell.com> 2008-03-21 Tor Lillqvist <tml@novell.com>
Import the GDI+ gdk-pixbuf loaders for Windows by Dominic Import the GDI+ gdk-pixbuf loaders for Windows by Dominic

12
gtk/gtkexpander.c
View File

@ -1532,11 +1532,11 @@ gtk_expander_set_label (GtkExpander *expander,
* gtk_expander_get_label: * gtk_expander_get_label:
* @expander: a #GtkExpander * @expander: a #GtkExpander
* *
* Fetches the text from the label of the expander, as set by * Fetches the text from a label widget including any embedded
* gtk_expander_set_label(). If the label text has not * underlines indicating mnemonics and Pango markup, as set by
* been set the return value will be %NULL. This will be the * gtk_expander_set_label(). If the label text has not been set the
* case if you create an empty button with gtk_button_new() to * return value will be %NULL. This will be the case if you create an
* use as a container. * empty button with gtk_button_new() to use as a container.
* *
* Return value: The text of the label widget. This string is owned * Return value: The text of the label widget. This string is owned
* by the widget and must not be modified or freed. * by the widget and must not be modified or freed.
@ -1553,7 +1553,7 @@ gtk_expander_get_label (GtkExpander *expander)
priv = expander->priv; priv = expander->priv;
if (GTK_IS_LABEL (priv->label_widget)) 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 else
return NULL; return NULL;
} }