From b4ba8e3b5d7d0b9d1defd9b10c724ae059cb25cc Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 16 Dec 1998 21:06:49 +0000 Subject: [PATCH] Do nothing on empty string, quietly. Wed Dec 16 16:04:41 1998 Owen Taylor * gtk/gtklabel.c (gtk_label_expose): Do nothing on empty string, quietly. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtklabel.c | 7 +++---- 8 files changed, 38 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1e5785b20..3b7525328 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Dec 16 16:04:41 1998 Owen Taylor + + * gtk/gtklabel.c (gtk_label_expose): Do nothing + on empty string, quietly. + Wed Dec 16 15:36:19 1998 Owen Taylor * gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 1e5785b20..3b7525328 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Wed Dec 16 16:04:41 1998 Owen Taylor + + * gtk/gtklabel.c (gtk_label_expose): Do nothing + on empty string, quietly. + Wed Dec 16 15:36:19 1998 Owen Taylor * gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1e5785b20..3b7525328 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Dec 16 16:04:41 1998 Owen Taylor + + * gtk/gtklabel.c (gtk_label_expose): Do nothing + on empty string, quietly. + Wed Dec 16 15:36:19 1998 Owen Taylor * gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 1e5785b20..3b7525328 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Wed Dec 16 16:04:41 1998 Owen Taylor + + * gtk/gtklabel.c (gtk_label_expose): Do nothing + on empty string, quietly. + Wed Dec 16 15:36:19 1998 Owen Taylor * gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1e5785b20..3b7525328 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Wed Dec 16 16:04:41 1998 Owen Taylor + + * gtk/gtklabel.c (gtk_label_expose): Do nothing + on empty string, quietly. + Wed Dec 16 15:36:19 1998 Owen Taylor * gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1e5785b20..3b7525328 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Wed Dec 16 16:04:41 1998 Owen Taylor + + * gtk/gtklabel.c (gtk_label_expose): Do nothing + on empty string, quietly. + Wed Dec 16 15:36:19 1998 Owen Taylor * gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1e5785b20..3b7525328 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Wed Dec 16 16:04:41 1998 Owen Taylor + + * gtk/gtklabel.c (gtk_label_expose): Do nothing + on empty string, quietly. + Wed Dec 16 15:36:19 1998 Owen Taylor * gtk/gtkentry.c (gtk_entry_draw_cursor_on_drawable): diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 50166fa0d..8e46a4056 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 -- 2.43.2