From patchwork Fri May 6 18:03:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 67303 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp449367qge; Fri, 6 May 2016 11:08:45 -0700 (PDT) X-Received: by 10.28.22.134 with SMTP id 128mr10476117wmw.16.1462558125540; Fri, 06 May 2016 11:08:45 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i13si12132230wmc.78.2016.05.06.11.08.45 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 06 May 2016 11:08:45 -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]:59606 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aykAu-0004m2-3O for patch@linaro.org; Fri, 06 May 2016 14:08:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36584) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ayk7T-0007KN-Er for qemu-devel@nongnu.org; Fri, 06 May 2016 14:05:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ayk78-0001TN-FD for qemu-devel@nongnu.org; Fri, 06 May 2016 14:04:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33554) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ayk78-0001P7-9r for qemu-devel@nongnu.org; Fri, 06 May 2016 14:04:34 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (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 349D9201FB for ; Fri, 6 May 2016 18:04:23 +0000 (UTC) Received: from colepc.redhat.com (ovpn-113-44.phx2.redhat.com [10.3.113.44]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u46I4E4i019036; Fri, 6 May 2016 14:04:22 -0400 From: Cole Robinson To: qemu-devel@nongnu.org Date: Fri, 6 May 2016 14:03:13 -0400 Message-Id: <60a6cdc337d611d902f53907e66a8f37ea374d65.1462557436.git.crobinso@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 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] [PATCH 09/10] 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" inner-border was dropped in vte API 2.91, in favor of the standard padding style Signed-off-by: Cole Robinson --- ui/gtk.c | 11 +++++++++++ 1 file changed, 11 insertions(+) -- 2.7.4 diff --git a/ui/gtk.c b/ui/gtk.c index 9876d89..d156c8a 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -329,6 +329,7 @@ static void gd_update_geometry_hints(VirtualConsole *vc) } else if (vc->type == GD_VC_VTE) { VteTerminal *term = VTE_TERMINAL(vc->vte.terminal); GtkBorder *ib; + GtkBorder padding; geo.width_inc = vte_terminal_get_char_width(term); geo.height_inc = vte_terminal_get_char_height(term); @@ -339,7 +340,17 @@ 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; + +#if VTE_CHECK_VERSION(0, 37, 0) + 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 + if (ib) { geo.base_width += ib->left + ib->right; geo.base_height += ib->top + ib->bottom;