From 2b454bbabcb0dd7c37fe2856c1020ba18e38e038 Mon Sep 17 00:00:00 2001 From: monsta Date: Sat, 27 Jan 2018 14:42:52 +0300 Subject: [PATCH] require VTE 0.46 --- configure.ac | 2 +- src/terminal-screen.c | 3 --- src/terminal-window.c | 4 ---- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 4bb97e7..d7fbda9 100644 --- a/configure.ac +++ b/configure.ac @@ -47,7 +47,7 @@ AM_GLIB_GNU_GETTEXT GLIB_REQUIRED=2.36.0 GIO_REQUIRED=2.25.12 GTK_REQUIRED=3.14.0 -VTE_REQUIRED=0.38 +VTE_REQUIRED=0.46 DCONF_REQUIRED=0.13.4 PKG_CHECK_MODULES([TERM], diff --git a/src/terminal-screen.c b/src/terminal-screen.c index c0e8a9f..73fa9ae 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c @@ -993,12 +993,9 @@ terminal_screen_profile_notify_cb (TerminalProfile *profile, if (!prop_name || prop_name == I_(TERMINAL_PROFILE_SILENT_BELL)) vte_terminal_set_audible_bell (vte_terminal, !terminal_profile_get_property_boolean (profile, TERMINAL_PROFILE_SILENT_BELL)); - -#if VTE_CHECK_VERSION (0, 40, 0) if (!prop_name || prop_name == I_(TERMINAL_PROFILE_WORD_CHARS)) vte_terminal_set_word_char_exceptions (vte_terminal, terminal_profile_get_property_string (profile, TERMINAL_PROFILE_WORD_CHARS)); -#endif if (!prop_name || prop_name == I_(TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE)) vte_terminal_set_scroll_on_keystroke (vte_terminal, terminal_profile_get_property_boolean (profile, TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE)); diff --git a/src/terminal-window.c b/src/terminal-window.c index 0a3d983..734fab3 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c @@ -1215,11 +1215,7 @@ terminal_window_update_search_sensitivity (TerminalScreen *screen, if (screen != priv->active_screen) return; -#if VTE_CHECK_VERSION (0, 46, 0) can_search = vte_terminal_search_get_regex (VTE_TERMINAL (screen)) != NULL; -#else - can_search = vte_terminal_search_get_gregex (VTE_TERMINAL (screen)) != NULL; -#endif action = gtk_action_group_get_action (priv->action_group, "SearchFindNext"); gtk_action_set_sensitive (action, can_search);