diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-14 14:23:04 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-14 14:23:04 +0000 |
| commit | 2ddb14008968ea365e3d395487cad2bfe154da9d (patch) | |
| tree | f9d970e9dd6ee1ec835fedcadc15a8705a50e6d5 /xorg-server/hw/xnest/Screen.c | |
| parent | b7a6351e37e788bb25415dc79aaf2718b48d6939 (diff) | |
| parent | 3815190d52f8ae453c2458335394eb5b18ab9bf5 (diff) | |
| download | vcxsrv-2ddb14008968ea365e3d395487cad2bfe154da9d.tar.gz vcxsrv-2ddb14008968ea365e3d395487cad2bfe154da9d.tar.bz2 vcxsrv-2ddb14008968ea365e3d395487cad2bfe154da9d.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xnest/Screen.c')
| -rw-r--r-- | xorg-server/hw/xnest/Screen.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xorg-server/hw/xnest/Screen.c b/xorg-server/hw/xnest/Screen.c index cf225d0ab..f4e5cbd0a 100644 --- a/xorg-server/hw/xnest/Screen.c +++ b/xorg-server/hw/xnest/Screen.c @@ -151,6 +151,8 @@ xnestOpenScreen(int index, ScreenPtr pScreen, int argc, char *argv[]) return FALSE;
if (!dixRegisterPrivateKey(&xnestPixmapPrivateKeyRec, PRIVATE_PIXMAP, sizeof (xnestPrivPixmap)))
return FALSE;
+ if (!dixRegisterPrivateKey(&xnestColormapPrivateKeyRec, PRIVATE_COLORMAP, sizeof (xnestPrivColormap)))
+ return FALSE;
if (!dixRegisterPrivateKey(&xnestCursorScreenKeyRec, PRIVATE_SCREEN, 0))
return FALSE;
|