diff options
author | Adam Tkac <atkac@redhat.com> | 2010-07-20 09:33:46 +0000 |
---|---|---|
committer | Adam Tkac <atkac@redhat.com> | 2010-07-20 09:33:46 +0000 |
commit | fe1d7d5341ccfa2e31bb4d18ac418fe84ce482cd (patch) | |
tree | 778607ef867a13b98149ab0dcab539d24515c526 /unix | |
parent | 02fd9a6cda8d2f9686b691a16cc7ea4a0ef161b5 (diff) | |
download | tigervnc-fe1d7d5341ccfa2e31bb4d18ac418fe84ce482cd.tar.gz tigervnc-fe1d7d5341ccfa2e31bb4d18ac418fe84ce482cd.zip |
[Development] Pass "serverClient" to QueryColors when compiling against X.Org 1.9.X.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4091 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix')
-rw-r--r-- | unix/xserver/hw/vnc/xvnc.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/unix/xserver/hw/vnc/xvnc.cc b/unix/xserver/hw/vnc/xvnc.cc index a6f27b34..15235e10 100644 --- a/unix/xserver/hw/vnc/xvnc.cc +++ b/unix/xserver/hw/vnc/xvnc.cc @@ -630,7 +630,11 @@ vfbInstallColormap(ColormapPtr pmap) for (i = 0; i < entries; i++) ppix[i] = i; /* XXX truecolor */ +#if XORG < 19 QueryColors(pmap, entries, ppix, prgb); +#else + QueryColors(pmap, entries, ppix, prgb, serverClient); +#endif for (i = 0; i < entries; i++) { /* convert xrgbs to xColorItems */ defs[i].pixel = ppix[i] & 0xff; /* change pixel to index */ |