diff options
| author | Manish Singh <yosh@gimp.org> | 2003-12-05 23:33:59 +0000 |
|---|---|---|
| committer | Manish Singh <yosh@src.gnome.org> | 2003-12-05 23:33:59 +0000 |
| commit | 532062df96b3129ded3174d20fe71f0a007c4237 (patch) | |
| tree | 5cfdecd91c37062600d48888a4035aeda90850db | |
| parent | 8ad788e914492cd1a48861550e99b010bfa6e24f (diff) | |
| download | gtk+-532062df96b3129ded3174d20fe71f0a007c4237.tar.gz | |
Applied patch from Ross McFarland <rwmcfa1@neces.com>, initialize *count_p
Fri Dec 5 15:30:16 2003 Manish Singh <yosh@gimp.org>
* gtk/gtkaccelgroup.c (quick_accel_find): Applied patch from
Ross McFarland <rwmcfa1@neces.com>, initialize *count_p to 0
before doing anything to prevent garbage returns.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | gtk/gtkaccelgroup.c | 4 |
6 files changed, 33 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Fri Dec 5 15:30:16 2003 Manish Singh <yosh@gimp.org> + + * gtk/gtkaccelgroup.c (quick_accel_find): Applied patch from + Ross McFarland <rwmcfa1@neces.com>, initialize *count_p to 0 + before doing anything to prevent garbage returns. + Sat Dec 6 00:23:46 2003 Matthias Clasen <maclas@gmx.de> * gtk/gtkviewport.c: Implement RTL flipping for diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f4fd015fd1..a886f8f11d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Fri Dec 5 15:30:16 2003 Manish Singh <yosh@gimp.org> + + * gtk/gtkaccelgroup.c (quick_accel_find): Applied patch from + Ross McFarland <rwmcfa1@neces.com>, initialize *count_p to 0 + before doing anything to prevent garbage returns. + Sat Dec 6 00:23:46 2003 Matthias Clasen <maclas@gmx.de> * gtk/gtkviewport.c: Implement RTL flipping for diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f4fd015fd1..a886f8f11d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Fri Dec 5 15:30:16 2003 Manish Singh <yosh@gimp.org> + + * gtk/gtkaccelgroup.c (quick_accel_find): Applied patch from + Ross McFarland <rwmcfa1@neces.com>, initialize *count_p to 0 + before doing anything to prevent garbage returns. + Sat Dec 6 00:23:46 2003 Matthias Clasen <maclas@gmx.de> * gtk/gtkviewport.c: Implement RTL flipping for diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f4fd015fd1..a886f8f11d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Fri Dec 5 15:30:16 2003 Manish Singh <yosh@gimp.org> + + * gtk/gtkaccelgroup.c (quick_accel_find): Applied patch from + Ross McFarland <rwmcfa1@neces.com>, initialize *count_p to 0 + before doing anything to prevent garbage returns. + Sat Dec 6 00:23:46 2003 Matthias Clasen <maclas@gmx.de> * gtk/gtkviewport.c: Implement RTL flipping for diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f4fd015fd1..a886f8f11d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Fri Dec 5 15:30:16 2003 Manish Singh <yosh@gimp.org> + + * gtk/gtkaccelgroup.c (quick_accel_find): Applied patch from + Ross McFarland <rwmcfa1@neces.com>, initialize *count_p to 0 + before doing anything to prevent garbage returns. + Sat Dec 6 00:23:46 2003 Matthias Clasen <maclas@gmx.de> * gtk/gtkviewport.c: Implement RTL flipping for diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c index a327fd2604..1f5d029a39 100644 --- a/gtk/gtkaccelgroup.c +++ b/gtk/gtkaccelgroup.c @@ -443,6 +443,8 @@ quick_accel_find (GtkAccelGroup *accel_group, GtkAccelGroupEntry *entry; GtkAccelGroupEntry key; + *count_p = 0; + if (!accel_group->n_accels) return NULL; @@ -460,7 +462,7 @@ quick_accel_find (GtkAccelGroup *accel_group, entry[-1].key.accel_mods != accel_mods) break; /* count equal members */ - for (*count_p = 0; entry + *count_p < accel_group->priv_accels + accel_group->n_accels; (*count_p)++) + for (; entry + *count_p < accel_group->priv_accels + accel_group->n_accels; (*count_p)++) if (entry[*count_p].key.accel_key != accel_key || entry[*count_p].key.accel_mods != accel_mods) break; |