[gnome-settings-daemon] wacom: Use the constants from the Wacom driver directly

[Bastien Nocera <hadess src gnome org>]

commit cbdef2351c10f509c19a639a830342ae71833801
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Feb 20 11:01:48 2012 +0100

    wacom: Use the constants from the Wacom driver directly
    
    Rather than copy/pasting them.

 configure.ac                      |    2 +-
 plugins/wacom/gsd-wacom-manager.c |   19 +------------------
 2 files changed, 2 insertions(+), 19 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 035db01..fef343f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -199,7 +199,7 @@ dnl ---------------------------------------------------------------------------
 dnl - wacom
 dnl ---------------------------------------------------------------------------
 
-PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION])
+PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
 
 dnl ==============================================
 dnl PackageKit section
diff --git a/plugins/wacom/gsd-wacom-manager.c b/plugins/wacom/gsd-wacom-manager.c
index ec35244..5019462 100644
--- a/plugins/wacom/gsd-wacom-manager.c
+++ b/plugins/wacom/gsd-wacom-manager.c
@@ -37,6 +37,7 @@
 #include <X11/Xatom.h>
 #include <X11/extensions/XTest.h>
 #include <X11/keysym.h>
+#include <Xwacom.h>
 
 #include "gsd-enums.h"
 #include "gsd-input-helper.h"
@@ -374,24 +375,6 @@ apply_stylus_settings (GsdWacomDevice *device)
 	set_pressurethreshold (device, threshold);
 }
 
-/* Copied from Xwacom.h in linuxwacom */
-
-/* The following flags are used for XWACOM_PARAM_BUTTON# values to mark
- * the type of event that should be emitted when that button is pressed;
- * combined together they form an Action Code (AC).
- */
-#define AC_CODE             0x0000ffff	/* Mask to isolate button number or key code */
-#define AC_BUTTON           0x00000000	/* Emit button events */
-#define AC_KEY              0x00010000	/* Emit key events */
-#define AC_MODETOGGLE       0x00020000	/* Toggle absolute/relative mode */
-#define AC_DBLCLICK         0x00030000	/* Emit a button1 double-click event */
-#define AC_DISPLAYTOGGLE    0x00040000  /* Toggle among displays (screen plus whole desktop) */
-#define AC_SCREENTOGGLE     0x00050000  /* Toggle among screens */
-#define AC_TYPE             0x000f0000	/* The mask to isolate event type bits */
-#define AC_NUM_KEYS         0x0ff00000  /* The mask to isolate number of keys to send */
-#define AC_CORE             0x10000000	/* Always emit a core event */
-#define AC_EVENT            0xf00f0000	/* Mask to isolate event flag */
-
 static struct {
 	const char *button;
 	int         num;