Remove ambiguities pointed out by gcc.

2005-08-10  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_deleted)
	(gtk_tree_model_filter_remove_node): Remove ambiguities pointed
	out by gcc.
This commit is contained in:
Matthias Clasen 2005-08-10 04:15:43 +00:00 committed by Matthias Clasen
parent 749227685f
commit b7bd68546c
4 changed files with 22 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2005-08-10 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_deleted)
(gtk_tree_model_filter_remove_node): Remove ambiguities pointed
out by gcc.
2005-08-10 James Henstridge <james@jamesh.id.au> 2005-08-10 James Henstridge <james@jamesh.id.au>
* configure.in: fix definition of GDK_DEP_CFLAGS so that it * configure.in: fix definition of GDK_DEP_CFLAGS so that it

View File

@ -1,3 +1,9 @@
2005-08-10 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_deleted)
(gtk_tree_model_filter_remove_node): Remove ambiguities pointed
out by gcc.
2005-08-10 James Henstridge <james@jamesh.id.au> 2005-08-10 James Henstridge <james@jamesh.id.au>
* configure.in: fix definition of GDK_DEP_CFLAGS so that it * configure.in: fix definition of GDK_DEP_CFLAGS so that it

View File

@ -1,3 +1,9 @@
2005-08-10 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_deleted)
(gtk_tree_model_filter_remove_node): Remove ambiguities pointed
out by gcc.
2005-08-10 James Henstridge <james@jamesh.id.au> 2005-08-10 James Henstridge <james@jamesh.id.au>
* configure.in: fix definition of GDK_DEP_CFLAGS so that it * configure.in: fix definition of GDK_DEP_CFLAGS so that it

View File

@ -906,7 +906,8 @@ gtk_tree_model_filter_remove_node (GtkTreeModelFilter *filter,
{ {
g_array_remove_index (level->array, i); g_array_remove_index (level->array, i);
for (i = MAX (--i, 0); i < level->array->len; i++) i--;
for (i = MAX (i, 0); i < level->array->len; i++)
{ {
/* NOTE: here we do *not* decrease offsets, because the node was /* NOTE: here we do *not* decrease offsets, because the node was
* not removed from the child model * not removed from the child model
@ -1594,7 +1595,8 @@ gtk_tree_model_filter_row_deleted (GtkTreeModel *c_model,
offset = tmp->offset; offset = tmp->offset;
g_array_remove_index (level->array, i); g_array_remove_index (level->array, i);
for (i = MAX (--i, 0); i < level->array->len; i++) i--;
for (i = MAX (i, 0); i < level->array->len; i++)
{ {
elt = &g_array_index (level->array, FilterElt, i); elt = &g_array_index (level->array, FilterElt, i);
if (elt->offset > offset) if (elt->offset > offset)