Fix memory management issues

[platform/upstream/at-spi2-core.git] / registryd / keymasks.h

diff --git a/registryd/keymasks.h b/registryd/keymasks.h
index 6dc95ad..9f6c2c9 100644 (file)
--- a/registryd/keymasks.h
+++ b/registryd/keymasks.h
@@ -6,45 +6,45 @@
  * Copyright 2001, 2002 Ximian, Inc.
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef SPI_KEYMASKS_H_
 #define SPI_KEYMASKS_H_
 
-#include <X11/Xlib.h>
 #include <glib.h>
 
 G_BEGIN_DECLS
 
 typedef unsigned long SpiKeyMaskType;
 
-#define SPI_KEYMASK_ALT       Mod1Mask
-#define SPI_KEYMASK_MOD1      Mod1Mask
-#define SPI_KEYMASK_MOD2      Mod2Mask
-#define SPI_KEYMASK_MOD3      Mod3Mask
-#define SPI_KEYMASK_MOD4      Mod4Mask
-#define SPI_KEYMASK_MOD5      Mod5Mask
-#define SPI_KEYMASK_BUTTON1   Button1Mask
-#define SPI_KEYMASK_BUTTON2   Button2Mask
-#define SPI_KEYMASK_BUTTON3   Button3Mask
-#define SPI_KEYMASK_BUTTON4   Button4Mask
-#define SPI_KEYMASK_BUTTON5   Button5Mask
-#define SPI_KEYMASK_CONTROL   ControlMask
-#define SPI_KEYMASK_SHIFT     ShiftMask
-#define SPI_KEYMASK_SHIFTLOCK LockMask
+/* Values taken from Xlib.h */
+#define SPI_KEYMASK_ALT       (1<<3)  /* Mod1Mask */
+#define SPI_KEYMASK_MOD1      (1<<3)  /* Mod1Mask */
+#define SPI_KEYMASK_MOD2      (1<<4)  /* Mod2Mask */
+#define SPI_KEYMASK_MOD3      (1<<5)  /* Mod3Mask */
+#define SPI_KEYMASK_MOD4      (1<<6)  /* Mod4Mask */
+#define SPI_KEYMASK_MOD5      (1<<7)  /* Mod5Mask */
+#define SPI_KEYMASK_BUTTON1   (1L<<8)  /* Button1Mask */
+#define SPI_KEYMASK_BUTTON2   (1L<<9)  /* Button2Mask */
+#define SPI_KEYMASK_BUTTON3   (1L<<10)  /* Button3Mask */
+#define SPI_KEYMASK_BUTTON4   (1L<<11)  /* Button4Mask */
+#define SPI_KEYMASK_BUTTON5   (1L<<12)  /* Button5Mask */
+#define SPI_KEYMASK_CONTROL   (1<<2)  /* ControlMask */
+#define SPI_KEYMASK_SHIFT     (1<<0)  /* ShiftMask */
+#define SPI_KEYMASK_SHIFTLOCK (1<<1)  /* LockMask */
 #define SPI_KEYMASK_NUMLOCK   (1<<14)
 #define SPI_KEYMASK_UNMODIFIED 0