summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--gtk/gtklinkbutton.c3
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 992aa7b9e4..8d87436342 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
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
some function headers.
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));
}