Patch from Matthias Clasen to remove remove all instances of

Wed Jul 18 19:28:46 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/*.c: Patch from Matthias Clasen to remove remove
	all instances of g_return_if_fail (foo != NULL); that are
	immediately before a g_return_if_fail (GTK_IS_FOO (foo));
	since the second check catches the NULL anyways.

1 files changed, 0 insertions, 20 deletions

diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 3eca302a8d..dc3230fc63 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -430,7 +430,6 @@ gtk_spin_button_finalize (GObject *object)
 static void
 gtk_spin_button_map (GtkWidget *widget)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
 
   if (GTK_WIDGET_REALIZED (widget) && !GTK_WIDGET_MAPPED (widget))
@@ -443,7 +442,6 @@ gtk_spin_button_map (GtkWidget *widget)
 static void
 gtk_spin_button_unmap (GtkWidget *widget)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
 
   if (GTK_WIDGET_MAPPED (widget))
@@ -462,7 +460,6 @@ gtk_spin_button_realize (GtkWidget *widget)
   guint real_width;
   gint return_val;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
   
   spin_button = GTK_SPIN_BUTTON (widget);
@@ -511,7 +508,6 @@ gtk_spin_button_unrealize (GtkWidget *widget)
 {
   GtkSpinButton *spin;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
 
   spin = GTK_SPIN_BUTTON (widget);
@@ -556,7 +552,6 @@ gtk_spin_button_size_request (GtkWidget      *widget,
   GtkEntry *entry;
   GtkSpinButton *spin_button;
   
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (requisition != NULL);
   g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
 
@@ -604,7 +599,6 @@ gtk_spin_button_size_allocate (GtkWidget     *widget,
 {
   GtkAllocation child_allocation;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
   g_return_if_fail (allocation != NULL);
 
@@ -646,7 +640,6 @@ gtk_spin_button_expose (GtkWidget      *widget,
 {
   GtkSpinButton *spin;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
@@ -696,7 +689,6 @@ gtk_spin_button_draw_arrow (GtkSpinButton *spin_button,
   gint x;
   gint y;
 
-  g_return_if_fail (spin_button != NULL);
   g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
   
   widget = GTK_WIDGET (spin_button);
@@ -779,7 +771,6 @@ gtk_spin_button_enter_notify (GtkWidget        *widget,
 {
   GtkSpinButton *spin;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
@@ -814,7 +805,6 @@ gtk_spin_button_leave_notify (GtkWidget        *widget,
 {
   GtkSpinButton *spin;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
@@ -840,7 +830,6 @@ static gint
 gtk_spin_button_focus_out (GtkWidget     *widget,
 			   GdkEventFocus *event)
 {
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
@@ -856,7 +845,6 @@ gtk_spin_button_scroll (GtkWidget      *widget,
 {
   GtkSpinButton *spin;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
@@ -886,7 +874,6 @@ gtk_spin_button_button_press (GtkWidget      *widget,
 {
   GtkSpinButton *spin;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
@@ -980,7 +967,6 @@ gtk_spin_button_button_release (GtkWidget      *widget,
 {
   GtkSpinButton *spin;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
@@ -1043,7 +1029,6 @@ gtk_spin_button_motion_notify (GtkWidget      *widget,
 {
   GtkSpinButton *spin;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
@@ -1129,7 +1114,6 @@ gtk_spin_button_value_changed (GtkAdjustment *adjustment,
 {
   gint return_val;
 
-  g_return_if_fail (adjustment != NULL);
   g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
 
   return_val = FALSE;
@@ -1156,7 +1140,6 @@ gtk_spin_button_key_press (GtkWidget     *widget,
   gboolean key_repeat = FALSE;
   gboolean retval = FALSE;
   
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
   
@@ -1279,7 +1262,6 @@ gtk_spin_button_key_release (GtkWidget   *widget,
 {
   GtkSpinButton *spin;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
   
   spin = GTK_SPIN_BUTTON (widget);
@@ -1409,7 +1391,6 @@ gtk_spin_button_real_spin (GtkSpinButton *spin_button,
   GtkAdjustment *adj;
   gdouble new_value = 0.0;
 
-  g_return_if_fail (spin_button != NULL);
   g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
   
   adj = spin_button->adjustment;
@@ -1483,7 +1464,6 @@ gtk_spin_button_configure (GtkSpinButton  *spin_button,
 			   gdouble         climb_rate,
 			   guint           digits)
 {
-  g_return_if_fail (spin_button != NULL);
   g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
 
   if (adjustment)