From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39315) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCVJI-0001e1-ID for qemu-devel@nongnu.org; Mon, 13 Jun 2016 13:06:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCVJH-0001wT-ET for qemu-devel@nongnu.org; Mon, 13 Jun 2016 13:06:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48478) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCVJH-0001wP-8W for qemu-devel@nongnu.org; Mon, 13 Jun 2016 13:05:59 -0400 From: Stefan Hajnoczi Date: Mon, 13 Jun 2016 18:05:29 +0100 Message-Id: <1465837535-30067-10-git-send-email-stefanha@redhat.com> In-Reply-To: <1465837535-30067-1-git-send-email-stefanha@redhat.com> References: <1465837535-30067-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH v3 09/15] gtk: fix vte version check List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , jjherne@linux.vnet.ibm.com, Fam Zheng , Paolo Bonzini , Jeff Cody , mreitz@redhat.com, Olaf Hering , Gerd Hoffmann From: Olaf Hering vte_terminal_set_encoding takes 3 args since 0.38.0. This fixes commit fba958c6 ("gtk: implement set_echo") Signed-off-by: Olaf Hering Message-id: 20160608214352.32669-1-olaf@aepfle.de Signed-off-by: Gerd Hoffmann --- 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"); -- 2.5.5