[Xfce4-commits] [apps/xfce4-terminal] 01/01: Fix segfault on setting encoding

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

ochosi pushed a commit to branch master
in repository apps/xfce4-terminal.

commit 3c8f4d8d52c4b849407bf8b2a4ce780878b8296e
Author: Igor <f2404 at yandex.ru>
Date:   Tue Jun 7 15:05:30 2016 +0300

    Fix segfault on setting encoding
    
    Signed-off-by: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
---
 terminal/terminal-screen.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index 98c88b7..dc28e1b 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -837,12 +837,9 @@ static void
 terminal_screen_update_encoding (TerminalScreen *screen)
 {
   gchar *encoding;
-  GError *error = NULL;
 
   g_object_get (G_OBJECT (screen->preferences), "encoding", &encoding, NULL);
-  if (!vte_terminal_set_encoding (VTE_TERMINAL (screen->terminal), encoding, &error)) {
-      g_printerr("Failed to set encoding: %s\n", error->message);
-  }
+  terminal_screen_set_encoding (screen, encoding);
   g_free (encoding);
 }
 
@@ -2213,10 +2210,9 @@ void
 terminal_screen_set_encoding (TerminalScreen *screen,
                               const gchar    *charset)
 {
-  GError *error;
   terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
-  if (!vte_terminal_set_encoding (VTE_TERMINAL (screen->terminal), charset, &error)) {
-    g_printerr("Failed to set encoding: %s\n", error->message);
+  if (!vte_terminal_set_encoding (VTE_TERMINAL (screen->terminal), charset, NULL)) {
+    g_printerr("Failed to set encoding %s\n", charset);
   }
 }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.