]> source.dussan.org Git - tigervnc.git/commitdiff
[Development] Pass "serverClient" to QueryColors when compiling against X.Org 1.9.X.
authorAdam Tkac <atkac@redhat.com>
Tue, 20 Jul 2010 09:33:46 +0000 (09:33 +0000)
committerAdam Tkac <atkac@redhat.com>
Tue, 20 Jul 2010 09:33:46 +0000 (09:33 +0000)
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4091 3789f03b-4d11-0410-bbf8-ca57d06f2519

unix/xserver/hw/vnc/xvnc.cc

index a6f27b34a0d7333842d876237e66f64e189bd3dd..15235e1030b1faac75b5a234ab1fb45d9c9aac7a 100644 (file)
@@ -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 */