From patchwork Mon Oct 16 20:33:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 10009875 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 2812A60230 for ; Mon, 16 Oct 2017 20:54:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 16B3E286A2 for ; Mon, 16 Oct 2017 20:54:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A3EE286C2; Mon, 16 Oct 2017 20:54:48 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 82085286A2 for ; Mon, 16 Oct 2017 20:54:47 +0000 (UTC) Received: from localhost ([::1]:35226 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4CPO-0006z9-Rv for patchwork-qemu-devel@patchwork.kernel.org; Mon, 16 Oct 2017 16:54:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4CNc-0006HH-U3 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 16:52:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4CNZ-0004cu-SF for qemu-devel@nongnu.org; Mon, 16 Oct 2017 16:52:56 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:36727) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4CNZ-0004cC-KO; Mon, 16 Oct 2017 16:52:53 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 6AC7C40D0A; Mon, 16 Oct 2017 23:52:52 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.corpit.ru (Postfix) with SMTP id 4E0A3AF8; Mon, 16 Oct 2017 23:33:44 +0300 (MSK) Received: (nullmailer pid 12317 invoked by uid 1000); Mon, 16 Oct 2017 20:33:42 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Mon, 16 Oct 2017 23:33:31 +0300 Message-Id: <70857ad6212276dcda364e36b30258222bdb31bc.1508185933.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 04/14] ui/gtk: Fix deprecation of vte_terminal_copy_clipboard 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: Anthony PERARD , qemu-trivial@nongnu.org, Michael Tokarev Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Anthony PERARD vte_terminal_copy_clipboard() is deprecated in VTE 0.50. Signed-off-by: Anthony PERARD Reviewed-by: Daniel P. Berrange Signed-off-by: Michael Tokarev --- ui/gtk.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ui/gtk.c b/ui/gtk.c index 5bd87c265a..342e96fbe9 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1702,7 +1702,12 @@ static void gd_menu_copy(GtkMenuItem *item, void *opaque) GtkDisplayState *s = opaque; VirtualConsole *vc = gd_vc_find_current(s); +#if VTE_CHECK_VERSION(0, 50, 0) + vte_terminal_copy_clipboard_format(VTE_TERMINAL(vc->vte.terminal), + VTE_FORMAT_TEXT); +#else vte_terminal_copy_clipboard(VTE_TERMINAL(vc->vte.terminal)); +#endif } static void gd_vc_adjustment_changed(GtkAdjustment *adjustment, void *opaque)