diff options
author | Matthias Clasen <mclasen@redhat.com> | 2020-07-26 16:38:53 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2020-07-26 16:38:53 -0400 |
commit | 16b043a1279e1cf3fa3070ccc018b40bc28baf58 (patch) | |
tree | 200eb9d6043ac25804d5da0d392ecda85984696b /tests | |
parent | 0b7f7028d918e7efb90fc986146d4945e2419d46 (diff) | |
download | gtk+-tree-list-constructor.tar.gz |
treelistmodel: Make constructor transfer fulltree-list-constructor
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.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/testcolumnview.c | 5 | ||||
-rw-r--r-- | tests/testlistdnd.c | 4 | ||||
-rw-r--r-- | tests/testlistview.c | 7 |
3 files changed, 6 insertions, 10 deletions
diff --git a/tests/testcolumnview.c b/tests/testcolumnview.c index a77c93ca0b..e60eab6746 100644 --- a/tests/testcolumnview.c +++ b/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, - dirmodel, + tree = gtk_tree_list_model_new (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); diff --git a/tests/testlistdnd.c b/tests/testlistdnd.c index 2d8f7f4b7e..533f0a8d38 100644 --- a/tests/testlistdnd.c +++ b/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, - create_model (0, n, m, TRUE), + return G_LIST_MODEL (gtk_tree_list_model_new (create_model (0, n, m, TRUE), + FALSE, FALSE, create_child_model, GUINT_TO_POINTER (m), NULL)); diff --git a/tests/testlistview.c b/tests/testlistview.c index 6eea54d593..c0552d14af 100644 --- a/tests/testlistview.c +++ b/tests/testlistview.c @@ -589,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; @@ -623,13 +622,11 @@ 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 (FALSE, - dirmodel, + tree = gtk_tree_list_model_new (create_list_model_for_directory (root), + FALSE, 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); |