xserver-xorg-input-evtouch: Changes to 'debian-unstable'

[Mattia Dongili]

 ChangeLog |    4 ++--
 evtouch.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 75ec0bde2f26d23393ecb54c558e2e225ad25014
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date:   Sat May 12 12:16:12 2007 +0900

    Update to upstream latest 0.8.5
    
    Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>

diff --git a/ChangeLog b/ChangeLog
index 48a0d7b..751dbba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
-0.8.5-rc1
-       - Made Events in libtouch configurable
+0.8.5
+       - Made Events in libtouch configurable (experimental)
        - Changed initialization for Xorg 7.2
 
 0.8.4
diff --git a/evtouch.c b/evtouch.c
index 9f10e6e..92fd7eb 100644
--- a/evtouch.c
+++ b/evtouch.c
@@ -880,7 +880,7 @@ ConvertProc ( LocalDevicePtr local,
 
         EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private);  
        ScrnInfoPtr pScrn = xf86Screens[priv->screen_num];
-       Rotation r = RRGetRotation(pScrn->pScreen);
+       Rotation rotation = RRGetRotation(pScrn->pScreen);
 
         DBGOUT(2, "FIRST: v0=%d   v1=%d\n", v0, v1);
 
@@ -1027,7 +1027,7 @@ ConvertProc ( LocalDevicePtr local,
                         v1 = xc;
                 }
 
-               switch (r) {
+               switch (rotation) {
                        case RR_Rotate_0:
                                v0 = xc;
                                v1 = yc;


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]