Patch from Matthias Clasen to remove remove all instances of

[~andy/gtk] / gtk / gtktreemodelsort.c

diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index 5b59f106387f8e6cd40e454b95bc69955908566a..d64a3bddc79a9aaec42cd76472eaf2f08ab56d16 100644 (file)
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -255,7 +255,6 @@ void
 gtk_tree_model_sort_set_model (GtkTreeModelSort *tree_model_sort,
                               GtkTreeModel     *child_model)
 {
-  g_return_if_fail (tree_model_sort != NULL);
   g_return_if_fail (GTK_IS_TREE_MODEL_SORT (tree_model_sort));
 
   if (child_model)
@@ -356,7 +355,6 @@ GtkTreePath *
 gtk_tree_model_sort_convert_path (GtkTreeModelSort *tree_model_sort,
                                  GtkTreePath      *child_path)
 {
-  g_return_val_if_fail (tree_model_sort != NULL, NULL);
   g_return_val_if_fail (GTK_IS_TREE_MODEL_SORT (tree_model_sort), NULL);
   g_return_val_if_fail (child_path != NULL, NULL);
 
@@ -919,7 +917,6 @@ gtk_tree_model_sort_get_sort_column_id (GtkTreeSortable  *sortable,
 {
   GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) sortable;
 
-  g_return_val_if_fail (sortable != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_TREE_MODEL_SORT (sortable), FALSE);
 
   if (tree_model_sort->sort_column_id == -1)
@@ -941,7 +938,6 @@ gtk_tree_model_sort_set_sort_column_id (GtkTreeSortable  *sortable,
   GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) sortable;
   GList *list;
 
-  g_return_if_fail (sortable != NULL);
   g_return_if_fail (GTK_IS_TREE_MODEL_SORT (sortable));
 
   for (list = tree_model_sort->sort_list; list; list = list->next)
@@ -977,7 +973,6 @@ gtk_tree_model_sort_set_sort_func (GtkTreeSortable        *sortable,
   GtkTreeDataSortHeader *header = NULL;
   GList *list;
 
-  g_return_if_fail (sortable != NULL);
   g_return_if_fail (GTK_IS_TREE_MODEL_SORT (sortable));
   g_return_if_fail (func != NULL);