[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 09/17] ui: gtk: Fix a runtime warning on vte >= 0.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL v2 09/17] ui: gtk: Fix a runtime warning on vte >= 0.37 |
Date: |
Fri, 13 May 2016 14:32:49 +0200 |
From: Cole Robinson <address@hidden>
inner-border was dropped in vte API 2.91, in favor of the standard
padding style
Signed-off-by: Cole Robinson <address@hidden>
Message-id: address@hidden
[ kraxel: Fix warning with old vte version. ]
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/gtk.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
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;
--
1.8.3.1
- [Qemu-devel] [PULL v2 17/17] gtk: don't leak the GtkBorder with VTE 0.36, (continued)
- [Qemu-devel] [PULL v2 17/17] gtk: don't leak the GtkBorder with VTE 0.36, Gerd Hoffmann, 2016/05/13
- [Qemu-devel] [PULL v2 06/17] configure: report GTK version, Gerd Hoffmann, 2016/05/13
- [Qemu-devel] [PULL v2 04/17] configure: error on unknown --with-sdlabi value, Gerd Hoffmann, 2016/05/13
- [Qemu-devel] [PULL v2 12/17] spice/gl: add & use qemu_spice_gl_monitor_config, Gerd Hoffmann, 2016/05/13
- [Qemu-devel] [PULL v2 13/17] Changed malloc to g_malloc, free to g_free in ui/shader.c, Gerd Hoffmann, 2016/05/13
- [Qemu-devel] [PULL v2 10/17] ui: gtk: Fix some deprecation warnings, Gerd Hoffmann, 2016/05/13
- [Qemu-devel] [PULL v2 07/17] configure: report SDL version, Gerd Hoffmann, 2016/05/13
- [Qemu-devel] [PULL v2 05/17] configure: add echo_version helper, Gerd Hoffmann, 2016/05/13
- [Qemu-devel] [PULL v2 01/17] ui: gtk: fix crash when terminal inner-border is NULL, Gerd Hoffmann, 2016/05/13
- [Qemu-devel] [PULL v2 15/17] spice: fix coverity complains, Gerd Hoffmann, 2016/05/13
- [Qemu-devel] [PULL v2 09/17] ui: gtk: Fix a runtime warning on vte >= 0.37,
Gerd Hoffmann <=
- [Qemu-devel] [PULL v2 03/17] configure: build SDL if only SDL2 available, Gerd Hoffmann, 2016/05/13
- [Qemu-devel] [PULL v2 14/17] egl-helpers: fix possible resource leak, Gerd Hoffmann, 2016/05/13
- [Qemu-devel] [PULL v2 08/17] configure: support vte-2.91, Gerd Hoffmann, 2016/05/13
- Re: [Qemu-devel] [PULL v2 00/17] ui patch queue, Peter Maydell, 2016/05/13