treelistmodel: Make constructor transfer full

Make gtk_tree_list_model_new() take the root model
as first argument, and make it transfer full, for
consistency with other wrapping list constructors.

Update all callers.

Still missing here: Make the model property writable,
and allow passing NULL in the constructor.

demos/constraint-editor/constraint-view.c

@@ -179,14 +179,10 @@ constraint_view_init (ConstraintView *self)
   all_constraints = gtk_constraint_layout_observe_constraints (GTK_CONSTRAINT_LAYOUT (manager));
   filter = gtk_custom_filter_new (omit_internal, NULL, NULL);
   constraints = (GListModel *)gtk_filter_list_model_new (all_constraints, filter);
-  g_object_unref (filter);
-  g_object_unref (all_constraints);
 
   all_children = gtk_widget_observe_children (GTK_WIDGET (self));
   filter = gtk_custom_filter_new (omit_internal, NULL, NULL);
   children = (GListModel *)gtk_filter_list_model_new (all_children, filter);
-  g_object_unref (filter);
-  g_object_unref (all_children);
 
   list = g_list_store_new (G_TYPE_LIST_MODEL);
   g_list_store_append (list, children);

demos/gtk-demo/listview_settings.c

@@ -242,16 +242,11 @@ transform_settings_to_keys (GBinding     *binding,
   g_object_unref (settings);
 
   sort_model = gtk_sort_list_model_new (G_LIST_MODEL (store),
-                                        gtk_column_view_get_sorter (GTK_COLUMN_VIEW (data)));
+                                        g_object_ref (gtk_column_view_get_sorter (GTK_COLUMN_VIEW (data))));
-  g_object_unref (store);
 
   filter = gtk_string_filter_new (gtk_property_expression_new (SETTINGS_TYPE_KEY, NULL, "name"));
-  filter_model = gtk_filter_list_model_new (G_LIST_MODEL (sort_model), filter);
-  g_object_unref (sort_model);
-
   g_set_object (&current_filter, filter);
-
+  filter_model = gtk_filter_list_model_new (G_LIST_MODEL (sort_model), filter);
-  g_object_unref (filter);
 
   selection_model = gtk_no_selection_new (G_LIST_MODEL (filter_model));
   g_object_unref (filter_model);
@@ -403,8 +398,8 @@ do_listview_settings (GtkWidget *do_widget)
       g_object_unref (actions);
 
       model = create_settings_model (NULL, NULL);
