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

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

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

New commits:
commit 2f052f7442df5f4d0a6b271f72f61e93731ed8a7
Author: Adam Jackson <ajax@redhat.com>
Date:   Thu Mar 20 15:22:46 2008 -0400

    dynapro 1.1.2

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

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

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

diff --git a/src/xf86Dyna.c b/src/xf86Dyna.c
index 69c9651..0a899f0 100644
--- a/src/xf86Dyna.c
+++ b/src/xf86Dyna.c
@@ -114,7 +114,9 @@ static const char *reqSymbols[] = {
 	"xf86SetIntOption",
 	"xf86SetStrOption",
 	"xf86XInputSetScreen",
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
 	"xf86XInputSetSendCoreEvents",
+#endif
 	NULL
 };
 
@@ -494,11 +496,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);   
 }