From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUn7I-0003Hv-SZ for qemu-devel@nongnu.org; Wed, 16 May 2012 18:54:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SUn7H-0007fa-2a for qemu-devel@nongnu.org; Wed, 16 May 2012 18:54:48 -0400 Received: from mail-ob0-f173.google.com ([209.85.214.173]:61093) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUn7G-0007f6-Rb for qemu-devel@nongnu.org; Wed, 16 May 2012 18:54:47 -0400 Received: by obbwd20 with SMTP id wd20so1951807obb.4 for ; Wed, 16 May 2012 15:54:44 -0700 (PDT) Sender: Joel Martin From: Joel Martin Date: Wed, 16 May 2012 17:54:25 -0500 Message-Id: <1337208865-22306-1-git-send-email-github@martintribe.org> Subject: [Qemu-devel] [PATCH] ui/vnc: Only report/use TIGHT_PNG encoding if enabled. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Joel Martin If TIGHT_PNG is not enabled by the --enable-vnc-png configure flag then do not report to the client that it is supported. Also, since TIGHT_PNG is the same as the TIGHT encoding but with the filter/copy replaced with PNG data, adding it to the supported encodings list when it is disabled will cause the TIGHT encoding to be used even though the client requested TIGHT_PNG. Signed-off-by: Joel Martin --- ui/vnc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index be384a5..517d5fa 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -1818,10 +1818,12 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings) vs->features |= VNC_FEATURE_TIGHT_MASK; vs->vnc_encoding = enc; break; +#ifdef CONFIG_VNC_PNG case VNC_ENCODING_TIGHT_PNG: vs->features |= VNC_FEATURE_TIGHT_PNG_MASK; vs->vnc_encoding = enc; break; +#endif case VNC_ENCODING_ZLIB: vs->features |= VNC_FEATURE_ZLIB_MASK; vs->vnc_encoding = enc; -- 1.7.1