diff options
| author | Julien Cristau <jcristau@debian.org> | 2011-07-07 19:18:03 +0200 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-08-10 14:58:29 -0700 |
| commit | 179ab444fde028c82f163994508264b28e9f4f57 (patch) | |
| tree | d85f5f65dcfc8b5f91f06a5c0dcaed42fc0d2056 | |
| parent | fa425363e3927e86d57f42c4b6e4995d26d6bd0c (diff) | |
Xephyr/dri: register screen and window privates on init
Fixes assertion failure when calling dixSetPrivate
Debian bug#632549 <http://bugs.debian.org/632549>
Reported-and-tested-by: Mohammed Sameer <msameer@foolab.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit a1dec7cd6adabaf8770dc3b21b0df30ce2f0bc8d)
| -rw-r--r-- | hw/kdrive/ephyr/ephyrdriext.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/kdrive/ephyr/ephyrdriext.c b/hw/kdrive/ephyr/ephyrdriext.c index 6945f5b61..0bd51b2c7 100644 --- a/hw/kdrive/ephyr/ephyrdriext.c +++ b/hw/kdrive/ephyr/ephyrdriext.c @@ -1394,6 +1394,10 @@ ephyrDRIExtensionInit (ScreenPtr a_screen) EPHYR_LOG_ERROR ("failed to register DRI extension\n") ; goto out ; } + if (!dixRegisterPrivateKey(&ephyrDRIScreenKeyRec, PRIVATE_SCREEN, 0)) + goto out ; + if (!dixRegisterPrivateKey(&ephyrDRIWindowKeyRec, PRIVATE_WINDOW, 0)) + goto out ; screen_priv = calloc(1, sizeof (EphyrDRIScreenPrivRec)) ; if (!screen_priv) { EPHYR_LOG_ERROR ("failed to allocate screen_priv\n") ; |