diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-06-30 19:07:16 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-06-30 19:07:16 +0000 |
| commit | 58824aa9bb80cdd9a4f27968781ec73406e878a4 (patch) | |
| tree | 0b059802b94959b0521d85b6e5ec9659dc398be4 | |
| parent | 9e4d008d25572f0d2d167319cd62595e6d077123 (diff) | |
| download | gdk-pixbuf-58824aa9bb80cdd9a4f27968781ec73406e878a4.tar.gz | |
Clarify the code, gcc 4 complains about predecrement in MAX().
2005-06-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_fetch_child):
Clarify the code, gcc 4 complains about predecrement in MAX().
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 3 | ||||
| -rw-r--r-- | gtk/gtktreemodelfilter.c | 5 |
4 files changed, 13 insertions, 1 deletions
@@ -1,5 +1,8 @@ 2005-06-30 Matthias Clasen <mclasen@redhat.com> + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_fetch_child): + Clarify the code, gcc 4 complains about predecrement in MAX(). + * modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): Don't prematurely unregister callbacks. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1c7b2030d..385763a09 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-06-30 Matthias Clasen <mclasen@redhat.com> + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_fetch_child): + Clarify the code, gcc 4 complains about predecrement in MAX(). + * modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): Don't prematurely unregister callbacks. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1c7b2030d..385763a09 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2005-06-30 Matthias Clasen <mclasen@redhat.com> + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_fetch_child): + Clarify the code, gcc 4 complains about predecrement in MAX(). + * modules/input/gtkimcontextxim.c (gtk_im_context_xim_finalize): Don't prematurely unregister callbacks. diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c index ca68253c2..d786d55fa 100644 --- a/gtk/gtktreemodelfilter.c +++ b/gtk/gtktreemodelfilter.c @@ -827,7 +827,10 @@ gtk_tree_model_filter_fetch_child (GtkTreeModelFilter *filter, g_array_insert_val (level->array, i, elt); *index = i; - for (i = MAX (--i, 0); i < level->array->len; i++) + if (i > 0) + i--; + + for ( ; i < level->array->len; i++) { FilterElt *e = &(g_array_index (level->array, FilterElt, i)); if (e->children) |