diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-08-10 04:15:43 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-08-10 04:15:43 +0000 |
| commit | b7bd68546c26680524975147acc0795491ba9f45 (patch) | |
| tree | 19b9ce7d2859e3da4c06623859fd103e5fe5fdc3 | |
| parent | 749227685f24cfda54fa5f1b966e7f9068567077 (diff) | |
| download | gdk-pixbuf-b7bd68546c26680524975147acc0795491ba9f45.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | gtk/gtktreemodelfilter.c | 6 |
4 files changed, 22 insertions, 2 deletions
@@ -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> * configure.in: fix definition of GDK_DEP_CFLAGS so that it diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index dd16a5320..fcb022ed0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -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> * configure.in: fix definition of GDK_DEP_CFLAGS so that it diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index dd16a5320..fcb022ed0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -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> * configure.in: fix definition of GDK_DEP_CFLAGS so that it diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c index d786d55fa..85a89b77b 100644 --- a/gtk/gtktreemodelfilter.c +++ b/gtk/gtktreemodelfilter.c @@ -906,7 +906,8 @@ gtk_tree_model_filter_remove_node (GtkTreeModelFilter *filter, { 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 * not removed from the child model @@ -1594,7 +1595,8 @@ gtk_tree_model_filter_row_deleted (GtkTreeModel *c_model, offset = tmp->offset; 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); if (elt->offset > offset) |