summaryrefslogtreecommitdiff
path: root/gtk/gtklabel.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>1998-12-16 21:06:49 +0000
committerOwen Taylor <otaylor@src.gnome.org>1998-12-16 21:06:49 +0000
commitb4ba8e3b5d7d0b9d1defd9b10c724ae059cb25cc (patch)
tree7b90162c404811491e5580e27801fb861b3d1c2d /gtk/gtklabel.c
parentc1726375b1fa057637ea1b9866031df9898a6b37 (diff)
downloadgtk+-b4ba8e3b5d7d0b9d1defd9b10c724ae059cb25cc.tar.gz
Do nothing on empty string, quietly.
Wed Dec 16 16:04:41 1998 Owen Taylor <otaylor@redhat.com> * gtk/gtklabel.c (gtk_label_expose): Do nothing on empty string, quietly.
Diffstat (limited to 'gtk/gtklabel.c')
-rw-r--r--gtk/gtklabel.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 50166fa0de..8e46a4056d 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -878,14 +878,13 @@ gtk_label_expose (GtkWidget *widget,
g_return_val_if_fail (GTK_IS_LABEL (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
-
- if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget))
+ if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget) &&
+ label->label && (*label->label != '\0'))
{
label = GTK_LABEL (widget);
misc = GTK_MISC (widget);
- g_return_val_if_fail (label->words != 0 || label->label == 0, FALSE);
-
+ g_return_val_if_fail ((label->words != NULL), FALSE);
/*
* GC Clipping