Commit 6415994f authored by Kevin Wolf's avatar Kevin Wolf Committed by Gerd Hoffmann
Browse files

gtk: Don't vte_terminal_set_encoding() on new VTE versions 

The function vte_terminal_set_encoding() is deprecated since VTE 0.54,
so stop calling it from that version on. This fixes a build error
because of our use of warning flags [-Werror=deprecated-declarations].

Fixes: https://bugs.launchpad.net/bugs/1794939


Reported-by: default avatarBastian Koppelmann <kbastian@mail.uni-paderborn.de>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Message-id: 20181011153039.2324-1-kwolf@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 75e50c80

ui/gtk.c

+4 −2
Original line number Diff line number Diff line
@@ -1951,12 +1951,14 @@ static GSList *gd_vc_vte_init(GtkDisplayState *s, VirtualConsole *vc, 
    g_signal_connect(vc->vte.terminal, "commit", G_CALLBACK(gd_vc_in), vc);



    /* The documentation says that the default is UTF-8, but actually it is

     * 7-bit ASCII at least in VTE 0.38.

     */

     * 7-bit ASCII at least in VTE 0.38. The function is deprecated since

     * VTE 0.54 (only UTF-8 is supported now). */

#if !VTE_CHECK_VERSION(0, 54, 0)

#if VTE_CHECK_VERSION(0, 38, 0)

    vte_terminal_set_encoding(VTE_TERMINAL(vc->vte.terminal), "UTF-8", NULL);

#else

    vte_terminal_set_encoding(VTE_TERMINAL(vc->vte.terminal), "UTF-8");

#endif

#endif



    vte_terminal_set_scrollback_lines(VTE_TERMINAL(vc->vte.terminal), -1);