callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treemodelfilter: Make the constructor binding friendly

Browse Source 
This means reffing the root in the set property implementation,
rather than in the constructor. We don't need to unref the root
on set, as it's a CONSTRUCT_ONLY property.

https://bugzilla.gnome.org/show_bug.cgi?id=680065
This commit is contained in:
Jasper St. Pierre
2012-07-15 21:14:33 -04:00
parent a61b359498
commit 7ee5e7af70
1 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gtk/gtktreemodelfilter.c
View File

@ -3758,10 +3758,14 @@ gtk_tree_model_filter_set_root (GtkTreeModelFilter *filter,
{ {
g_return_if_fail (GTK_IS_TREE_MODEL_FILTER (filter)); g_return_if_fail (GTK_IS_TREE_MODEL_FILTER (filter));
if (!root) if (root)
filter->priv->virtual_root = NULL; {
filter->priv->virtual_root = gtk_tree_path_copy (root);
gtk_tree_model_filter_ref_path (filter, filter->priv->virtual_root);
filter->priv->virtual_root_deleted = FALSE;
}
else else
filter->priv->virtual_root = gtk_tree_path_copy (root); filter->priv->virtual_root = NULL;
} }
/* public API */ /* public API */
@ -3782,24 +3786,12 @@ GtkTreeModel *
gtk_tree_model_filter_new (GtkTreeModel *child_model, gtk_tree_model_filter_new (GtkTreeModel *child_model,
GtkTreePath *root) GtkTreePath *root)
{ {
GtkTreeModel *retval;
GtkTreeModelFilter *filter;
g_return_val_if_fail (GTK_IS_TREE_MODEL (child_model), NULL); g_return_val_if_fail (GTK_IS_TREE_MODEL (child_model), NULL);
retval = g_object_new (GTK_TYPE_TREE_MODEL_FILTER, return g_object_new (GTK_TYPE_TREE_MODEL_FILTER,
"child-model", child_model, "child-model", child_model,
"virtual-root", root, "virtual-root", root,
NULL); NULL);
filter = GTK_TREE_MODEL_FILTER (retval);
if (filter->priv->virtual_root)
{
gtk_tree_model_filter_ref_path (filter, filter->priv->virtual_root);
filter->priv->virtual_root_deleted = FALSE;
}
return retval;
} }
/** /**