Fix variable declaration not at start of block. (#120371, Damien Carbery)

Tue Aug 26 09:57:38 2003  Owen Taylor  <otaylor@redhat.com>

        * gdk/x11/gdkkeys-x11.c (update_keymaps): Fix variable
        declaration not at start of block. (#120371, Damien Carbery)

diff --git a/ChangeLog b/ChangeLog
index ecc50faf57ba03e6528423adc424ac37617c48d3..b7b8a6230ba11c78f2263506eedf66fe9ee01b13 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 26 09:57:38 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkkeys-x11.c (update_keymaps): Fix variable
+       declaration not at start of block. (#120371, Damien Carbery)
+
 2003-08-26  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ecc50faf57ba03e6528423adc424ac37617c48d3..b7b8a6230ba11c78f2263506eedf66fe9ee01b13 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Aug 26 09:57:38 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkkeys-x11.c (update_keymaps): Fix variable
+       declaration not at start of block. (#120371, Damien Carbery)
+
 2003-08-26  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ecc50faf57ba03e6528423adc424ac37617c48d3..b7b8a6230ba11c78f2263506eedf66fe9ee01b13 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Tue Aug 26 09:57:38 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkkeys-x11.c (update_keymaps): Fix variable
+       declaration not at start of block. (#120371, Damien Carbery)
+
 2003-08-26  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ecc50faf57ba03e6528423adc424ac37617c48d3..b7b8a6230ba11c78f2263506eedf66fe9ee01b13 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Aug 26 09:57:38 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkkeys-x11.c (update_keymaps): Fix variable
+       declaration not at start of block. (#120371, Damien Carbery)
+
 2003-08-26  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ecc50faf57ba03e6528423adc424ac37617c48d3..b7b8a6230ba11c78f2263506eedf66fe9ee01b13 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Aug 26 09:57:38 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkkeys-x11.c (update_keymaps): Fix variable
+       declaration not at start of block. (#120371, Damien Carbery)
+
 2003-08-26  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize 

diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index ee87b4fa80bf924df46c74e3a55f8cc3ad0fe22c..5b26b34a12c24e8b6782b41feb1d1eaa5fde9348 100644 (file)
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -297,6 +297,7 @@ update_keymaps (GdkKeymapX11 *keymap_x11)
           gint keycode = keymap_x11->mod_keymap->modifiermap[i];
           gint j;
           KeySym *syms;
+         guint mask;
 
           /* Ignore invalid keycodes. */
           if (keycode < keymap_x11->min_keycode ||
@@ -308,7 +309,7 @@ update_keymaps (GdkKeymapX11 *keymap_x11)
           /* The fourth modifier, GDK_MOD1_MASK is 1 << 3.
           * Each group of max_keypermod entries refers to the same modifier.
            */
-          guint mask = 1 << (i / keymap_x11->mod_keymap->max_keypermod);
+          mask = 1 << (i / keymap_x11->mod_keymap->max_keypermod);
 
           switch (mask)
             {