diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2013-03-31 18:35:35 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2013-06-10 15:48:08 +0100 |
| commit | e1a0945e8d4a3858838a14e64022524efd73c905 (patch) | |
| tree | d63c556b0080f661880e75c10dfe786aa3e33f0d /hw/xwin/winmultiwindowclass.c | |
| parent | be201ac257687355bf0916d7c525d598ed9b1282 (diff) | |
hw/xwin: winMultiWindowGetTransientFor() returns an XID not a WindowPtr
winMultiWindowGetTransientFor() accesses the WM_TRANSIENT_FOR property, which is
an X window XID (which we compare with WINDOW_WID_PROP) and not a WindowPtr.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Diffstat (limited to 'hw/xwin/winmultiwindowclass.c')
| -rw-r--r-- | hw/xwin/winmultiwindowclass.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/xwin/winmultiwindowclass.c b/hw/xwin/winmultiwindowclass.c index 1af104df9..ced8f4554 100644 --- a/hw/xwin/winmultiwindowclass.c +++ b/hw/xwin/winmultiwindowclass.c @@ -213,7 +213,7 @@ winMultiWindowGetWMNormalHints(WindowPtr pWin, WinXSizeHints * hints) } int -winMultiWindowGetTransientFor(WindowPtr pWin, WindowPtr *ppDaddy) +winMultiWindowGetTransientFor(WindowPtr pWin, Window *pDaddyId) { struct _Window *pwin; struct _Property *prop; @@ -230,13 +230,13 @@ 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) { - if (ppDaddy) - memcpy(ppDaddy, prop->data, sizeof(WindowPtr)); + if (pDaddyId) + memcpy(pDaddyId, prop->data, sizeof(Window)); return 1; } else |