diff mbox

[v2,3/7] gtk: Don't use deprecated vte_terminal_get_adjustment

Message ID e229e545771d3a0d9a9c9a6465b3340be0ffda4d.1394738819.git.crobinso@redhat.com
State New
Headers show

Commit Message

Cole Robinson March 13, 2014, 7:30 p.m. UTC 
Guard this with a VTE and GTK version check so we don't break GTK2 builds.

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>
---

v2: Fix GTK2 build

 ui/gtk.c | 4 ++++
 1 file changed, 4 insertions(+)
diff mbox

Patch

diff --git a/ui/gtk.c b/ui/gtk.c
index ce24b95..82a7fd2 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -1194,7 +1194,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);