gdm r5898 - in trunk: . gui/simple-greeter

[halfline svn gnome org]

Author: halfline
Date: Fri Feb 29 22:00:26 2008
New Revision: 5898
URL: http://svn.gnome.org/viewvc/gdm?rev=5898&view=rev

Log:
2008-02-29  Ray Strode  <rstrode redhat com>

	* gui/simple-greeter/gdm-greeter-login-window.c
	(is_capslock_on): return state of caps lock key,
	not state of caps lock indicator light


Modified:
   trunk/ChangeLog
   trunk/gui/simple-greeter/gdm-greeter-login-window.c

Modified: trunk/gui/simple-greeter/gdm-greeter-login-window.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-login-window.c	(original)
+++ trunk/gui/simple-greeter/gdm-greeter-login-window.c	Fri Feb 29 22:00:26 2008
@@ -178,16 +178,16 @@
 static gboolean
 is_capslock_on (void)
 {
-        unsigned int states;
+        XkbStateRec states;
         Display     *dsp;
 
         dsp = GDK_DISPLAY ();
 
-        if (XkbGetIndicatorState (dsp, XkbUseCoreKbd, &states) != Success) {
-                return FALSE;
+        if (XkbGetState (dsp, XkbUseCoreKbd, &states) != Success) {
+              return FALSE;
         }
 
-        return (states & ShiftMask) != 0;
+        return (states.locked_mods & LockMask) != 0;
 }
 
 static void