gtk+ r22289 - in trunk: . gtk

[mbarnes svn gnome org]

Author: mbarnes
Date: Fri Feb  6 15:49:26 2009
New Revision: 22289
URL: http://svn.gnome.org/viewvc/gtk+?rev=22289&view=rev

Log:
2009-02-06  Matthew Barnes  <mbarnes redhat com>

	* gtk/gtklabel.c (gtk_label_set_label): Accept a NULL string.



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

Modified: trunk/gtk/gtklabel.c
==============================================================================
--- trunk/gtk/gtklabel.c	(original)
+++ trunk/gtk/gtklabel.c	Fri Feb  6 15:49:26 2009
@@ -1760,11 +1760,10 @@
 		     const gchar *str)
 {
   g_return_if_fail (GTK_IS_LABEL (label));
-  g_return_if_fail (str != NULL);
 
   g_object_freeze_notify (G_OBJECT (label));
 
-  gtk_label_set_label_internal (label, g_strdup (str));
+  gtk_label_set_label_internal (label, g_strdup (str ? str : ""));
   gtk_label_recalculate (label);
 
   g_object_thaw_notify (G_OBJECT (label));