mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-25 21:21:21 +00:00
Merge branch 'wip/otte/for-main' into 'main'
treemodelfilter: Yes gcc, both if branches are empty See merge request GNOME/gtk!6401
This commit is contained in:
commit
cf8f6d254e
@ -734,10 +734,12 @@ gtk_tree_model_filter_build_level (GtkTreeModelFilter *filter,
|
||||
g_assert (filter->priv->child_model != NULL);
|
||||
|
||||
/* Avoid building a level that already exists */
|
||||
#ifndef G_DISABLE_ASSERT
|
||||
if (parent_level)
|
||||
g_assert (parent_elt->children == NULL);
|
||||
else
|
||||
g_assert (filter->priv->root == NULL);
|
||||
#endif
|
||||
|
||||
if (filter->priv->in_row_deleted)
|
||||
return;
|
||||
|
@ -12833,7 +12833,10 @@ gtk_tree_view_is_blank_at_pos (GtkTreeView *tree_view,
|
||||
*column = real_column;
|
||||
|
||||
gtk_tree_model_get_iter (priv->model, &iter, real_path);
|
||||
_gtk_tree_view_find_node (tree_view, real_path, &tree, &node);
|
||||
if (!_gtk_tree_view_find_node (tree_view, real_path, &tree, &node))
|
||||
{
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
|
||||
/* Check if there's an expander arrow at (x, y) */
|
||||
if (real_column == priv->expander_column
|
||||
|
Loading…
Reference in New Issue
Block a user