AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-05 16:20:10 +00:00
Code Issues Projects Releases Wiki Activity

Fixes from David Hampton <hampton@employees.org> via gtk-devel-list.

Browse Source 
Mon Sep  8 21:44:20 2003  Kristian Rietveld  <kris@gtk.org>

	Fixes from David Hampton <hampton@employees.org> via gtk-devel-list.

	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_elt_get_path): fix
	the call to gtk_tree_model_filter_add_root,
	(gtk_tree_model_filter_row_changed): bail out if c_path is not above
	the virtual root, allow building levels on the second try to convert
	the child path to a filter path,
	(gtk_tree_model_filter_convert_iter_to_child_iter): pass the virtual
	root when calling gtk_tree_model_filter_elt_get_path.
This commit is contained in:
Kristian Rietveld 2003-09-08 19:51:16 +00:00 committed by Kristian Rietveld
parent 96196a4e47
commit 51f98b6a70
6 changed files with 69 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
Mon Sep 8 21:44:20 2003 Kristian Rietveld <kris@gtk.org>
Fixes from David Hampton <hampton@employees.org> via gtk-devel-list.
* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_elt_get_path): fix
the call to gtk_tree_model_filter_add_root,
(gtk_tree_model_filter_row_changed): bail out if c_path is not above
the virtual root, allow building levels on the second try to convert
the child path to a filter path,
(gtk_tree_model_filter_convert_iter_to_child_iter): pass the virtual
root when calling gtk_tree_model_filter_elt_get_path.
2003-09-07 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c (update_node): Fix a C99ism. (#121640,

12
ChangeLog.pre-2-10
View File

@ -1,3 +1,15 @@
Mon Sep 8 21:44:20 2003 Kristian Rietveld <kris@gtk.org>
Fixes from David Hampton <hampton@employees.org> via gtk-devel-list.
* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_elt_get_path): fix
the call to gtk_tree_model_filter_add_root,
(gtk_tree_model_filter_row_changed): bail out if c_path is not above
the virtual root, allow building levels on the second try to convert
the child path to a filter path,
(gtk_tree_model_filter_convert_iter_to_child_iter): pass the virtual
root when calling gtk_tree_model_filter_elt_get_path.
2003-09-07 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c (update_node): Fix a C99ism. (#121640,

12
ChangeLog.pre-2-4
View File

@ -1,3 +1,15 @@
Mon Sep 8 21:44:20 2003 Kristian Rietveld <kris@gtk.org>
Fixes from David Hampton <hampton@employees.org> via gtk-devel-list.
* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_elt_get_path): fix
the call to gtk_tree_model_filter_add_root,
(gtk_tree_model_filter_row_changed): bail out if c_path is not above
the virtual root, allow building levels on the second try to convert
the child path to a filter path,
(gtk_tree_model_filter_convert_iter_to_child_iter): pass the virtual
root when calling gtk_tree_model_filter_elt_get_path.
2003-09-07 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c (update_node): Fix a C99ism. (#121640,

12
ChangeLog.pre-2-6
View File

@ -1,3 +1,15 @@
Mon Sep 8 21:44:20 2003 Kristian Rietveld <kris@gtk.org>
Fixes from David Hampton <hampton@employees.org> via gtk-devel-list.
* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_elt_get_path): fix
the call to gtk_tree_model_filter_add_root,
(gtk_tree_model_filter_row_changed): bail out if c_path is not above
the virtual root, allow building levels on the second try to convert
the child path to a filter path,
(gtk_tree_model_filter_convert_iter_to_child_iter): pass the virtual
root when calling gtk_tree_model_filter_elt_get_path.
2003-09-07 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c (update_node): Fix a C99ism. (#121640,

12
ChangeLog.pre-2-8
View File

@ -1,3 +1,15 @@
Mon Sep 8 21:44:20 2003 Kristian Rietveld <kris@gtk.org>
Fixes from David Hampton <hampton@employees.org> via gtk-devel-list.
* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_elt_get_path): fix
the call to gtk_tree_model_filter_add_root,
(gtk_tree_model_filter_row_changed): bail out if c_path is not above
the virtual root, allow building levels on the second try to convert
the child path to a filter path,
(gtk_tree_model_filter_convert_iter_to_child_iter): pass the virtual
root when calling gtk_tree_model_filter_elt_get_path.
2003-09-07 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c (update_node): Fix a C99ism. (#121640,

14
gtk/gtktreemodelfilter.c
View File

@ -584,9 +584,7 @@ gtk_tree_model_filter_elt_get_path (FilterLevel *level,
if (root)
{
real_path = gtk_tree_path_copy (root);
gtk_tree_model_filter_add_root (real_path, path);
real_path = gtk_tree_model_filter_add_root (path, root);
gtk_tree_path_free (path);
return real_path;
}
@ -1019,6 +1017,12 @@ gtk_tree_model_filter_row_changed (GtkTreeModel *c_model,
else
gtk_tree_model_get_iter (c_model, &real_c_iter, c_path);
/* is this node above the virtual root? */
if (filter->priv->virtual_root
&& (gtk_tree_path_get_depth (filter->priv->virtual_root)
>= gtk_tree_path_get_depth (c_path)))
goto done;
/* what's the requested state? */
requested_state = gtk_tree_model_filter_visible (filter, &real_c_iter);
@ -1096,7 +1100,7 @@ gtk_tree_model_filter_row_changed (GtkTreeModel *c_model,
if (!path)
path = gtk_real_tree_model_filter_convert_child_path_to_path (filter,
c_path,
FALSE,
TRUE,
TRUE);
g_return_if_fail (path != NULL);
@ -2505,7 +2509,7 @@ gtk_tree_model_filter_convert_iter_to_child_iter (GtkTreeModelFilter *filter,
path = gtk_tree_model_filter_elt_get_path (filter_iter->user_data,
filter_iter->user_data2,
NULL);
filter->priv->virtual_root);
gtk_tree_model_get_iter (filter->priv->child_model, child_iter, path);
gtk_tree_path_free (path);
}