[gtk+/quartz-integration] Fix merge error from last merge

[John Ralls <jralls src gnome org>]

commit aca6ed7419f3d2ea8334bdd72b0f9d5d51ee4099
Author: John Ralls <jralls ceridwen us>
Date:   Thu Oct 6 15:37:49 2011 -0700

    Fix merge error from last merge

 gtk/tests/filtermodel.c |   87 -----------------------------------------------
 1 files changed, 0 insertions(+), 87 deletions(-)
---
diff --git a/gtk/tests/filtermodel.c b/gtk/tests/filtermodel.c
index 88e6dfd..04db578 100644
--- a/gtk/tests/filtermodel.c
+++ b/gtk/tests/filtermodel.c
@@ -4576,93 +4576,6 @@ ref_count_transfer_child_level_filter (void)
   g_object_unref (ref_model);
 }
 
-static void
-ref_count_transfer_child_level_reordered_filtered (void)
-{
-  GtkTreeIter grandparent1;
-  GtkTreeIter parent1, parent2, parent3;
-  GtkTreeModel *model;
-  GtkTreeModelRefCount *ref_model;
-  GtkTreeModel *filter_model;
-  GtkWidget *tree_view;
-  GType column_types[] = { G_TYPE_BOOLEAN };
-
-  model = gtk_tree_model_ref_count_new ();
-  ref_model = GTK_TREE_MODEL_REF_COUNT (model);
-
-  gtk_tree_store_set_column_types (GTK_TREE_STORE (model), 1,
-                                   column_types);
-
-  /* + grandparent1
-   *   + parent1
-   *   + parent2
-   *   + parent3
-   */
-
-  gtk_tree_store_append (GTK_TREE_STORE (model), &grandparent1, NULL);
-  gtk_tree_store_append (GTK_TREE_STORE (model), &parent1, &grandparent1);
-  gtk_tree_store_append (GTK_TREE_STORE (model), &parent2, &grandparent1);
-  gtk_tree_store_append (GTK_TREE_STORE (model), &parent3, &grandparent1);
-
-  /* Test with 1 node filtered (parent1) */
-  gtk_tree_store_set (GTK_TREE_STORE (model), &grandparent1, 0, TRUE, -1);
-  gtk_tree_store_set (GTK_TREE_STORE (model), &parent2, 0, TRUE, -1);
-  gtk_tree_store_set (GTK_TREE_STORE (model), &parent3, 0, TRUE, -1);
-
-  filter_model = gtk_tree_model_filter_new (model, NULL);
-  gtk_tree_model_filter_set_visible_column (GTK_TREE_MODEL_FILTER (filter_model), 0);
-  tree_view = gtk_tree_view_new_with_model (filter_model);
-
-  assert_node_ref_count (ref_model, &grandparent1, 3);
-  assert_node_ref_count (ref_model, &parent1, 0);
-  assert_node_ref_count (ref_model, &parent2, 1);
-  assert_node_ref_count (ref_model, &parent3, 0);
-
-  /* gtk_tree_store_move() will emit rows-reordered */
-  gtk_tree_store_move_after (GTK_TREE_STORE (model),
-                             &parent1, &parent3);
-
-  assert_node_ref_count (ref_model, &grandparent1, 3);
-  assert_node_ref_count (ref_model, &parent2, 1);
-  assert_node_ref_count (ref_model, &parent3, 0);
-  assert_node_ref_count (ref_model, &parent1, 0);
-
-  /* gtk_tree_store_move() will emit rows-reordered */
-  gtk_tree_store_move_before (GTK_TREE_STORE (model),
-                              &parent1, &parent2);
-
-  assert_node_ref_count (ref_model, &grandparent1, 3);
-  assert_node_ref_count (ref_model, &parent1, 0);
-  assert_node_ref_count (ref_model, &parent2, 1);
-  assert_node_ref_count (ref_model, &parent3, 0);
-
-  gtk_tree_store_set (GTK_TREE_STORE (model), &parent1, 0, TRUE, -1);
-
-  assert_node_ref_count (ref_model, &parent1, 1);
-  assert_node_ref_count (ref_model, &parent2, 0);
-  assert_node_ref_count (ref_model, &parent3, 0);
-
-  /* Test with two nodes filtered */
-  gtk_tree_store_set (GTK_TREE_STORE (model), &parent1, 0, FALSE, -1);
-  gtk_tree_store_set (GTK_TREE_STORE (model), &parent2, 0, FALSE, -1);
-
-  assert_node_ref_count (ref_model, &parent1, 0);
-  assert_node_ref_count (ref_model, &parent2, 0);
-  assert_node_ref_count (ref_model, &parent3, 1);
-
-  /* gtk_tree_store_move() will emit rows-reordered */
-  gtk_tree_store_move_before (GTK_TREE_STORE (model),
-                             &parent3, &parent1);
-
-  assert_node_ref_count (ref_model, &parent3, 1);
-  assert_node_ref_count (ref_model, &parent2, 0);
-  assert_node_ref_count (ref_model, &parent1, 0);
-
-  gtk_widget_destroy (tree_view);
-  g_object_unref (filter_model);
-  g_object_unref (ref_model);
-}
-
 static gboolean
 specific_path_dependent_filter_func (GtkTreeModel *model,
                                      GtkTreeIter  *iter,