From patchwork Fri May 13 12:32:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 67776 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp246249qge; Fri, 13 May 2016 05:42:08 -0700 (PDT) X-Received: by 10.141.43.194 with SMTP id u185mr15815058qhe.75.1463143328216; Fri, 13 May 2016 05:42:08 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x189si11939451qkc.224.2016.05.13.05.42.08 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 13 May 2016 05:42:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:34398 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b1CPv-0004Id-SH for patch@linaro.org; Fri, 13 May 2016 08:42:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40034) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b1CHG-0005C0-Sy for qemu-devel@nongnu.org; Fri, 13 May 2016 08:33:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b1CH8-0006k2-Re for qemu-devel@nongnu.org; Fri, 13 May 2016 08:33:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45895) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b1CH8-0006iz-KA for qemu-devel@nongnu.org; Fri, 13 May 2016 08:33:02 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 31F02C05B1CF for ; Fri, 13 May 2016 12:33:02 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-35.ams2.redhat.com [10.36.116.35]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u4DCX1Pj020962; Fri, 13 May 2016 08:33:01 -0400 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id CE5478194E; Fri, 13 May 2016 14:32:59 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 13 May 2016 14:32:49 +0200 Message-Id: <1463142777-13040-10-git-send-email-kraxel@redhat.com> In-Reply-To: <1463142777-13040-1-git-send-email-kraxel@redhat.com> References: <1463142777-13040-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 13 May 2016 12:33:02 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL v2 09/17] ui: gtk: Fix a runtime warning on vte >= 0.37 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: Gerd Hoffmann , Cole Robinson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Cole Robinson inner-border was dropped in vte API 2.91, in favor of the standard padding style Signed-off-by: Cole Robinson Message-id: 60a6cdc337d611d902f53907e66a8f37ea374d65.1462557436.git.crobinso@redhat.com [ kraxel: Fix warning with old vte version. ] Signed-off-by: Gerd Hoffmann --- ui/gtk.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -- 1.8.3.1 diff --git a/ui/gtk.c b/ui/gtk.c index 9876d89..28e7d28 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -330,6 +330,17 @@ static void gd_update_geometry_hints(VirtualConsole *vc) VteTerminal *term = VTE_TERMINAL(vc->vte.terminal); GtkBorder *ib; +#if VTE_CHECK_VERSION(0, 37, 0) + GtkBorder padding; + gtk_style_context_get_padding( + gtk_widget_get_style_context(vc->vte.terminal), + gtk_widget_get_state_flags(vc->vte.terminal), + &padding); + ib = &padding; +#else + gtk_widget_style_get(vc->vte.terminal, "inner-border", &ib, NULL); +#endif + geo.width_inc = vte_terminal_get_char_width(term); geo.height_inc = vte_terminal_get_char_height(term); mask |= GDK_HINT_RESIZE_INC; @@ -339,7 +350,7 @@ static void gd_update_geometry_hints(VirtualConsole *vc) geo.min_width = geo.width_inc * VC_TERM_X_MIN; geo.min_height = geo.height_inc * VC_TERM_Y_MIN; mask |= GDK_HINT_MIN_SIZE; - gtk_widget_style_get(vc->vte.terminal, "inner-border", &ib, NULL); + if (ib) { geo.base_width += ib->left + ib->right; geo.base_height += ib->top + ib->bottom;