-      treemodel = gtk_tree_list_model_new (FALSE,
+      treemodel = gtk_tree_list_model_new (model,
-                                           model,
+                                           FALSE,
                                            TRUE,
                                            create_settings_model,
                                            NULL,
@@ -419,7 +414,6 @@ do_listview_settings (GtkWidget *do_widget)
       gtk_list_view_set_model (GTK_LIST_VIEW (listview), G_LIST_MODEL (selection));
       g_object_unref (selection);
       g_object_unref (treemodel);
-      g_object_unref (model);
 
       name_column = GTK_COLUMN_VIEW_COLUMN (gtk_builder_get_object (builder, "name_column"));
       sorter = gtk_string_sorter_new (gtk_property_expression_new (SETTINGS_TYPE_KEY, NULL, "name"));

demos/gtk-demo/main.c

@@ -1136,8 +1136,8 @@ activate (GApplication *app)
   g_signal_connect (search_bar, "notify::search-mode-enabled", G_CALLBACK (clear_search), NULL);
 
   listmodel = create_demo_model ();
-  treemodel = gtk_tree_list_model_new (FALSE,
+  treemodel = gtk_tree_list_model_new (G_LIST_MODEL (listmodel),
-                                       G_LIST_MODEL (listmodel),
+                                       FALSE,
                                        TRUE,
                                        get_child_model,
                                        NULL,
@@ -1145,6 +1145,7 @@ activate (GApplication *app)
   filter_model = gtk_filter_list_model_new (G_LIST_MODEL (treemodel), NULL);
   filter = gtk_custom_filter_new ((GtkCustomFilterFunc)demo_filter_by_name, filter_model, NULL);
   gtk_filter_list_model_set_filter (filter_model, filter);
+  g_object_unref (filter);
   search_entry = GTK_WIDGET (gtk_builder_get_object (builder, "search-entry"));
   g_signal_connect (search_entry, "search-changed", G_CALLBACK (demo_search_changed_cb), filter);
 

gtk/gtkcolumnview.c

@@ -1500,8 +1500,8 @@ gtk_column_view_get_list_view (GtkColumnView *self)
  * |[
  *   gtk_column_view_column_set_sorter (column, sorter);
  *   gtk_column_view_append_column (view, column);
- *   model = gtk_sort_list_model_new (store,
+ *   sorter = g_object_ref (gtk_column_view_get_sorter (view)));
- *                                    gtk_column_view_get_sorter (view));
+ *   model = gtk_sort_list_model_new (store, sorter);
  *   selection = gtk_no_selection_new (model);
  *   gtk_column_view_set_model (view, selection);
  * ]|

gtk/gtkcustompaperunixdialog.c

@@ -325,8 +325,6 @@ gtk_custom_paper_unix_dialog_init (GtkCustomPaperUnixDialog *dialog)
 
   filter = gtk_custom_filter_new (match_func, NULL, NULL);
   dialog->printer_list = G_LIST_MODEL (gtk_filter_list_model_new (full_list, filter));
-  g_object_unref (full_list);
-  g_object_unref (filter);
 
   dialog->custom_paper_list = g_list_store_new (GTK_TYPE_PAGE_SETUP);
   gtk_print_load_custom_papers (dialog->custom_paper_list);

gtk/gtkdropdown.c

@@ -666,7 +666,7 @@ gtk_drop_down_set_model (GtkDropDown *self,
       GListModel *filter_model;
       GListModel *selection;
 
-      filter_model = G_LIST_MODEL (gtk_filter_list_model_new (model, NULL));
+      filter_model = G_LIST_MODEL (gtk_filter_list_model_new (g_object_ref (model), NULL));
       g_set_object (&self->filter_model, filter_model);
       g_object_unref (filter_model);
 

gtk/gtkfilterlistmodel.c

@@ -614,8 +614,8 @@ gtk_filter_list_model_init (GtkFilterListModel *self)
 
 /**
  * gtk_filter_list_model_new:
- * @model: (allow-none): the model to sort
+ * @model: (allow-none) (transfer full): the model to sort, or %NULL
- * @filter: (allow-none): filter or %NULL to not filter items
+ * @filter: (allow-none) (transfer full): filter or %NULL to not filter items
  *
  * Creates a new #GtkFilterListModel that will filter @model using the given
  * @filter.
@@ -636,6 +636,10 @@ gtk_filter_list_model_new (GListModel *model,
                          "filter", filter,
                          NULL);
 
+  /* consume the references */
+  g_clear_object (&model);
+  g_clear_object (&filter);
+
   return result;
 }
 

gtk/gtkpagesetupunixdialog.c

@@ -324,8 +324,6 @@ gtk_page_setup_unix_dialog_init (GtkPageSetupUnixDialog *dialog)
 
   filter = gtk_custom_filter_new (match_func, NULL, NULL);
   dialog->printer_list = G_LIST_MODEL (gtk_filter_list_model_new (full_list, filter));
-  g_object_unref (full_list);
-  g_object_unref (filter);
 
   factory = gtk_signal_list_item_factory_new ();
   g_signal_connect (factory, "setup", G_CALLBACK (setup_printer_item), dialog);

gtk/gtkprintunixdialog.c

@@ -813,7 +813,6 @@ gtk_print_unix_dialog_init (GtkPrintUnixDialog *dialog)
   model = load_print_backends (dialog);
   sorter = gtk_custom_sorter_new (default_printer_list_sort_func, NULL, NULL);
   sorted = G_LIST_MODEL (gtk_sort_list_model_new (model, sorter));
-  g_object_unref (sorter);
 
   filter = gtk_every_filter_new ();
 
@@ -830,7 +829,6 @@ gtk_print_unix_dialog_init (GtkPrintUnixDialog *dialog)
   gtk_multi_filter_append (GTK_MULTI_FILTER (filter), filter1);
 
   filtered = G_LIST_MODEL (gtk_filter_list_model_new (sorted, filter));
-  g_object_unref (filter);
 
   selection = G_LIST_MODEL (gtk_single_selection_new (filtered));
   gtk_single_selection_set_autoselect (GTK_SINGLE_SELECTION (selection), FALSE);
@@ -840,7 +838,6 @@ gtk_print_unix_dialog_init (GtkPrintUnixDialog *dialog)
   g_signal_connect_swapped (selection, "notify::selected", G_CALLBACK (selected_printer_changed), dialog);
   g_object_unref (selection);
   g_object_unref (filtered);
-  g_object_unref (model);
 
   gtk_print_load_custom_papers (dialog->custom_paper_list);
 

gtk/gtkslicelistmodel.c

@@ -30,11 +30,12 @@
  * @short_description: A list model that presents a slice out of a larger list
  * @see_also: #GListModel
  *
- * #GtkSliceListModel is a list model that takes a list model and presents a slice of
+ * #GtkSliceListModel is a list model that takes a list model and presents a
- * that model.
+ * slice of that model.
  *
- * This is useful when implementing paging by setting the size to the number of elements
+ * This is useful when implementing paging by setting the size to the number
- * per page and updating the offset whenever a different page is opened.
+ * of elements per page and updating the offset whenever a different page is
+ * opened.
  */
 
 #define DEFAULT_SIZE 10
@@ -300,7 +301,7 @@ gtk_slice_list_model_init (GtkSliceListModel *self)
 
 /**
  * gtk_slice_list_model_new:
- * @model: (transfer none) (allow-none): The model to use
+ * @model: (transfer full) (allow-none): The model to use, or %NULL
  * @offset: the offset of the slice
  * @size: maximum size of the slice
  *
@@ -314,13 +315,20 @@ gtk_slice_list_model_new (GListModel *model,
                           guint       offset,
                           guint       size)
 {
+  GtkSliceListModel *self;
+
   g_return_val_if_fail (model == NULL || G_IS_LIST_MODEL (model), NULL);
 
-  return g_object_new (GTK_TYPE_SLICE_LIST_MODEL,
+  self = g_object_new (GTK_TYPE_SLICE_LIST_MODEL,
                        "model", model,
                        "offset", offset,
                        "size", size,
                        NULL);
+
+  /* consume the reference */
+  g_clear_object (&model);
+
+  return self;
 }
 
 /**

gtk/gtksortlistmodel.c

@@ -828,8 +828,8 @@ gtk_sort_list_model_init (GtkSortListModel *self)
 
 /**
  * gtk_sort_list_model_new:
- * @model: (allow-none): the model to sort
+ * @model: (allow-none) (transfer full): the model to sort, or %NULL
- * @sorter: (allow-none): the #GtkSorter to sort @model with
+ * @sorter: (allow-none) (transfer full): the #GtkSorter to sort @model with, or %NULL
  *
  * Creates a new sort list model that uses the @sorter to sort @model.
  *
@@ -849,6 +849,10 @@ gtk_sort_list_model_new (GListModel *model,
                          "sorter", sorter,
                          NULL);
 
+  /* consume the references */
+  g_clear_object (&model);
+  g_clear_object (&sorter);
+
   return result;
 }
 

gtk/gtktreelistmodel.c

@@ -734,8 +734,8 @@ gtk_tree_list_model_init (GtkTreeListModel *self)
 
 /**
  * gtk_tree_list_model_new:
+ * @root: (transfer full): The #GListModel to use as root
  * @passthrough: %TRUE to pass through items from the models
- * @root: The #GListModel to use as root
  * @autoexpand: %TRUE to set the autoexpand property and expand the @root model
  * @create_func: Function to call to create the #GListModel for the children
  *     of an item
@@ -747,8 +747,8 @@ gtk_tree_list_model_init (GtkTreeListModel *self)
  * Returns: a newly created #GtkTreeListModel.
  **/
 GtkTreeListModel *
-gtk_tree_list_model_new (gboolean                         passthrough,
+gtk_tree_list_model_new (GListModel                      *root,
-                         GListModel                      *root,
+                         gboolean                         passthrough,
                          gboolean                         autoexpand,
                          GtkTreeListModelCreateModelFunc  create_func,
                          gpointer                         user_data,
@@ -768,7 +768,7 @@ gtk_tree_list_model_new (gboolean                         passthrough,
   self->user_data = user_data;
   self->user_destroy = user_destroy;
 
-  gtk_tree_list_model_init_node (self, &self->root_node, g_object_ref (root));
+  gtk_tree_list_model_init_node (self, &self->root_node, root);
 
   return self;
 }

gtk/gtktreelistmodel.h

@@ -58,8 +58,8 @@ G_DECLARE_FINAL_TYPE (GtkTreeListRow, gtk_tree_list_row, GTK, TREE_LIST_ROW, GOb
 typedef GListModel * (* GtkTreeListModelCreateModelFunc) (gpointer item, gpointer user_data);
 
 GDK_AVAILABLE_IN_ALL
-GtkTreeListModel *      gtk_tree_list_model_new                 (gboolean                passthrough,
+GtkTreeListModel *      gtk_tree_list_model_new                 (GListModel             *root,
-                                                                 GListModel             *root,
+                                                                 gboolean                passthrough,
                                                                  gboolean                autoexpand,
                                                                  GtkTreeListModelCreateModelFunc create_func,
                                                                  gpointer                user_data,

gtk/inspector/actions.c

@@ -46,7 +46,7 @@ struct _GtkInspectorActions
 
   GObject *object;
 
-  GListModel *actions;
+  GListStore *actions;
   GtkColumnViewColumn *name;
 };
 
@@ -79,7 +79,7 @@ action_added (GObject             *owner,
               GtkInspectorActions *sl)
 {
   ActionHolder *holder = action_holder_new (owner, action_name);
-  g_list_store_append (G_LIST_STORE (sl->actions), holder);
+  g_list_store_append (sl->actions, holder);
   g_object_unref (holder);
 }
 
@@ -283,7 +283,7 @@ add_muxer (GtkInspectorActions *sl,
 static gboolean
 reload (GtkInspectorActions *sl)
 {
-  g_list_store_remove_all (G_LIST_STORE (sl->actions));
+  g_list_store_remove_all (sl->actions);
 
   if (GTK_IS_APPLICATION (sl->object))
     {
@@ -395,9 +395,9 @@ constructed (GObject *object)
   gtk_column_view_column_set_sorter (sl->name, sorter);
   g_object_unref (sorter);
 
-  sl->actions = G_LIST_MODEL (g_list_store_new (ACTION_TYPE_HOLDER));
+  sl->actions = g_list_store_new (ACTION_TYPE_HOLDER);
-  sorted = G_LIST_MODEL (gtk_sort_list_model_new (sl->actions,
+  sorted = G_LIST_MODEL (gtk_sort_list_model_new (g_object_ref (G_LIST_MODEL (sl->actions)),
-                                                  gtk_column_view_get_sorter (GTK_COLUMN_VIEW (sl->list))));
+                                                  g_object_ref (gtk_column_view_get_sorter (GTK_COLUMN_VIEW (sl->list)))));
   model = G_LIST_MODEL (gtk_no_selection_new (sorted));
   gtk_column_view_set_model (GTK_COLUMN_VIEW (sl->list), model);
   g_object_unref (sorted);

gtk/inspector/controllers.c

@@ -249,7 +249,6 @@ gtk_inspector_controllers_set_object (GtkInspectorControllers *self,
 
   sorter = gtk_custom_sorter_new (compare_controllers, NULL, NULL);
   sort_model = gtk_sort_list_model_new (G_LIST_MODEL (flatten_model), sorter);
-  g_object_unref (sorter);
 
   gtk_list_box_bind_model (GTK_LIST_BOX (self->listbox),
                            G_LIST_MODEL (sort_model),
@@ -258,7 +257,6 @@ gtk_inspector_controllers_set_object (GtkInspectorControllers *self,
                            NULL);
 
   g_object_unref (sort_model);
-  g_object_unref (flatten_model);
 }
 
 static void

gtk/inspector/object-tree.c

@@ -1151,8 +1151,7 @@ create_root_model (GdkDisplay *display)
   g_object_unref (special);
 
   filter = gtk_filter_list_model_new (NULL, NULL);
-  custom_filter = gtk_custom_filter_new (toplevel_filter_func,
+  custom_filter = gtk_custom_filter_new (toplevel_filter_func, display, NULL);
-                                         display, NULL);
   gtk_filter_list_model_set_filter (filter, custom_filter);
   gtk_filter_list_model_set_model (filter, gtk_window_get_toplevels ());
   g_list_store_append (list, filter);
@@ -1299,18 +1298,13 @@ void
 gtk_inspector_object_tree_set_display (GtkInspectorObjectTree *wt,
                                        GdkDisplay *display)
 {
-  GListModel *root_model;
+  wt->priv->tree_model = gtk_tree_list_model_new (create_root_model (display),
-
+                                                  FALSE,
-  root_model = create_root_model (display);
-  wt->priv->tree_model = gtk_tree_list_model_new (FALSE,
-                                                  root_model,
                                                   FALSE,
                                                   create_model_for_object,
                                                   NULL,
                                                   NULL);
   wt->priv->selection = gtk_single_selection_new (G_LIST_MODEL (wt->priv->tree_model));
-  g_object_unref (root_model);
-
   gtk_column_view_set_model (GTK_COLUMN_VIEW (wt->priv->list),
                              G_LIST_MODEL (wt->priv->selection));
 }

gtk/inspector/prop-list.c

@@ -622,7 +622,7 @@ gtk_inspector_prop_list_set_object (GtkInspectorPropList *pl,
   if (GTK_IS_WIDGET (object))
     g_signal_connect_object (object, "destroy", G_CALLBACK (cleanup_object), pl, G_CONNECT_SWAPPED);
 
-  filtered = G_LIST_MODEL (gtk_filter_list_model_new (G_LIST_MODEL (store), pl->priv->filter));
+  filtered = G_LIST_MODEL (gtk_filter_list_model_new (G_LIST_MODEL (store), g_object_ref (pl->priv->filter)));
   sorted = gtk_sort_list_model_new (filtered, NULL);
   list = G_LIST_MODEL (gtk_no_selection_new (G_LIST_MODEL (sorted)));
 
@@ -634,8 +634,6 @@ gtk_inspector_prop_list_set_object (GtkInspectorPropList *pl,
 
   g_object_unref (list);
   g_object_unref (sorted);
-  g_object_unref (filtered);
-  g_object_unref (store);
 
   return TRUE;
 }

gtk/inspector/recorder.c

@@ -1234,8 +1234,8 @@ gtk_inspector_recorder_init (GtkInspectorRecorder *recorder)
                            NULL);
 
   recorder->render_node_root_model = g_list_store_new (GDK_TYPE_PAINTABLE);
-  recorder->render_node_model = gtk_tree_list_model_new (FALSE,
+  recorder->render_node_model = gtk_tree_list_model_new (g_object_ref (G_LIST_MODEL (recorder->render_node_root_model)),
-                                                     G_LIST_MODEL (recorder->render_node_root_model),
+                                                     FALSE,
                                                      TRUE,
                                                      create_list_model_for_render_node_paintable,
                                                      NULL, NULL);

gtk/inspector/resource-list.c

@@ -692,7 +692,6 @@ static void
 constructed (GObject *object)
 {
   GtkInspectorResourceList *rl = GTK_INSPECTOR_RESOURCE_LIST (object);
-  GListModel *root_model;
   GListModel *sort_model;
   GtkSorter *column_sorter;
   GtkSorter *sorter;
@@ -702,9 +701,8 @@ constructed (GObject *object)
   g_signal_connect (rl->close_details_button, "clicked",
                     G_CALLBACK (close_details), rl);
  
-  root_model = load_resources ();
+  rl->tree_model = gtk_tree_list_model_new (load_resources (),
-  rl->tree_model = gtk_tree_list_model_new (FALSE,
+                                            FALSE,
-                                            root_model,
                                             FALSE,
                                             create_model_for_object,
                                             NULL,
@@ -712,11 +710,9 @@ constructed (GObject *object)
 
   column_sorter = gtk_column_view_get_sorter (GTK_COLUMN_VIEW (rl->list));
   sorter = gtk_tree_list_row_sorter_new (g_object_ref (column_sorter));
-  sort_model = G_LIST_MODEL (gtk_sort_list_model_new (G_LIST_MODEL (rl->tree_model), sorter));
+  sort_model = G_LIST_MODEL (gtk_sort_list_model_new (g_object_ref (G_LIST_MODEL (rl->tree_model)), sorter));
   rl->selection = gtk_single_selection_new (sort_model);
-  g_object_unref (root_model);
   g_object_unref (sort_model);
-  g_object_unref (sorter);
 
   gtk_column_view_set_model (GTK_COLUMN_VIEW (rl->list), G_LIST_MODEL (rl->selection));
 

tests/testcolumnview.c

@@ -746,12 +746,11 @@ main (int argc, char *argv[])
       dirmodel = create_list_model_for_directory (root);
       g_object_unref (root);
     }
-  tree = gtk_tree_list_model_new (FALSE,
+  tree = gtk_tree_list_model_new (dirmodel,
-                                  dirmodel,
+                                  FALSE,
                                   TRUE,
                                   create_list_model_for_file_info,
                                   NULL, NULL);
-  g_object_unref (dirmodel);
 
   sorter = gtk_tree_list_row_sorter_new (g_object_ref (gtk_column_view_get_sorter (GTK_COLUMN_VIEW (view))));
   sort = gtk_sort_list_model_new (G_LIST_MODEL (tree), sorter);
@@ -759,7 +758,6 @@ main (int argc, char *argv[])
   custom_filter = gtk_custom_filter_new (match_file, g_object_ref (search_entry), g_object_unref);
   filter = gtk_filter_list_model_new (G_LIST_MODEL (sort), custom_filter);
   g_signal_connect (search_entry, "search-changed", G_CALLBACK (search_changed_cb), custom_filter);
-  g_object_unref (custom_filter);
 
   gtk_column_view_set_model (GTK_COLUMN_VIEW (view), G_LIST_MODEL (filter));
 
@@ -771,8 +769,6 @@ main (int argc, char *argv[])
   gtk_box_append (GTK_BOX (vbox), statusbar);
 
   g_object_unref (filter);
-  g_object_unref (sort);
-  g_object_unref (tree);
 
   list = gtk_list_view_new_with_factory (
              gtk_builder_list_item_factory_new_from_bytes (scope, g_bytes_new_static (factory_ui, strlen (factory_ui))));

tests/testlistdnd.c

@@ -191,8 +191,8 @@ create_child_model (gpointer item,
 static GListModel *
 create_tree_model (guint n, guint m)
 {
-  return G_LIST_MODEL (gtk_tree_list_model_new (FALSE,
+  return G_LIST_MODEL (gtk_tree_list_model_new (create_model (0, n, m, TRUE),
-                                                create_model (0, n, m, TRUE),
+                                                FALSE,
                                                 FALSE,
                                                 create_child_model,
                                                 GUINT_TO_POINTER (m), NULL));

tests/testlistview-animating.c

@@ -127,7 +127,6 @@ main (int   argc,
     add (store);
   sorter = gtk_numeric_sorter_new (gtk_cclosure_expression_new (G_TYPE_UINT, NULL, 0, NULL, (GCallback)get_number, NULL, NULL));
   sort = gtk_sort_list_model_new (G_LIST_MODEL (store), sorter);
-  g_object_unref (sorter);
 
   win = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (win), 400, 600);
@@ -182,7 +181,5 @@ main (int   argc,
   while (g_list_model_get_n_items (toplevels))
     g_main_context_iteration (NULL, TRUE);
 
-  g_object_unref (store);
-
   return 0;
 }

tests/testlistview.c

@@ -318,7 +318,6 @@ get_file_path (GFileInfo *info)
 static GListModel *
 create_list_model_for_directory (gpointer file)
 {
-  GtkSortListModel *sort;
   GtkDirectoryList *dir;
   GtkSorter *sorter;
 
@@ -327,12 +326,8 @@ create_list_model_for_directory (gpointer file)
 
   dir = create_directory_list (file);
   sorter = gtk_string_sorter_new (gtk_cclosure_expression_new (G_TYPE_STRING, NULL, 0, NULL, (GCallback) get_file_path, NULL, NULL));
-  sort = gtk_sort_list_model_new (G_LIST_MODEL (dir), sorter);
 
-  g_object_unref (sorter);
+  return G_LIST_MODEL (gtk_sort_list_model_new (G_LIST_MODEL (dir), sorter));
-  g_object_unref (dir);
-
-  return G_LIST_MODEL (sort);
 }
 
 typedef struct _RowData RowData;
@@ -594,7 +589,6 @@ int
 main (int argc, char *argv[])
 {
   GtkWidget *win, *vbox, *sw, *listview, *search_entry, *statusbar;
-  GListModel *dirmodel;
   GtkTreeListModel *tree;
   GtkFilterListModel *filter;
   GtkFilter *custom_filter;
@@ -628,19 +622,16 @@ main (int argc, char *argv[])
     root = g_file_new_for_commandline_arg (argv[1]);
   else
     root = g_file_new_for_path (g_get_current_dir ());
-  dirmodel = create_list_model_for_directory (root);
+  tree = gtk_tree_list_model_new (create_list_model_for_directory (root),
-  tree = gtk_tree_list_model_new (FALSE,
+                                  FALSE,
-                                  dirmodel,
                                   TRUE,
                                   create_list_model_for_file_info,
                                   NULL, NULL);
-  g_object_unref (dirmodel);
   g_object_unref (root);
 
   custom_filter = gtk_custom_filter_new (match_file, search_entry, NULL);
   filter = gtk_filter_list_model_new (G_LIST_MODEL (tree), custom_filter);
   g_signal_connect (search_entry, "search-changed", G_CALLBACK (search_changed_cb), custom_filter);
-  g_object_unref (custom_filter);
 
   selectionmodel = file_info_selection_new (G_LIST_MODEL (filter));
   g_object_unref (filter);
@@ -654,7 +645,6 @@ main (int argc, char *argv[])
   update_statusbar (GTK_STATUSBAR (statusbar));
   gtk_box_append (GTK_BOX (vbox), statusbar);
 
-  g_object_unref (tree);
   g_object_unref (selectionmodel);
 
   gtk_widget_show (win);

testsuite/gtk/expression.c

@@ -262,8 +262,6 @@ test_nested (void)
   g_assert_cmpint (counter, ==, 0);
 
   g_object_unref (filtered);
-  g_object_unref (list);
-  g_object_unref (filter);
   gtk_expression_unref (expr);
 }
 

testsuite/gtk/filter.c

@@ -189,7 +189,7 @@ new_model (guint      size,
 {
   GtkFilterListModel *result;
 
-  result = gtk_filter_list_model_new (G_LIST_MODEL (new_store (1, size, 1)), filter);
+  result = gtk_filter_list_model_new (g_object_ref (G_LIST_MODEL (new_store (1, size, 1))), g_object_ref (filter));
 
   return result;
 }

testsuite/gtk/filterlistmodel-exhaustive.c

@@ -135,6 +135,10 @@ filter_list_model_new (GListModel *source,
   GListStore *check;
   guint i;
 
+  if (source)
+    g_object_ref (source);
+  if (filter)
+    g_object_ref (filter);
   model = gtk_filter_list_model_new (source, filter);
   check = g_list_store_new (G_TYPE_OBJECT);
   for (i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (model)); i++)

testsuite/gtk/filterlistmodel.c

@@ -167,8 +167,7 @@ new_model (guint               size,
     filter = gtk_custom_filter_new (filter_func, data, NULL);
   else
     filter = NULL;
-  result = gtk_filter_list_model_new (G_LIST_MODEL (new_store (1, size, 1)), filter);
+  result = gtk_filter_list_model_new (g_object_ref (G_LIST_MODEL (new_store (1, size, 1))), filter);
-  g_clear_object (&filter);
   changes = g_string_new ("");
   g_object_set_qdata_full (G_OBJECT(result), changes_quark, changes, free_changes);
   g_signal_connect (result, "items-changed", G_CALLBACK (items_changed), changes);

testsuite/gtk/multiselection.c

@@ -627,7 +627,7 @@ test_set_model (void)
   
   store = new_store (1, 5, 1);
   m1 = G_LIST_MODEL (store);
-  m2 = G_LIST_MODEL (gtk_slice_list_model_new (m1, 0, 3));
+  m2 = G_LIST_MODEL (gtk_slice_list_model_new (g_object_ref (m1), 0, 3));
   selection = new_model (store);
   assert_selection (selection, "");
   assert_selection_changes (selection, "");

testsuite/gtk/singleselection.c

@@ -653,7 +653,7 @@ test_set_model (void)
   
   store = new_store (1, 5, 1);
   m1 = G_LIST_MODEL (store);
-  m2 = G_LIST_MODEL (gtk_slice_list_model_new (m1, 0, 3));
+  m2 = G_LIST_MODEL (gtk_slice_list_model_new (g_object_ref (m1), 0, 3));
   selection = new_model (store, TRUE, TRUE);
   assert_selection (selection, "1");
   assert_selection_changes (selection, "");

testsuite/gtk/slicelistmodel.c

@@ -191,7 +191,7 @@ new_model (GListStore *store, guint offset, guint size)
   GtkSliceListModel *result;
   GString *changes;
 
-  result = gtk_slice_list_model_new (G_LIST_MODEL (store), offset, size);
+  result = gtk_slice_list_model_new (g_object_ref (G_LIST_MODEL (store)), offset, size);
 
   changes = g_string_new ("");
   g_object_set_qdata_full (G_OBJECT(result), changes_quark, changes, free_changes);

testsuite/gtk/sorter.c

@@ -247,7 +247,7 @@ new_model (guint      size,
 {
   GtkSortListModel *result;
 
-  result = gtk_sort_list_model_new (G_LIST_MODEL (fisher_yates_shuffle (new_store (1, size, 1))), sorter);
+  result = gtk_sort_list_model_new (G_LIST_MODEL (fisher_yates_shuffle (new_store (1, size, 1))), g_object_ref (sorter));
 
   return result;
 }
@@ -630,8 +630,8 @@ test_stable (void)
   gtk_multi_sorter_append (GTK_MULTI_SORTER (multi), b);
   model1 = new_model (20, multi);
   g_object_unref (multi);
-  model2b = gtk_sort_list_model_new (gtk_sort_list_model_get_model (model1), b);
+  model2b = gtk_sort_list_model_new (g_object_ref (gtk_sort_list_model_get_model (model1)), b);
-  model2 = gtk_sort_list_model_new (G_LIST_MODEL (model2b), a);
+  model2 = gtk_sort_list_model_new (g_object_ref (G_LIST_MODEL (model2b)), a);
   assert_model_equal (model1, model2);
 
   modify_sorter (a);

testsuite/gtk/sortlistmodel-exhaustive.c

@@ -200,9 +200,9 @@ create_sort_list_model (gconstpointer  model_id,
   guint id = GPOINTER_TO_UINT (model_id);
 
   if (track_changes)
-    model = sort_list_model_new (id & 1 ? NULL : source, id & 2 ? NULL : sorter);
+    model = sort_list_model_new (id & 1 ? NULL : g_object_ref (source), id & 2 ? NULL : g_object_ref (sorter));
   else
-    model = gtk_sort_list_model_new (id & 1 ? NULL : source, id & 2 ? NULL : sorter);
+    model = gtk_sort_list_model_new (id & 1 ? NULL : g_object_ref (source), id & 2 ? NULL : g_object_ref (sorter));
 
   switch (id >> 2)
   {

testsuite/gtk/sortlistmodel.c

@@ -220,8 +220,7 @@ new_model (gpointer model)
       GtkSorter *sorter;
 
       sorter = gtk_custom_sorter_new (compare, NULL, NULL);
-      result = gtk_sort_list_model_new (model, sorter);
+      result = gtk_sort_list_model_new (g_object_ref (model), sorter);
-      g_object_unref (sorter);
     }
   else
     result = gtk_sort_list_model_new (NULL, NULL);

testsuite/gtk/treelistmodel.c

@@ -170,7 +170,7 @@ new_model (guint    size,
   GtkTreeListModel *tree;
   GString *changes;
 
-  tree = gtk_tree_list_model_new (TRUE, G_LIST_MODEL (new_store (size, size, size)), expanded, create_sub_model_cb, NULL, NULL);
+  tree = gtk_tree_list_model_new (G_LIST_MODEL (new_store (size, size, size)), TRUE, expanded, create_sub_model_cb, NULL, NULL);
   changes = g_string_new ("");
   g_object_set_qdata_full (G_OBJECT(tree), changes_quark, changes, free_changes);
   g_signal_connect (tree, "items-changed", G_CALLBACK (items_changed), changes);

testsuite/gtk/treesorter.c

@@ -158,8 +158,8 @@ new_child_model (gpointer item,
 static GListModel *
 new_model (guint size)
 {
-  return G_LIST_MODEL (gtk_tree_list_model_new (FALSE,
+  return G_LIST_MODEL (gtk_tree_list_model_new (G_LIST_MODEL (new_store (1, size, 1)),
-                                                G_LIST_MODEL (new_store (1, size, 1)),
+                                                FALSE,
                                                 TRUE,
                                                 new_child_model,
                                                 NULL, NULL));
@@ -179,9 +179,7 @@ test_simple (void)
   sort = gtk_sort_list_model_new (model, sorter);
   assert_model (sort, "1 2 21 3 31 32 321");
 
-  g_object_unref (sorter);
   g_object_unref (sort);
-  g_object_unref (model);
 }
 
 static GtkSorter *