[Xfce4-commits] [apps/xfce4-terminal] 01/01: Do not show "Rewrap on resize" option for vte>=0.58

[noreply at xfce.org]

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

f   2   4   0   4       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-terminal.

commit e89a558479ba42e4613d821ba1d6f744782f0317
Author: Igor <f2404 at yandex.ru>
Date:   Tue Jul 2 16:25:17 2019 -0400

    Do not show "Rewrap on resize" option for vte>=0.58
    
    vte is deprecating and removing the set/get rewrap_on_resize API.
    Rewrapping on resize will always be enabled.
    
    Fixes bug #15562
---
 terminal/terminal-preferences-dialog.c | 7 +++++++
 terminal/terminal-screen.c             | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c
index 6e0eaa5..8be9645 100644
--- a/terminal/terminal-preferences-dialog.c
+++ b/terminal/terminal-preferences-dialog.c
@@ -330,6 +330,13 @@ error:
   gtk_widget_hide (GTK_WIDGET (object));
 #endif
 
+#if VTE_CHECK_VERSION (0, 58, 0)
+  /* hide "Rewrap on resize" if vte's support for it has been dropped */
+  object = gtk_builder_get_object (GTK_BUILDER (dialog), "misc-rewrap-on-resize");
+  terminal_return_if_fail (G_IS_OBJECT (object));
+  gtk_widget_hide (GTK_WIDGET (object));
+#endif
+
   /* run custom command button */
   object = gtk_builder_get_object (GTK_BUILDER (dialog), "run-custom-command");
   object2 = gtk_builder_get_object (GTK_BUILDER (dialog), "hbox3");
diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index 76af514..eddd2c9 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -1256,7 +1256,9 @@ terminal_screen_update_misc_rewrap_on_resize (TerminalScreen *screen)
 {
   gboolean bval;
   g_object_get (G_OBJECT (screen->preferences), "misc-rewrap-on-resize", &bval, NULL);
+#if !VTE_CHECK_VERSION (0, 58, 0)
   vte_terminal_set_rewrap_on_resize (VTE_TERMINAL (screen->terminal), bval);
+#endif
 }
 
 

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