diff options
| author | marha <marha@users.sourceforge.net> | 2013-06-21 10:37:30 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-06-21 10:37:30 +0200 |
| commit | 84f6a75a56f4749f91a51a161c1989cbc8807b80 (patch) | |
| tree | e72d3e4ee697bb7f35a2dccb6f17edf3a03a6d78 /xorg-server/hw/xwin/winmultiwindowclass.c | |
| parent | 6ac57d622cdabb2db9f8dce51f0313892e6bd1aa (diff) | |
| parent | 7f9fb534564d0eb8a62cf444e569a07166e5ee03 (diff) | |
| download | vcxsrv-84f6a75a56f4749f91a51a161c1989cbc8807b80.tar.gz vcxsrv-84f6a75a56f4749f91a51a161c1989cbc8807b80.tar.bz2 vcxsrv-84f6a75a56f4749f91a51a161c1989cbc8807b80.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa git update 21 June 2013
Conflicts:
xorg-server/hw/xwin/windialogs.c
xorg-server/hw/xwin/winmultiwindowclass.c
Diffstat (limited to 'xorg-server/hw/xwin/winmultiwindowclass.c')
| -rwxr-xr-x[-rw-r--r--] | xorg-server/hw/xwin/winmultiwindowclass.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/hw/xwin/winmultiwindowclass.c b/xorg-server/hw/xwin/winmultiwindowclass.c index 96f69727f..e95c138a8 100644..100755 --- a/xorg-server/hw/xwin/winmultiwindowclass.c +++ b/xorg-server/hw/xwin/winmultiwindowclass.c @@ -222,7 +222,7 @@ winMultiWindowGetWMNormalHints(WindowPtr pWin, WinXSizeHints * hints) } int -winMultiWindowGetTransientFor(WindowPtr pWin, WindowPtr *ppDaddy) +winMultiWindowGetTransientFor(WindowPtr pWin, Window *pDaddyId) { struct _Window *pwin; struct _Property *prop; @@ -239,15 +239,15 @@ winMultiWindowGetTransientFor(WindowPtr pWin, WindowPtr *ppDaddy) else prop = NULL; - if (ppDaddy) - *ppDaddy = NULL; + if (pDaddyId) + *pDaddyId = 0; while (prop) { if (prop->propertyName == XA_WM_TRANSIENT_FOR && prop->format == 32 && prop->data) { if (ppDaddy) - memcpy (ppDaddy, prop->data, 4*(int)prop->size); /* format/8 = 4 */ + memcpy (pDaddy, prop->data, 4*(int)prop->size); /* format/8 = 4 */ return 1; } else |