[Xfce4-commits] r25658 - xfwm4/branches/xfce_4_4/src

[Olivier Fourdan]

Author: olivier
Date: 2007-05-01 15:03:56 +0000 (Tue, 01 May 2007)
New Revision: 25658

Modified:
   xfwm4/branches/xfce_4_4/src/keyboard.c
Log:
Small cleanup

Modified: xfwm4/branches/xfce_4_4/src/keyboard.c
===================================================================
--- xfwm4/branches/xfce_4_4/src/keyboard.c	2007-05-01 15:01:52 UTC (rev 25657)
+++ xfwm4/branches/xfce_4_4/src/keyboard.c	2007-05-01 15:03:56 UTC (rev 25658)
@@ -261,14 +261,18 @@
     XModifierKeymap *xmk = XGetModifierMapping (dpy);
     int m, k;
 
-    AltMask = MetaMask = NumLockMask = ScrollLockMask =
-        SuperMask = HyperMask = 0;
+    AltMask = 0;
+    MetaMask = 0;
+    NumLockMask = 0;
+    ScrollLockMask = 0;
+    SuperMask = 0;
+    HyperMask = 0;
+
     if (xmk)
     {
         KeyCode *c = xmk->modifiermap;
         KeyCode numLockKeyCode;
         KeyCode scrollLockKeyCode;
-        KeyCode capsLockKeyCode;
         KeyCode altKeyCode;
         KeyCode metaKeyCode;
         KeyCode superKeyCode;
@@ -276,7 +280,6 @@
 
         numLockKeyCode = XKeysymToKeycode (dpy, XK_Num_Lock);
         scrollLockKeyCode = XKeysymToKeycode (dpy, XK_Scroll_Lock);
-        capsLockKeyCode = XKeysymToKeycode (dpy, XK_Caps_Lock);
         altKeyCode = XKeysymToKeycode (dpy, XK_Alt_L);
         metaKeyCode = XKeysymToKeycode (dpy, XK_Meta_L);
         superKeyCode = XKeysymToKeycode (dpy, XK_Super_L);
@@ -299,7 +302,6 @@
             hyperKeyCode = XKeysymToKeycode (dpy, XK_Hyper_R);
         }
 
-
         for (m = 0; m < 8; m++)
         {
             for (k = 0; k < xmk->max_keypermod; k++, c++)