From 611fcd30d328b13bc5612dc8aebd12965f9a54d2 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Tue, 12 Aug 2008 15:47:13 +0000 Subject: [PATCH] bail out if there is no label to set the color on. 2008-08-12 Michael Natterer * 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 --- ChangeLog | 8 ++++++++ gtk/gtklinkbutton.c | 3 +++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 992aa7b9e4..8d87436342 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-08-12 Michael Natterer + + * 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 * gtk/gtkassistant.c: remove unused variable and fix formatting of diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c index 843a6888fd..9a6d134e99 100644 --- a/gtk/gtklinkbutton.c +++ b/gtk/gtklinkbutton.c @@ -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)); }