gtk+ r21100 - in trunk: . gtk

[mitch svn gnome org]

Author: mitch
Date: Tue Aug 12 15:47:13 2008
New Revision: 21100
URL: http://svn.gnome.org/viewvc/gtk+?rev=21100&view=rev

Log:
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.



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

Modified: trunk/gtk/gtklinkbutton.c
==============================================================================
--- trunk/gtk/gtklinkbutton.c	(original)
+++ trunk/gtk/gtklinkbutton.c	Tue Aug 12 15:47:13 2008
@@ -250,6 +250,8 @@
   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_CONTAINER_CLASS (gtk_link_button_parent_class)->add (container, widget);
 
+  set_link_color (GTK_LINK_BUTTON (container));
   set_link_underline (GTK_LINK_BUTTON (container));
 }