diff options
| author | Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au> | 2008-04-07 07:56:41 +0930 |
|---|---|---|
| committer | Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au> | 2008-04-07 07:56:41 +0930 |
| commit | fd06e8f8c1d82a9d91931e8532bee0fd9c9ca9ab (patch) | |
| tree | fda1a9d90f4a3e99af9da656939ff8c112cfeb33 /hw/xwin | |
| parent | b46a00918691cbd5ca80b6d3acae7614f93e073b (diff) | |
| parent | 6c0cfe3d43b177c4cfaf7e228f32c655f9a98459 (diff) | |
Merge branch 'master' into dcdc_rework
Conflicts:
Xext/xevie.c
dix/dispatch.c
Diffstat (limited to 'hw/xwin')
| -rwxr-xr-x | hw/xwin/winwin32rootless.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/xwin/winwin32rootless.c b/hw/xwin/winwin32rootless.c index 4b4cd3ded..6f4e2c97e 100755 --- a/hw/xwin/winwin32rootless.c +++ b/hw/xwin/winwin32rootless.c @@ -1087,6 +1087,6 @@ winMWExtWMSetNativeProperty (RootlessWindowPtr pFrame) /* FIXME: move this to WindowsWM extension */ lData = (long) pRLWinPriv->hWnd; - ChangeWindowProperty (pFrame->win, AtmWindowsWmNativeHwnd (), - XA_INTEGER, 32, PropModeReplace, 1, &lData, TRUE); + dixChangeWindowProperty(serverClient, pFrame->win, AtmWindowsWmNativeHwnd(), + XA_INTEGER, 32, PropModeReplace, 1, &lData, TRUE); } |