From patchwork Wed Jun 8 21:43:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 9165827 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3810260572 for ; Wed, 8 Jun 2016 21:57:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1D3DB28306 for ; Wed, 8 Jun 2016 21:57:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 11D392830C; Wed, 8 Jun 2016 21:57:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1953128306 for ; Wed, 8 Jun 2016 21:57:35 +0000 (UTC) Received: from localhost ([::1]:59720 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAlTi-0000Xh-Tf for patchwork-qemu-devel@patchwork.kernel.org; Wed, 08 Jun 2016 17:57:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60505) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAlTU-0000Xc-6I for qemu-devel@nongnu.org; Wed, 08 Jun 2016 17:57:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bAlTS-0001bU-5H for qemu-devel@nongnu.org; Wed, 08 Jun 2016 17:57:19 -0400 Received: from mo6-p00-ob.smtp.rzone.de ([2a01:238:20a:202:5300::7]:57986) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAlTR-0001bI-R9 for qemu-devel@nongnu.org; Wed, 08 Jun 2016 17:57:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1465423034; l=759; s=domk; d=aepfle.de; h=Date:Subject:Cc:To:From; bh=CDQzc++Q91Wf0f6PRSNf9BXO4t0iA6Bmeb65Az/YCO4=; b=cVsjSNe4k1uC55TEKSkHux2AL2z8dUXldVqPG+lAE46L6DkjFcEnnUtUfaFqrZxuIb4 mVTpvpzJ8kftN1vtn8XYRO90sEo7fjk7xOkCdKvnFkD0Iy107I32mwVOdGGm7FH8bTa+Z PY4HRNqzBpFSdAK8XpuivblFkEeEkK2eDnc= X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+yackYocTD1iAi8x+OWi/zfN1cLnDYUgpRwCBn4O91klwzI1pCt9moJNmi9PXmIrFO24= X-RZG-CLASS-ID: mo00 Received: from probook ([2001:a62:128d:83ff:5f2:ecf9:4bc:7493]) by smtp.strato.de (RZmta 38.2 AUTH) with ESMTPSA id t02eaas58LhxAJ1 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate); Wed, 8 Jun 2016 23:43:59 +0200 (CEST) Received: by probook (Postfix, from userid 1000) id 0896650ACF; Wed, 8 Jun 2016 23:43:52 +0200 (CEST) From: Olaf Hering To: Gerd Hoffmann , Paolo Bonzini Date: Wed, 8 Jun 2016 21:43:52 +0000 Message-Id: <20160608214352.32669-1-olaf@aepfle.de> X-Mailer: git-send-email 2.8.3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 2a01:238:20a:202:5300::7 Subject: [Qemu-devel] [PATCH] gtk: fix vte version check X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Olaf Hering , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP vte_terminal_set_encoding takes 3 args since 0.38.0. This fixes commit fba958c6 ("gtk: implement set_echo") Signed-off-by: Olaf Hering --- ui/gtk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/gtk.c b/ui/gtk.c index 01b8216..58d20ee 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1748,7 +1748,7 @@ static GSList *gd_vc_vte_init(GtkDisplayState *s, VirtualConsole *vc, /* The documentation says that the default is UTF-8, but actually it is * 7-bit ASCII at least in VTE 0.38. */ -#if VTE_CHECK_VERSION(0, 40, 0) +#if VTE_CHECK_VERSION(0, 38, 0) vte_terminal_set_encoding(VTE_TERMINAL(vc->vte.terminal), "UTF-8", NULL); #else vte_terminal_set_encoding(VTE_TERMINAL(vc->vte.terminal), "UTF-8");