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, 116 deletions

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index a7bea917a..7fa6de02b 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -1158,7 +1158,6 @@ gtk_clist_set_hadjustment (GtkCList      *clist,
 {
   GtkAdjustment *old_adjustment;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
   if (adjustment)
     g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
@@ -1196,7 +1195,6 @@ gtk_clist_set_hadjustment (GtkCList      *clist,
 GtkAdjustment *
 gtk_clist_get_hadjustment (GtkCList *clist)
 {
-  g_return_val_if_fail (clist != NULL, NULL);
   g_return_val_if_fail (GTK_IS_CLIST (clist), NULL);
 
   return clist->hadjustment;
@@ -1208,7 +1206,6 @@ gtk_clist_set_vadjustment (GtkCList      *clist,
 {
   GtkAdjustment *old_adjustment;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
   if (adjustment)
     g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
@@ -1246,7 +1243,6 @@ gtk_clist_set_vadjustment (GtkCList      *clist,
 GtkAdjustment *
 gtk_clist_get_vadjustment (GtkCList *clist)
 {
-  g_return_val_if_fail (clist != NULL, NULL);
   g_return_val_if_fail (GTK_IS_CLIST (clist), NULL);
 
   return clist->vadjustment;
@@ -1267,7 +1263,6 @@ void
 gtk_clist_set_shadow_type (GtkCList      *clist,
 			   GtkShadowType  type)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   clist->shadow_type = type;
@@ -1280,7 +1275,6 @@ void
 gtk_clist_set_selection_mode (GtkCList         *clist,
 			      GtkSelectionMode  mode)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (mode == clist->selection_mode)
@@ -1312,7 +1306,6 @@ gtk_clist_set_selection_mode (GtkCList         *clist,
 void
 gtk_clist_freeze (GtkCList *clist)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   clist->freeze_count++;
@@ -1321,7 +1314,6 @@ gtk_clist_freeze (GtkCList *clist)
 void
 gtk_clist_thaw (GtkCList *clist)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (clist->freeze_count)
@@ -1353,7 +1345,6 @@ gtk_clist_thaw (GtkCList *clist)
 void
 gtk_clist_column_titles_show (GtkCList *clist)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (!GTK_CLIST_SHOW_TITLES(clist))
@@ -1368,7 +1359,6 @@ gtk_clist_column_titles_show (GtkCList *clist)
 void 
 gtk_clist_column_titles_hide (GtkCList *clist)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (GTK_CLIST_SHOW_TITLES(clist))
@@ -1384,7 +1374,6 @@ void
 gtk_clist_column_title_active (GtkCList *clist,
 			       gint      column)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (column < 0 || column >= clist->columns)
@@ -1409,7 +1398,6 @@ gtk_clist_column_title_passive (GtkCList *clist,
 {
   GtkButton *button;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (column < 0 || column >= clist->columns)
@@ -1439,7 +1427,6 @@ gtk_clist_column_titles_active (GtkCList *clist)
 {
   gint i;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   for (i = 0; i < clist->columns; i++)
@@ -1451,7 +1438,6 @@ gtk_clist_column_titles_passive (GtkCList *clist)
 {
   gint i;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   for (i = 0; i < clist->columns; i++)
@@ -1468,7 +1454,6 @@ gtk_clist_set_column_title (GtkCList    *clist,
   GtkWidget *alignment = NULL;
   GtkWidget *label;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (column < 0 || column >= clist->columns)
@@ -1527,7 +1512,6 @@ gchar *
 gtk_clist_get_column_title (GtkCList *clist,
 			    gint      column)
 {
-  g_return_val_if_fail (clist != NULL, NULL);
   g_return_val_if_fail (GTK_IS_CLIST (clist), NULL);
 
   if (column < 0 || column >= clist->columns)
@@ -1544,7 +1528,6 @@ gtk_clist_set_column_widget (GtkCList  *clist,
   gint new_button = 0;
   GtkWidget *old_widget;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (column < 0 || column >= clist->columns)
@@ -1583,7 +1566,6 @@ GtkWidget *
 gtk_clist_get_column_widget (GtkCList *clist,
 			     gint      column)
 {
-  g_return_val_if_fail (clist != NULL, NULL);
   g_return_val_if_fail (GTK_IS_CLIST (clist), NULL);
 
   if (column < 0 || column >= clist->columns)
@@ -1602,7 +1584,6 @@ gtk_clist_set_column_justification (GtkCList         *clist,
 {
   GtkWidget *alignment;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (column < 0 || column >= clist->columns)
@@ -1648,7 +1629,6 @@ gtk_clist_set_column_visibility (GtkCList *clist,
 				 gint      column,
 				 gboolean  visible)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (column < 0 || column >= clist->columns)
@@ -1688,7 +1668,6 @@ gtk_clist_set_column_resizeable (GtkCList *clist,
 				 gint      column,
 				 gboolean  resizeable)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (column < 0 || column >= clist->columns)
@@ -1709,7 +1688,6 @@ gtk_clist_set_column_auto_resize (GtkCList *clist,
 				  gint      column,
 				  gboolean  auto_resize)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (column < 0 || column >= clist->columns)
@@ -1740,7 +1718,6 @@ gtk_clist_columns_autosize (GtkCList *clist)
   gint i;
   gint width;
 
-  g_return_val_if_fail (clist != NULL, 0);
   g_return_val_if_fail (GTK_IS_CLIST (clist), 0);
 
   gtk_clist_freeze (clist);
@@ -1765,7 +1742,6 @@ gtk_clist_optimal_column_width (GtkCList *clist,
   GList *list;
   gint width;
 
-  g_return_val_if_fail (clist != NULL, 0);
   g_return_val_if_fail (GTK_CLIST (clist), 0);
 
   if (column < 0 || column >= clist->columns)
@@ -1795,7 +1771,6 @@ gtk_clist_set_column_width (GtkCList *clist,
 			    gint      column,
 			    gint      width)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (column < 0 || column >= clist->columns)
@@ -1810,7 +1785,6 @@ gtk_clist_set_column_min_width (GtkCList *clist,
 				gint      column,
 				gint      min_width)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (column < 0 || column >= clist->columns)
@@ -1833,7 +1807,6 @@ gtk_clist_set_column_max_width (GtkCList *clist,
 				gint      column,
 				gint      max_width)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (column < 0 || column >= clist->columns)
@@ -1917,7 +1890,6 @@ real_resize_column (GtkCList *clist,
 		    gint      column,
 		    gint      width)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (column < 0 || column >= clist->columns)
@@ -1945,7 +1917,6 @@ real_resize_column (GtkCList *clist,
 static void
 abort_column_resize (GtkCList *clist)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (!GTK_CLIST_IN_DRAG(clist))
@@ -2241,7 +2212,6 @@ gtk_clist_get_cell_type (GtkCList *clist,
 {
   GtkCListRow *clist_row;
 
-  g_return_val_if_fail (clist != NULL, -1);
   g_return_val_if_fail (GTK_IS_CLIST (clist), -1);
 
   if (row < 0 || row >= clist->rows)
@@ -2262,7 +2232,6 @@ gtk_clist_set_text (GtkCList    *clist,
 {
   GtkCListRow *clist_row;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (row < 0 || row >= clist->rows)
@@ -2292,7 +2261,6 @@ gtk_clist_get_text (GtkCList  *clist,
 {
   GtkCListRow *clist_row;
 
-  g_return_val_if_fail (clist != NULL, 0);
   g_return_val_if_fail (GTK_IS_CLIST (clist), 0);
 
   if (row < 0 || row >= clist->rows)
@@ -2320,7 +2288,6 @@ gtk_clist_set_pixmap (GtkCList  *clist,
 {
   GtkCListRow *clist_row;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (row < 0 || row >= clist->rows)
@@ -2354,7 +2321,6 @@ gtk_clist_get_pixmap (GtkCList   *clist,
 {
   GtkCListRow *clist_row;
 
-  g_return_val_if_fail (clist != NULL, 0);
   g_return_val_if_fail (GTK_IS_CLIST (clist), 0);
 
   if (row < 0 || row >= clist->rows)
@@ -2388,7 +2354,6 @@ gtk_clist_set_pixtext (GtkCList    *clist,
 {
   GtkCListRow *clist_row;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (row < 0 || row >= clist->rows)
@@ -2422,7 +2387,6 @@ gtk_clist_get_pixtext (GtkCList   *clist,
 {
   GtkCListRow *clist_row;
 
-  g_return_val_if_fail (clist != NULL, 0);
   g_return_val_if_fail (GTK_IS_CLIST (clist), 0);
 
   if (row < 0 || row >= clist->rows)
@@ -2459,7 +2423,6 @@ gtk_clist_set_shift (GtkCList *clist,
   GtkRequisition requisition = { 0 };
   GtkCListRow *clist_row;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (row < 0 || row >= clist->rows)
@@ -2502,7 +2465,6 @@ set_cell_contents (GtkCList    *clist,
   GdkPixmap *old_pixmap = NULL;
   GdkBitmap *old_mask = NULL;
   
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
   g_return_if_fail (clist_row != NULL);
 
@@ -2632,7 +2594,6 @@ cell_size_request (GtkCList       *clist,
   PangoLayout *layout;
   PangoRectangle logical_rect;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
   g_return_if_fail (requisition != NULL);
 
@@ -2684,7 +2645,6 @@ gint
 gtk_clist_prepend (GtkCList    *clist,
 		   gchar       *text[])
 {
-  g_return_val_if_fail (clist != NULL, -1);
   g_return_val_if_fail (GTK_IS_CLIST (clist), -1);
   g_return_val_if_fail (text != NULL, -1);
 
@@ -2695,7 +2655,6 @@ gint
 gtk_clist_append (GtkCList    *clist,
 		  gchar       *text[])
 {
-  g_return_val_if_fail (clist != NULL, -1);
   g_return_val_if_fail (GTK_IS_CLIST (clist), -1);
   g_return_val_if_fail (text != NULL, -1);
 
@@ -2707,7 +2666,6 @@ gtk_clist_insert (GtkCList    *clist,
 		  gint         row,
 		  gchar       *text[])
 {
-  g_return_val_if_fail (clist != NULL, -1);
   g_return_val_if_fail (GTK_IS_CLIST (clist), -1);
   g_return_val_if_fail (text != NULL, -1);
 
@@ -2727,7 +2685,6 @@ gtk_clist_remove (GtkCList *clist,
 void
 gtk_clist_clear (GtkCList *clist)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
   
   GTK_CLIST_GET_CLASS (clist)->clear (clist);
@@ -2747,7 +2704,6 @@ real_insert_row (GtkCList *clist,
   gint i;
   GtkCListRow *clist_row;
 
-  g_return_val_if_fail (clist != NULL, -1);
   g_return_val_if_fail (GTK_IS_CLIST (clist), -1);
   g_return_val_if_fail (text != NULL, -1);
 
@@ -2843,7 +2799,6 @@ real_remove_row (GtkCList *clist,
   GList *list;
   GtkCListRow *clist_row;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   /* return if out of bounds */
@@ -2908,7 +2863,6 @@ real_clear (GtkCList *clist)
   GList *free_list;
   gint i;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   /* free up the selection list */
@@ -2967,7 +2921,6 @@ real_row_move (GtkCList *clist,
   gint first, last;
   gint d;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (GTK_CLIST_AUTO_SORT(clist))
@@ -3044,7 +2997,6 @@ gtk_clist_moveto (GtkCList *clist,
 		  gfloat    row_align,
 		  gfloat    col_align)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (row < -1 || row >= clist->rows)
@@ -3083,7 +3035,6 @@ gtk_clist_set_row_height (GtkCList *clist,
 {
   GtkWidget *widget;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   widget = GTK_WIDGET (clist);
@@ -3132,7 +3083,6 @@ gtk_clist_set_row_data_full (GtkCList         *clist,
 {
   GtkCListRow *clist_row;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (row < 0 || row > (clist->rows - 1))
@@ -3153,7 +3103,6 @@ gtk_clist_get_row_data (GtkCList *clist,
 {
   GtkCListRow *clist_row;
 
-  g_return_val_if_fail (clist != NULL, NULL);
   g_return_val_if_fail (GTK_IS_CLIST (clist), NULL);
 
   if (row < 0 || row > (clist->rows - 1))
@@ -3170,7 +3119,6 @@ gtk_clist_find_row_from_data (GtkCList *clist,
   GList *list;
   gint n;
 
-  g_return_val_if_fail (clist != NULL, -1);
   g_return_val_if_fail (GTK_IS_CLIST (clist), -1);
 
   for (n = 0, list = clist->row_list; list; n++, list = list->next)
@@ -3187,7 +3135,6 @@ gtk_clist_swap_rows (GtkCList *clist,
 {
   gint first, last;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
   g_return_if_fail (row1 != row2);
 
@@ -3210,7 +3157,6 @@ gtk_clist_row_move (GtkCList *clist,
 		    gint      source_row,
 		    gint      dest_row)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (GTK_CLIST_AUTO_SORT(clist))
@@ -3231,7 +3177,6 @@ gtk_clist_row_is_visible (GtkCList *clist,
 {
   gint top;
 
-  g_return_val_if_fail (clist != NULL, 0);
   g_return_val_if_fail (GTK_IS_CLIST (clist), 0);
 
   if (row < 0 || row >= clist->rows)
@@ -3262,7 +3207,6 @@ gtk_clist_set_foreground (GtkCList *clist,
 {
   GtkCListRow *clist_row;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (row < 0 || row >= clist->rows)
@@ -3292,7 +3236,6 @@ gtk_clist_set_background (GtkCList *clist,
 {
   GtkCListRow *clist_row;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (row < 0 || row >= clist->rows)
@@ -3331,7 +3274,6 @@ gtk_clist_set_cell_style (GtkCList *clist,
   GtkRequisition requisition = { 0 };
   GtkCListRow *clist_row;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (row < 0 || row >= clist->rows)
@@ -3385,7 +3327,6 @@ gtk_clist_get_cell_style (GtkCList *clist,
 {
   GtkCListRow *clist_row;
 
-  g_return_val_if_fail (clist != NULL, NULL);
   g_return_val_if_fail (GTK_IS_CLIST (clist), NULL);
 
   if (row < 0 || row >= clist->rows || column < 0 || column >= clist->columns)
@@ -3406,7 +3347,6 @@ gtk_clist_set_row_style (GtkCList *clist,
   gint *old_width;
   gint i;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (row < 0 || row >= clist->rows)
@@ -3468,7 +3408,6 @@ gtk_clist_get_row_style (GtkCList *clist,
 {
   GtkCListRow *clist_row;
 
-  g_return_val_if_fail (clist != NULL, NULL);
   g_return_val_if_fail (GTK_IS_CLIST (clist), NULL);
 
   if (row < 0 || row >= clist->rows)
@@ -3495,7 +3434,6 @@ gtk_clist_set_selectable (GtkCList *clist,
 {
   GtkCListRow *clist_row;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (row < 0 || row >= clist->rows)
@@ -3526,7 +3464,6 @@ gboolean
 gtk_clist_get_selectable (GtkCList *clist,
 			  gint      row)
 {
-  g_return_val_if_fail (clist != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_CLIST (clist), FALSE);
 
   if (row < 0 || row >= clist->rows)
@@ -3540,7 +3477,6 @@ gtk_clist_select_row (GtkCList *clist,
 		      gint      row,
 		      gint      column)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (row < 0 || row >= clist->rows)
@@ -3557,7 +3493,6 @@ gtk_clist_unselect_row (GtkCList *clist,
 			gint      row,
 			gint      column)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (row < 0 || row >= clist->rows)
@@ -3572,7 +3507,6 @@ gtk_clist_unselect_row (GtkCList *clist,
 void
 gtk_clist_select_all (GtkCList *clist)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   GTK_CLIST_GET_CLASS (clist)->select_all (clist);
@@ -3581,7 +3515,6 @@ gtk_clist_select_all (GtkCList *clist)
 void
 gtk_clist_unselect_all (GtkCList *clist)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   GTK_CLIST_GET_CLASS (clist)->unselect_all (clist);
@@ -3590,7 +3523,6 @@ gtk_clist_unselect_all (GtkCList *clist)
 void
 gtk_clist_undo_selection (GtkCList *clist)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (clist->selection_mode == GTK_SELECTION_EXTENDED &&
@@ -3755,7 +3687,6 @@ real_select_row (GtkCList *clist,
   gint sel_row;
   gboolean row_selected;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (row < 0 || row > (clist->rows - 1))
@@ -3817,7 +3748,6 @@ real_unselect_row (GtkCList *clist,
 {
   GtkCListRow *clist_row;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (row < 0 || row > (clist->rows - 1))
@@ -3848,7 +3778,6 @@ real_select_all (GtkCList *clist)
   GList *list;
   gint i;
  
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (clist))
@@ -3896,7 +3825,6 @@ real_unselect_all (GtkCList *clist)
   GList *list;
   gint i;
  
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (clist))
@@ -3982,7 +3910,6 @@ real_undo_selection (GtkCList *clist)
 {
   GList *work;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if ((gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (clist)) ||
@@ -4037,7 +3964,6 @@ set_anchor (GtkCList *clist,
 	    gint      anchor,
 	    gint      undo_anchor)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
   
   if (clist->selection_mode != GTK_SELECTION_EXTENDED || clist->anchor >= 0)
@@ -4336,7 +4262,6 @@ update_extended_selection (GtkCList *clist,
 static void
 start_selection (GtkCList *clist)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (clist))
@@ -4349,7 +4274,6 @@ start_selection (GtkCList *clist)
 static void
 end_selection (GtkCList *clist)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_FOCUS(clist))
@@ -4364,7 +4288,6 @@ extend_selection (GtkCList      *clist,
 		  gfloat         position,
 		  gboolean       auto_start_selection)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if ((gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (clist)) ||
@@ -4442,7 +4365,6 @@ gtk_clist_destroy (GtkObject *object)
   gint i;
   GtkCList *clist;
 
-  g_return_if_fail (object != NULL);
   g_return_if_fail (GTK_IS_CLIST (object));
 
   clist = GTK_CLIST (object);
@@ -4531,7 +4453,6 @@ gtk_clist_realize (GtkWidget *widget)
   gint i;
   gint j;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_CLIST (widget));
 
   clist = GTK_CLIST (widget);
@@ -4683,7 +4604,6 @@ gtk_clist_unrealize (GtkWidget *widget)
   gint i;
   GtkCList *clist;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_CLIST (widget));
 
   clist = GTK_CLIST (widget);
@@ -4757,7 +4677,6 @@ gtk_clist_map (GtkWidget *widget)
   gint i;
   GtkCList *clist;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_CLIST (widget));
 
   clist = GTK_CLIST (widget);
@@ -4797,7 +4716,6 @@ gtk_clist_unmap (GtkWidget *widget)
   gint i;
   GtkCList *clist;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_CLIST (widget));
 
   clist = GTK_CLIST (widget);
@@ -4854,7 +4772,6 @@ gtk_clist_expose (GtkWidget      *widget,
 {
   GtkCList *clist;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_CLIST (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
@@ -4894,7 +4811,6 @@ gtk_clist_style_set (GtkWidget *widget,
 {
   GtkCList *clist;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_CLIST (widget));
 
   if (GTK_WIDGET_CLASS (parent_class)->style_set)
@@ -4944,7 +4860,6 @@ gtk_clist_button_press (GtkWidget      *widget,
   gint column;
   gint button_actions;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_CLIST (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
@@ -5157,7 +5072,6 @@ gtk_clist_button_release (GtkWidget      *widget,
   GtkCList *clist;
   gint button_actions;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_CLIST (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
@@ -5259,7 +5173,6 @@ gtk_clist_motion (GtkWidget      *widget,
   gint new_width;
   gint button_actions = 0;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_CLIST (widget), FALSE);
 
   clist = GTK_CLIST (widget);
@@ -5432,7 +5345,6 @@ gtk_clist_size_request (GtkWidget      *widget,
   GtkCList *clist;
   gint i;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_CLIST (widget));
   g_return_if_fail (requisition != NULL);
 
@@ -5476,7 +5388,6 @@ gtk_clist_size_allocate (GtkWidget     *widget,
   GtkAllocation clist_allocation;
   gint border_width;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_CLIST (widget));
   g_return_if_fail (allocation != NULL);
 
@@ -5560,7 +5471,6 @@ gtk_clist_forall (GtkContainer *container,
   GtkCList *clist;
   guint i;
 
-  g_return_if_fail (container != NULL);
   g_return_if_fail (GTK_IS_CLIST (container));
   g_return_if_fail (callback != NULL);
 
@@ -5975,7 +5885,6 @@ draw_rows (GtkCList     *clist,
   gint first_row;
   gint last_row;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (clist->row_height == 0 ||
@@ -6039,7 +5948,6 @@ draw_xor_line (GtkCList *clist)
 static void
 clist_refresh (GtkCList *clist)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
   
   if (CLIST_UNFROZEN (clist))
@@ -6062,7 +5970,6 @@ get_selection_info (GtkCList *clist,
 {
   gint trow, tcol;
 
-  g_return_val_if_fail (clist != NULL, 0);
   g_return_val_if_fail (GTK_IS_CLIST (clist), 0);
 
   /* bounds checking, return false if the user clicked 
@@ -6091,7 +5998,6 @@ gtk_clist_get_selection_info (GtkCList *clist,
 			      gint     *row, 
 			      gint     *column)
 {
-  g_return_val_if_fail (clist != NULL, 0);
   g_return_val_if_fail (GTK_IS_CLIST (clist), 0);
   return get_selection_info (clist, x, y, row, column);
 }
@@ -6194,7 +6100,6 @@ vadjustment_value_changed (GtkAdjustment *adjustment,
   gint dy, value;
 
   g_return_if_fail (adjustment != NULL);
-  g_return_if_fail (data != NULL);
   g_return_if_fail (GTK_IS_CLIST (data));
 
   clist = GTK_CLIST (data);
@@ -6228,7 +6133,6 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
   gint dx;
 
   g_return_if_fail (adjustment != NULL);
-  g_return_if_fail (data != NULL);
   g_return_if_fail (GTK_IS_CLIST (data));
 
   clist = GTK_CLIST (data);
@@ -6564,7 +6468,6 @@ gtk_clist_draw_focus (GtkWidget *widget)
 {
   GtkCList *clist;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_CLIST (widget));
 
   if (!GTK_WIDGET_DRAWABLE (widget) || !GTK_WIDGET_CAN_FOCUS (widget))
@@ -6584,7 +6487,6 @@ gtk_clist_focus_in (GtkWidget     *widget,
 {
   GtkCList *clist;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_CLIST (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
@@ -6616,7 +6518,6 @@ gtk_clist_focus_out (GtkWidget     *widget,
 {
   GtkCList *clist;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_CLIST (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
@@ -6960,7 +6861,6 @@ scroll_vertical (GtkCList      *clist,
 {
   gint old_focus_row;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (clist))
@@ -7164,7 +7064,6 @@ remove_grab (GtkCList *clist)
 void
 gtk_clist_sort (GtkCList *clist)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   GTK_CLIST_GET_CLASS (clist)->sort_list (clist);
@@ -7174,7 +7073,6 @@ void
 gtk_clist_set_compare_func (GtkCList            *clist,
 			    GtkCListCompareFunc  cmp_func)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   clist->compare = (cmp_func) ? cmp_func : default_compare;
@@ -7184,7 +7082,6 @@ void
 gtk_clist_set_auto_sort (GtkCList *clist,
 			 gboolean  auto_sort)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
   
   if (GTK_CLIST_AUTO_SORT(clist) && !auto_sort)
@@ -7200,7 +7097,6 @@ void
 gtk_clist_set_sort_type (GtkCList    *clist,
 			 GtkSortType  sort_type)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
   
   clist->sort_type = sort_type;
@@ -7210,7 +7106,6 @@ void
 gtk_clist_set_sort_column (GtkCList *clist,
 			   gint      column)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (column < 0 || column >= clist->columns)
@@ -7276,7 +7171,6 @@ real_sort_list (GtkCList *clist)
   GList *work;
   gint i;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (clist->rows <= 1)
@@ -7482,7 +7376,6 @@ gtk_clist_drag_begin (GtkWidget	     *widget,
   GtkCList *clist;
   GtkCListCellInfo *info;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_CLIST (widget));
   g_return_if_fail (context != NULL);
 
@@ -7531,7 +7424,6 @@ gtk_clist_drag_end (GtkWidget	   *widget,
 {
   GtkCList *clist;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_CLIST (widget));
   g_return_if_fail (context != NULL);
 
@@ -7549,7 +7441,6 @@ gtk_clist_drag_leave (GtkWidget      *widget,
   GtkCList *clist;
   GtkCListDestInfo *dest_info;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_CLIST (widget));
   g_return_if_fail (context != NULL);
 
@@ -7596,7 +7487,6 @@ gtk_clist_drag_motion (GtkWidget      *widget,
   GtkCListDestInfo new_info;
   GtkCListDestInfo *dest_info;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_CLIST (widget), FALSE);
 
   clist = GTK_CLIST (widget);
@@ -7689,7 +7579,6 @@ gtk_clist_drag_drop (GtkWidget      *widget,
 		     gint            y,
 		     guint           time)
 {
-  g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_CLIST (widget), FALSE);
   g_return_val_if_fail (context != NULL, FALSE);
 
@@ -7721,7 +7610,6 @@ gtk_clist_drag_data_received (GtkWidget        *widget,
 {
   GtkCList *clist;
 
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_CLIST (widget));
   g_return_if_fail (context != NULL);
   g_return_if_fail (selection_data != NULL);
@@ -7763,7 +7651,6 @@ gtk_clist_drag_data_get (GtkWidget        *widget,
 			 guint             info,
 			 guint             time)
 {
-  g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_CLIST (widget));
   g_return_if_fail (context != NULL);
   g_return_if_fail (selection_data != NULL);
@@ -7825,7 +7712,6 @@ gtk_clist_set_reorderable (GtkCList *clist,
 {
   GtkWidget *widget;
 
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if ((GTK_CLIST_REORDERABLE(clist) != 0) == reorderable)
@@ -7851,7 +7737,6 @@ void
 gtk_clist_set_use_drag_icons (GtkCList *clist,
 			      gboolean  use_icons)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
   if (use_icons != 0)
@@ -7865,7 +7750,6 @@ gtk_clist_set_button_actions (GtkCList *clist,
 			      guint     button,
 			      guint8    button_actions)
 {
-  g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
   
   if (button < MAX_BUTTON)