From: Owen Taylor Date: Sun, 8 Dec 2002 23:32:29 +0000 (+0000) Subject: Remove left-over NULL checks that were preventing the NULL to "unmodify" X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=7bd2340794d08f0fe39e22f5dba894a7104da436;hp=3bdc520c4882d2f7248b5ccf142f48a1980df1bf;p=~andy%2Fgtk Remove left-over NULL checks that were preventing the NULL to "unmodify" Sun Dec 8 18:28:51 2002 Owen Taylor * gtk/gtkwidget.c (gtk_widget_modify_fg/bg/base/text/font): Remove left-over NULL checks that were preventing the NULL to "unmodify" feature from actually working. --- diff --git a/ChangeLog b/ChangeLog index 352536d0b..3e68c98e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun Dec 8 18:28:51 2002 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_modify_fg/bg/base/text/font): + Remove left-over NULL checks that were preventing the + NULL to "unmodify" feature from actually working. + (#100702, Jon-Kare Hellan) + 2002-12-08 Matthias Clasen * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 352536d0b..3e68c98e9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Sun Dec 8 18:28:51 2002 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_modify_fg/bg/base/text/font): + Remove left-over NULL checks that were preventing the + NULL to "unmodify" feature from actually working. + (#100702, Jon-Kare Hellan) + 2002-12-08 Matthias Clasen * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 352536d0b..3e68c98e9 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Sun Dec 8 18:28:51 2002 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_modify_fg/bg/base/text/font): + Remove left-over NULL checks that were preventing the + NULL to "unmodify" feature from actually working. + (#100702, Jon-Kare Hellan) + 2002-12-08 Matthias Clasen * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 352536d0b..3e68c98e9 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Sun Dec 8 18:28:51 2002 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_modify_fg/bg/base/text/font): + Remove left-over NULL checks that were preventing the + NULL to "unmodify" feature from actually working. + (#100702, Jon-Kare Hellan) + 2002-12-08 Matthias Clasen * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 352536d0b..3e68c98e9 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Sun Dec 8 18:28:51 2002 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_modify_fg/bg/base/text/font): + Remove left-over NULL checks that were preventing the + NULL to "unmodify" feature from actually working. + (#100702, Jon-Kare Hellan) + 2002-12-08 Matthias Clasen * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 352536d0b..3e68c98e9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Sun Dec 8 18:28:51 2002 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_modify_fg/bg/base/text/font): + Remove left-over NULL checks that were preventing the + NULL to "unmodify" feature from actually working. + (#100702, Jon-Kare Hellan) + 2002-12-08 Matthias Clasen * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 1e64f51a6..cd1b17ad6 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -4099,7 +4099,6 @@ gtk_widget_modify_fg (GtkWidget *widget, { g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (state >= GTK_STATE_NORMAL && state <= GTK_STATE_INSENSITIVE); - g_return_if_fail (color != NULL); gtk_widget_modify_color_component (widget, GTK_RC_FG, state, color); } @@ -4123,7 +4122,6 @@ gtk_widget_modify_bg (GtkWidget *widget, { g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (state >= GTK_STATE_NORMAL && state <= GTK_STATE_INSENSITIVE); - g_return_if_fail (color != NULL); gtk_widget_modify_color_component (widget, GTK_RC_BG, state, color); } @@ -4149,7 +4147,6 @@ gtk_widget_modify_text (GtkWidget *widget, { g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (state >= GTK_STATE_NORMAL && state <= GTK_STATE_INSENSITIVE); - g_return_if_fail (color != NULL); gtk_widget_modify_color_component (widget, GTK_RC_TEXT, state, color); } @@ -4175,7 +4172,6 @@ gtk_widget_modify_base (GtkWidget *widget, { g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (state >= GTK_STATE_NORMAL && state <= GTK_STATE_INSENSITIVE); - g_return_if_fail (color != NULL); gtk_widget_modify_color_component (widget, GTK_RC_BASE, state, color); } @@ -4196,7 +4192,6 @@ gtk_widget_modify_font (GtkWidget *widget, GtkRcStyle *rc_style; g_return_if_fail (GTK_IS_WIDGET (widget)); - g_return_if_fail (font_desc != NULL); rc_style = gtk_widget_get_modifier_style (widget);