Attachment 15433 Details for Bug 14449 – patch

[patch] patch

wrapping.diff (text/plain), 1.30 KB, created by Tom Jaeger on 2008-03-24 13:41:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Jaeger

Created: 2008-03-24 13:41:39 UTC

Size: 1.30 KB

patch

obsolete

>diff --git a/include/xkbsrv.h b/include/xkbsrv.h
>index 167dbec..0352006 100644
>--- a/include/xkbsrv.h
>+++ b/include/xkbsrv.h
>@@ -263,7 +263,7 @@ typedef struct
> 	device->unwrapProc = unwrapproc;
> 
> #define UNWRAP_PROCESS_INPUT_PROC(device, oldprocs, backupproc) \
>-        backupproc = device->public.processInputProc; \
>+        backupproc = device->public.realInputProc; \
> 	device->public.processInputProc = oldprocs->processInputProc; \
> 	device->public.realInputProc = oldprocs->realInputProc; \
> 	device->unwrapProc = oldprocs->unwrapProc;
>diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
>index 8ddbdba..7af3e9e 100644
>--- a/xkb/xkbActions.c
>+++ b/xkb/xkbActions.c
>@@ -50,15 +50,14 @@ xkbUnwrapProc(DeviceIntPtr device, DeviceHandleProc proc,
>                    pointer data)
> {
>     xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(device);
>-    ProcessInputProc tmp = device->public.processInputProc;
>-    ProcessInputProc dummy; /* unused, but neede for macro */
>+    ProcessInputProc backupproc;
>     if(xkbPrivPtr->unwrapProc)
> 	xkbPrivPtr->unwrapProc = NULL;
> 
>-    UNWRAP_PROCESS_INPUT_PROC(device,xkbPrivPtr, dummy);
>+    UNWRAP_PROCESS_INPUT_PROC(device,xkbPrivPtr, backupproc);
>     proc(device,data);
>     WRAP_PROCESS_INPUT_PROC(device,xkbPrivPtr,
>-			    tmp,xkbUnwrapProc);
>+			    backupproc,xkbUnwrapProc);
> }
> 
>

Actions: View | Splinter Review

Attachments on bug 14449: 15433

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.