Remove left-over NULL checks that were preventing the NULL to "unmodify"

Sun Dec  8 18:28:51 2002  Owen Taylor  <otaylor@redhat.com>

        * 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 352536d0b3d9dc51d18ee11e90b35ce4bdf5d4ef..3e68c98e9ab2467a7c3459204d448386c9c8bf96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Dec  8 18:28:51 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <maclas@gmx.de>
 
        * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 352536d0b3d9dc51d18ee11e90b35ce4bdf5d4ef..3e68c98e9ab2467a7c3459204d448386c9c8bf96 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Sun Dec  8 18:28:51 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <maclas@gmx.de>
 
        * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 352536d0b3d9dc51d18ee11e90b35ce4bdf5d4ef..3e68c98e9ab2467a7c3459204d448386c9c8bf96 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Sun Dec  8 18:28:51 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <maclas@gmx.de>
 
        * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 352536d0b3d9dc51d18ee11e90b35ce4bdf5d4ef..3e68c98e9ab2467a7c3459204d448386c9c8bf96 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Sun Dec  8 18:28:51 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <maclas@gmx.de>
 
        * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 352536d0b3d9dc51d18ee11e90b35ce4bdf5d4ef..3e68c98e9ab2467a7c3459204d448386c9c8bf96 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Sun Dec  8 18:28:51 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <maclas@gmx.de>
 
        * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 352536d0b3d9dc51d18ee11e90b35ce4bdf5d4ef..3e68c98e9ab2467a7c3459204d448386c9c8bf96 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Sun Dec  8 18:28:51 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <maclas@gmx.de>
 
        * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): 

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 1e64f51a6c089a7ebbd4c54f38dad4466e337267..cd1b17ad65c7f2b8187229ba7c3b334cdc529b87 100644 (file)
--- 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);