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.

diff --git a/ChangeLog b/ChangeLog
index f4fd015fd19ce3751ca7f51844dfa3e6ed437967..a886f8f11d896c97c27c6520b9ff666ae6057680 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 f4fd015fd19ce3751ca7f51844dfa3e6ed437967..a886f8f11d896c97c27c6520b9ff666ae6057680 100644 (file)
--- 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 f4fd015fd19ce3751ca7f51844dfa3e6ed437967..a886f8f11d896c97c27c6520b9ff666ae6057680 100644 (file)
--- 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 f4fd015fd19ce3751ca7f51844dfa3e6ed437967..a886f8f11d896c97c27c6520b9ff666ae6057680 100644 (file)
--- 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 f4fd015fd19ce3751ca7f51844dfa3e6ed437967..a886f8f11d896c97c27c6520b9ff666ae6057680 100644 (file)
--- 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 a327fd26045e95631aa50d05ccd2883f3196f852..1f5d029a39932bfe05b0a3e854214ec5ae21cac4 100644 (file)
--- 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;