bail out if there is no label to set the color on.

2008-08-12  Michael Natterer  <mitch@imendio.com>

	* gtk/gtklinkbutton.c (set_link_color): bail out if there is no
	label to set the color on.

	(gtk_link_button_add): call set_link_color() so the label gets
	the right color no matter how the link button is created.


svn path=/trunk/; revision=21100
This commit is contained in:
Michael Natterer 2008-08-12 15:47:13 +00:00 committed by Michael Natterer
parent 25d3a9c309
commit 611fcd30d3
2 changed files with 11 additions and 0 deletions

View File

@ -1,3 +1,11 @@
2008-08-12 Michael Natterer <mitch@imendio.com>
* gtk/gtklinkbutton.c (set_link_color): bail out if there is no
label to set the color on.
(gtk_link_button_add): call set_link_color() so the label gets
the right color no matter how the link button is created.
2008-08-12 Michael Natterer <mitch@imendio.com>
* gtk/gtkassistant.c: remove unused variable and fix formatting of

View File

@ -250,6 +250,8 @@ set_link_color (GtkLinkButton *link_button)
GtkWidget *label;
label = gtk_bin_get_child (GTK_BIN (link_button));
if (!GTK_IS_LABEL (label))
return;
if (link_button->priv->visited)
{
@ -303,6 +305,7 @@ gtk_link_button_add (GtkContainer *container,
{
GTK_CONTAINER_CLASS (gtk_link_button_parent_class)->add (container, widget);
set_link_color (GTK_LINK_BUTTON (container));
set_link_underline (GTK_LINK_BUTTON (container));
}