xserver-xorg-input-penmount: Changes to 'upstream-experimental'
configure.ac | 2 +-
src/xf86PM.c | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit d66c0b070d6a80b7b5d98cf364149fbc2df81fac
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 20 16:40:15 2008 -0400
penmount 1.3.0
diff --git a/configure.ac b/configure.ac
index a207053..b245f5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-penmount],
- 1.2.1,
+ 1.3.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-penmount)
commit 600e029c61c012c7a7eb1075a805fbc01681962a
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Jan 30 17:37:28 2008 -0200
Don't call xf86XInputSetSendCoreEvents.
Only call that function if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0.
diff --git a/src/xf86PM.c b/src/xf86PM.c
index 0a6d1ad..612b68b 100644
--- a/src/xf86PM.c
+++ b/src/xf86PM.c
@@ -121,7 +121,9 @@ static const char *reqSymbols[] = {
"xf86SetIntOption",
"xf86SetStrOption",
"xf86XInputSetScreen",
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
"xf86XInputSetSendCoreEvents",
+#endif
NULL
};
@@ -786,11 +788,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);
}
Reply to: