xserver-xorg-input-dmc: Changes to 'upstream-experimental'

[Julien Cristau <jcristau@alioth.debian.org>]

 configure.ac  |    2 +-
 src/xf86DMC.c |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit a588412e30c6e1d23817c8a559e4e3b583f980e2
Author: Adam Jackson <ajax@redhat.com>
Date:   Thu Mar 20 15:17:39 2008 -0400

    dmc 1.1.2

diff --git a/configure.ac b/configure.ac
index 2b16013..6b2bc1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-dmc],
-        1.1.1,
+        1.1.2,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-input-dmc)
 

commit c4e0ea36b83e72a4c49e5dbaa861e9e70cce0127
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date:   Wed Jan 30 16:53:08 2008 -0200

    Don't call xf86XInputSetSendCoreEvents
    
    Only call that function if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0.

diff --git a/src/xf86DMC.c b/src/xf86DMC.c
index 352ff30..e6797d8 100644
--- a/src/xf86DMC.c
+++ b/src/xf86DMC.c
@@ -122,7 +122,9 @@ static const char *reqSymbols[] = {
 	"xf86SetIntOption",
 	"xf86SetStrOption",
 	"xf86XInputSetScreen",
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
 	"xf86XInputSetSendCoreEvents",
+#endif
 	NULL
 };
 
@@ -561,11 +563,13 @@ SwitchMode (ClientPtr client, DeviceIntPtr dev, int mode)
                 priv->reporting_mode = mode;
                 return (Success);
         }
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
         else if ((mode == SendCoreEvents) || (mode == DontSendCoreEvents))
         {
                 xf86XInputSetSendCoreEvents (pInfo, (mode == SendCoreEvents));
                 return (Success);
         }
+#endif
         else
                 return (!Success);   
 }