[gnome-terminal] all: Adapt to vte_terminal_set_encoding API change



commit 371306b334c642fec756fe76449fd5823921dddb
Author: Christian Persch <chpe gnome org>
Date:   Fri Aug 15 13:32:16 2014 +0200

    all: Adapt to vte_terminal_set_encoding API change
    
    Corresponding to vte commit 55364d008339077e765f8328ad86ac0b1fc40107.

 configure.ac          |    2 +-
 src/terminal-screen.c |    4 +++-
 src/terminal-window.c |    3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 581d31b..b0df57a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,7 @@ case "$with_gtk" in
   3.0) GTK_API_VERSION=3.0
        GTK_REQUIRED=3.9.9
        VTE_API_VERSION=2.91
-       VTE_REQUIRED=0.37.2
+       VTE_REQUIRED=0.37.3
        ;;
 esac
 
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index e3309f8..ad78388 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -725,7 +725,9 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
 
       str = g_settings_get_string (profile, TERMINAL_PROFILE_ENCODING_KEY);
       encoding = terminal_app_ensure_encoding (terminal_app_get (), str);
-      vte_terminal_set_encoding (vte_terminal, terminal_encoding_get_charset (encoding));
+      vte_terminal_set_encoding (vte_terminal,
+                                 terminal_encoding_get_charset (encoding),
+                                 NULL);
     }
 
   if (!prop_name || prop_name == I_(TERMINAL_PROFILE_CJK_UTF8_AMBIGUOUS_WIDTH_KEY))
diff --git a/src/terminal-window.c b/src/terminal-window.c
index e44283f..f09ee66 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -1487,7 +1487,8 @@ terminal_set_encoding_callback (GtkToggleAction *action,
   g_assert (encoding);
 
   vte_terminal_set_encoding (VTE_TERMINAL (priv->active_screen),
-                             terminal_encoding_get_charset (encoding));
+                             terminal_encoding_get_charset (encoding),
+                             NULL);
 }
 
 static void


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]