diff options
| author | Brian Cameron <bcameron@src.gnome.org> | 2005-10-28 22:13:15 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2005-10-28 22:13:15 +0000 |
| commit | c0b3ed33c31ef4e1fe54645009af4f3d56a78c38 (patch) | |
| tree | d0ee583f225f42dbfe4c9e51216982fd48e8cdaf | |
| parent | be017d6531d3afcbcfd50e2a4faf4e245101610b (diff) | |
| download | gdm-c0b3ed33c31ef4e1fe54645009af4f3d56a78c38.tar.gz | |
2005-10-28 Brian Cameron <brian.cameron@sun.com.
* gui/greeter/greeter_item_capslock.c: Patch to
make GDM warn correctly about caps lock if an
alternative keymap is enabled. Now use
kbGetState instead of XkbGetIndicatorState.
Fixes bug #317732. Patch provided by
Sebastien Bacher <seb128@debian.org>.
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | gui/greeter/greeter_item_capslock.c | 6 |
2 files changed, 10 insertions, 9 deletions
@@ -1,11 +1,12 @@ 2005-10-28 Brian Cameron <brian.cameron@sun.com. - * gui/gdmlogin.c: Patch to make GDM warn - correctly about caps lock if an alternative - keymap is enabled. Now use kbGetState - instead of XkbGetIndicatorState. Fixes - bug #317732. Patch provided by Sebastien - Bacher <seb128@debian.org>. + * gui/gdmlogin.c, + gui/greeter/greeter_item_capslock.c: Patch to + make GDM warn correctly about caps lock if an + alternative keymap is enabled. Now use + kbGetState instead of XkbGetIndicatorState. + Fixes bug #317732. Patch provided by + Sebastien Bacher <seb128@debian.org>. 2005-10-28 Jürg Billeter <j@bitron.ch> diff --git a/gui/greeter/greeter_item_capslock.c b/gui/greeter/greeter_item_capslock.c index 9aca3071..cdfbcbce 100644 --- a/gui/greeter/greeter_item_capslock.c +++ b/gui/greeter/greeter_item_capslock.c @@ -65,7 +65,7 @@ get_parent_display (void) gboolean greeter_is_capslock_on (void) { - unsigned int states; + XkbStateRec states; Display *dsp; /* HACK! incredible hack, if this is set we get @@ -75,10 +75,10 @@ greeter_is_capslock_on (void) if (dsp == NULL) dsp = GDK_DISPLAY (); - if (XkbGetIndicatorState (dsp, XkbUseCoreKbd, &states) != Success) + if (XkbGetState (dsp, XkbUseCoreKbd, &states) != Success) return FALSE; - return (states & ShiftMask) != 0; + return (states.locked_mods & LockMask) != 0; } |