]> git.proxmox.com Git - mirror_qemu.git/commitdiff
gtk: Don't use deprecated vte_terminal_get_adjustment
authorCole Robinson <crobinso@redhat.com>
Mon, 17 Mar 2014 20:06:25 +0000 (16:06 -0400)
committerGerd Hoffmann <kraxel@redhat.com>
Tue, 29 Apr 2014 08:46:30 +0000 (10:46 +0200)
Guard this with a VTE version check, since I'm not sure if this is backwards
compatible.

ui/gtk.c: In function ‘gd_vc_init’:
ui/gtk.c:1176:5: error: ‘vte_terminal_get_adjustment’ is deprecated (declared at /usr/include/vte-2.90/vte/vtedeprecated.h:101) [-Werror=deprecated-declarations]

Signed-off-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
ui/gtk.c

index a56678f5ec473fbf998da7eaf2f60f271293a62c..5cdc044138d66b210404bc0a765b5719d6d5d66f 100644 (file)
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -1251,7 +1251,11 @@ static GSList *gd_vc_init(GtkDisplayState *s, VirtualConsole *vc, int index, GSL
 
     vte_terminal_set_scrollback_lines(VTE_TERMINAL(vc->terminal), -1);
 
+#if VTE_CHECK_VERSION(0, 28, 0) && GTK_CHECK_VERSION(3, 0, 0)
+    vadjustment = gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(vc->terminal));
+#else
     vadjustment = vte_terminal_get_adjustment(VTE_TERMINAL(vc->terminal));
+#endif
 
     scrolled_window = gtk_scrolled_window_new(NULL, vadjustment);
     gtk_container_add(GTK_CONTAINER(scrolled_window), vc->terminal);