Merge from trunk:

2008-01-10  Kristian Rietveld  <kris@imendio.com>

	Merge from trunk:

	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_get_path): Fix
	a leak of the path (#504611, patch from Sadrul Habib Chowdhury).


svn path=/branches/gtk-2-12/; revision=19336
This commit is contained in:
Kristian Rietveld
2008-01-10 10:39:47 +00:00
committed by Kristian Rietveld
parent 04c303be84
commit 1817e87aaf
2 changed files with 9 additions and 1 deletions

View File

@@ -1,3 +1,10 @@
2008-01-10 Kristian Rietveld <kris@imendio.com>
Merge from trunk:
* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_get_path): Fix
a leak of the path (#504611, patch from Sadrul Habib Chowdhury).
2008-01-10 Kristian Rietveld <kris@imendio.com>
Merge from trunk (omitted unit test updates):

View File

@@ -2216,13 +2216,14 @@ gtk_tree_model_filter_get_path (GtkTreeModel *model,
g_return_val_if_fail (GTK_TREE_MODEL_FILTER (model)->priv->child_model != NULL, NULL);
g_return_val_if_fail (GTK_TREE_MODEL_FILTER (model)->priv->stamp == iter->stamp, NULL);
retval = gtk_tree_path_new ();
level = iter->user_data;
elt = iter->user_data2;
if (!elt->visible)
return NULL;
retval = gtk_tree_path_new ();
while (level)
{
int i = 0, index = 0;