callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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)
This commit is contained in:
Owen Taylor
2003-08-26 14:04:52 +00:00
committed by Owen Taylor
parent a3344d22b6
commit d8c62d66c2
6 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2003-08-26 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize * gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize

5
ChangeLog.pre-2-10
View File

@ -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> 2003-08-26 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize * gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize

5
ChangeLog.pre-2-4
View File

@ -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> 2003-08-26 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize * gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize

5
ChangeLog.pre-2-6
View File

@ -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> 2003-08-26 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize * gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize

5
ChangeLog.pre-2-8
View File

@ -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> 2003-08-26 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize * gtk/gtkuimanager.[hc] (gtk_ui_manager_add_ui_from_string): Use gssize

3
gdk/x11/gdkkeys-x11.c
View File

@ -297,6 +297,7 @@ update_keymaps (GdkKeymapX11 *keymap_x11)
gint keycode = keymap_x11->mod_keymap->modifiermap[i]; gint keycode = keymap_x11->mod_keymap->modifiermap[i];
gint j; gint j;
KeySym *syms; KeySym *syms;
guint mask;
/* Ignore invalid keycodes. */ /* Ignore invalid keycodes. */
if (keycode < keymap_x11->min_keycode || if (keycode < keymap_x11->min_keycode ||
@ -308,7 +309,7 @@ update_keymaps (GdkKeymapX11 *keymap_x11)
/* The fourth modifier, GDK_MOD1_MASK is 1 << 3. /* The fourth modifier, GDK_MOD1_MASK is 1 << 3.
* Each group of max_keypermod entries refers to the same modifier. * 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) switch (mask)
{ {