AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 13:41:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip/otte/for-main' into 'main'

Browse Source 
treemodelfilter: Yes gcc, both if branches are empty

See merge request GNOME/gtk!6401
This commit is contained in:
Benjamin Otte 2023-09-16 17:07:10 +00:00
commit cf8f6d254e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/deprecated/gtktreemodelfilter.c
View File

@ -734,10 +734,12 @@ gtk_tree_model_filter_build_level (GtkTreeModelFilter *filter,
g_assert (filter->priv->child_model != NULL); g_assert (filter->priv->child_model != NULL);
/* Avoid building a level that already exists */ /* Avoid building a level that already exists */
#ifndef G_DISABLE_ASSERT
if (parent_level) if (parent_level)
g_assert (parent_elt->children == NULL); g_assert (parent_elt->children == NULL);
else else
g_assert (filter->priv->root == NULL); g_assert (filter->priv->root == NULL);
#endif
if (filter->priv->in_row_deleted) if (filter->priv->in_row_deleted)
return; return;

5
gtk/deprecated/gtktreeview.c
View File

@ -12833,7 +12833,10 @@ gtk_tree_view_is_blank_at_pos (GtkTreeView *tree_view,
*column = real_column; *column = real_column;
gtk_tree_model_get_iter (priv->model, &iter, real_path); 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) */ /* Check if there's an expander arrow at (x, y) */
if (real_column == priv->expander_column if (real_column == priv->expander_column