Christian Persch · Alexander Shopov · Emin Tufan Çetin · Seong-ho Cho · Jordi Mas · Christian Persch
--- a/ChangeLog
+++ b/ChangeLog
--- a/help/LINGUAS
+++ b/help/LINGUAS
@@ -10,6 +10,7 @@ fr
 gl
 hu
 id
+ka
 ko
 pl
 pt_BR

--- a/help/eu/eu.po
+++ b/help/eu/eu.po
--- a/help/ka/ka.po
+++ b/help/ka/ka.po
--- a/meson.build
+++ b/meson.build
@@ -27,7 +27,7 @@ project(
    'GFDL-1.3-only',                # the appstream data
  ],
  meson_version: '>= 0.49.0',
-  version: '3.44.1',
+  version: '3.45.90',
 )

 # Naming
@@ -45,7 +45,7 @@ clangxx_req_version       = '3.3'
 # Requirements

 vte_req                      = 'vte-2.91'
-vte_req_version              = '0.68.0'
+vte_req_version              = '0.67.90'

 glib_req_version             = '2.52.0'
 glib_min_req_version         = '2.52'
@@ -159,20 +159,46 @@ config_h.set_quoted('VERSION', gt_version)
 config_h.set('ENABLE_DEBUG', enable_debug)
 config_h.set('ENABLE_SEARCH_PROVIDER', get_option('search_provider'))

-# FIXME AC_USE_SYSTEM_EXTENSIONS also supported non-gnu systems
-config_h.set10('_GNU_SOURCE', true)
+# Enable libc features

+libc_feature_defines = [
+  ['_GNU_SOURCE', '1'],
+  ['_POSIX_C_SOURCE', '200809L'],
+  ['_XOPEN_SOURCE', '700'],
+  ['_XOPEN_SOURCE_EXTENDED', '1'],
+]
+
+if host_machine.system() == 'freebsd'
+  # Defining _POSIX_C_SOURCE above makes freebsd not expose some functionality
+  # that's hidden behind __BSD_VISIBLE.  Not defininy any of the above however
+  # makes it expose verything.
+
+  libc_feature_defines = []
+endif
+
+foreach f: libc_feature_defines
+  config_h.set(f[0], f[1])
+endforeach

-ver = glib_min_req_version.split('.')
-config_h.set('GLIB_VERSION_MIN_REQUIRED', '(G_ENCODE_VERSION(' + ver[0] + ',' + ver[1] + '))')
-ver = glib_max_allowed_version.split('.')
-config_h.set('GLIB_VERSION_MAX_ALLOWED', '(G_ENCODE_VERSION(' + ver[0] + ',' + ver[1] + '))')
+# Min/max version requirement flags

-ver = gtk_min_req_version.split('.')
-config_h.set('GDK_VERSION_MIN_REQUIRED', '(G_ENCODE_VERSION(' + ver[0] + ',' + ver[1] + '))')
+minver = glib_min_req_version.split('.')
+maxver = glib_max_allowed_version.split('.')
+
+glib_version_cxxflags = [
+  '-DGLIB_VERSION_MIN_REQUIRED=(G_ENCODE_VERSION(' + minver[0] + ',' + minver[1] + '))',
+  '-DGLIB_VERSION_MAX_ALLOWED=(G_ENCODE_VERSION(' + maxver[0] + ',' + maxver[1] + '))',
+]
+
+minver = gtk_min_req_version.split('.')
+maxver = gtk_max_allowed_version.split('.')
+
+gtk_version_cxxflags = [
+  '-DGDK_VERSION_MIN_REQUIRED=(G_ENCODE_VERSION(' + minver[0] + ',' + minver[1] + '))',
+  '-DGDK_VERSION_MAX_ALLOWED=(G_ENCODE_VERSION(' + maxver[0] + ',' + maxver[1] + '))',
+]

-ver = gtk_max_allowed_version.split('.')
-config_h.set('GDK_VERSION_MAX_ALLOWED', '(G_ENCODE_VERSION(' + ver[0] + ',' + ver[1] + '))')
+version_cxxflags = glib_version_cxxflags + gtk_version_cxxflags

 # Compiler flags


--- a/po/LINGUAS
+++ b/po/LINGUAS
 # please keep this list sorted alphabetically
 #
+ab
 am
 an
 ar

--- a/po/ab.po
+++ b/po/ab.po
--- a/po/eu.po
+++ b/po/eu.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr "Project-Id-Version: gnome-terminal master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-terminal/issues\n"
-"POT-Creation-Date: 2022-02-12 19:41+0000\n"
+"POT-Creation-Date: 2021-07-31 12:57+0000\n"
 "PO-Revision-Date: 2021-08-21 19:007+0100\n"
 "Last-Translator: Asier Sarasua Garmendia <asiersarasua@ni.eus>\n"
 "Language-Team: Basque <librezale@librezale.eus>\n"
@@ -75,10 +75,10 @@ msgid "gnome-terminal"
 msgstr "gnome-terminal"

 #: data/org.gnome.Terminal.desktop.in:3
-#: data/org.gnome.Terminal.metainfo.xml.in:38 src/server.cc:152
+#: data/org.gnome.Terminal.metainfo.xml.in:38 src/server.cc:150
 #: src/terminal-accels.cc:232 src/terminal-menubar.ui.in:144
-#: src/terminal-tab-label.cc:81 src/terminal-window.cc:1901
-#: src/terminal-window.cc:2167 src/terminal-window.cc:2450 src/terminal.cc:570
+#: src/terminal-tab-label.cc:81 src/terminal-window.cc:1894
+#: src/terminal-window.cc:2160 src/terminal-window.cc:2443 src/terminal.cc:570
 msgid "Terminal"
 msgstr "Terminala"

@@ -203,12 +203,12 @@ msgstr "Terminaleko testu lodiaren kolore lehenetsia, kolore-zehaztapen gisa (HT

 #: src/org.gnome.Terminal.gschema.xml:154
 msgid "Whether bold text should use the same color as normal text"
-msgstr "Testu lodiak testu soilaren kolore berdina erabiliko duen ala ez"
+msgstr "Testu lodiak testu arruntaren kolore berdina erabiliko duen ala ez"

 #: src/org.gnome.Terminal.gschema.xml:155
 msgid ""
 "If true, boldface text will be rendered using the same color as normal text."
-msgstr "TRUE (egia) bada, letra lodiko testua errendatuko da testu soilaren kolore berdina erabiliz."
+msgstr "TRUE (egia) bada, letra lodiko testua errendatuko da testu arruntaren kolore berdina erabiliz."

 #: src/org.gnome.Terminal.gschema.xml:160
 msgid ""
@@ -1591,16 +1591,16 @@ msgstr "_Laster-teklak"
 msgid "New Terminal"
 msgstr "Terminal berria"

-#: src/terminal-app.cc:518 src/terminal-window.cc:1802
+#: src/terminal-app.cc:518 src/terminal-window.cc:1795
 msgid "New _Terminal"
 msgstr "_Terminal berria"

-#: src/terminal-app.cc:520 src/terminal-window.cc:1811
+#: src/terminal-app.cc:520 src/terminal-window.cc:1804
 msgid "New _Tab"
 msgstr "_Fitxa berria"

 #: src/terminal-app.cc:521 src/terminal-headermenu.ui:39
-#: src/terminal-window.cc:1807
+#: src/terminal-window.cc:1800
 msgid "New _Window"
 msgstr "Leiho _berria"

@@ -1625,7 +1625,7 @@ msgid "_Full Screen"
 msgstr "_Pantaila osoa"

 #: src/terminal-headermenu.ui:50 src/terminal-menubar.ui.in:155
-#: src/terminal-window.cc:1783
+#: src/terminal-window.cc:1776
 msgid "Read-_Only"
 msgstr "Irakurtzeko _soilik"

@@ -1666,8 +1666,8 @@ msgstr "_4. 132×43"
 msgid "_Inspector"
 msgstr "_Ikuskatzailea"

-#: src/terminal-headermenu.ui:106 src/terminal-screen.cc:1516
-#: src/terminal-window.cc:1795
+#: src/terminal-headermenu.ui:106 src/terminal-screen.cc:1540
+#: src/terminal-window.cc:1788
 msgid "_Preferences"
 msgstr "_Hobespenak"

@@ -1707,19 +1707,19 @@ msgstr "_Itxi leihoa"
 msgid "_Edit"
 msgstr "_Editatu"

-#: src/terminal-menubar.ui.in:59 src/terminal-window.cc:1773
+#: src/terminal-menubar.ui.in:59 src/terminal-window.cc:1766
 msgid "_Copy"
 msgstr "_Kopiatu"

-#: src/terminal-menubar.ui.in:64 src/terminal-window.cc:1774
+#: src/terminal-menubar.ui.in:64 src/terminal-window.cc:1767
 msgid "Copy as _HTML"
 msgstr "Kopiatu _HTML gisa"

-#: src/terminal-menubar.ui.in:69 src/terminal-window.cc:1775
+#: src/terminal-menubar.ui.in:69 src/terminal-window.cc:1768
 msgid "_Paste"
 msgstr "_Itsatsi"

-#: src/terminal-menubar.ui.in:73 src/terminal-window.cc:1777
+#: src/terminal-menubar.ui.in:73 src/terminal-window.cc:1770
 msgid "Paste as _Filenames"
 msgstr "Itsatsi _fitxategi-izen gisa"

@@ -1735,7 +1735,7 @@ msgstr "H_obespenak"
 msgid "_View"
 msgstr "_Ikusi"

-#: src/terminal-menubar.ui.in:96 src/terminal-window.cc:1823
+#: src/terminal-menubar.ui.in:96 src/terminal-window.cc:1816
 msgid "Show _Menubar"
 msgstr "Erakutsi _menu-barra"

@@ -1795,35 +1795,35 @@ msgstr "_Desuztartu terminala"
 msgid "_Contents"
 msgstr "_Edukia"

-#: src/terminal-nautilus.cc:542
+#: src/terminal-nautilus.cc:537
 msgid "Open in _Remote Terminal"
 msgstr "Ireki _urruneko terminalean"

-#: src/terminal-nautilus.cc:544
+#: src/terminal-nautilus.cc:539
 msgid "Open in _Local Terminal"
 msgstr "Ireki _lokaleko terminalean"

-#: src/terminal-nautilus.cc:548 src/terminal-nautilus.cc:559
+#: src/terminal-nautilus.cc:543 src/terminal-nautilus.cc:554
 msgid "Open the currently selected folder in a terminal"
 msgstr "Ireki unean hautatutako karpeta terminal batean"

-#: src/terminal-nautilus.cc:550 src/terminal-nautilus.cc:561
+#: src/terminal-nautilus.cc:545 src/terminal-nautilus.cc:556
 msgid "Open the currently open folder in a terminal"
 msgstr "Ireki unean irekitako karpeta terminalean"

-#: src/terminal-nautilus.cc:556
+#: src/terminal-nautilus.cc:551
 msgid "Open in T_erminal"
 msgstr "Ireki _terminalean"

-#: src/terminal-nautilus.cc:566
+#: src/terminal-nautilus.cc:561
 msgid "Open T_erminal"
 msgstr "Ireki _terminala"

-#: src/terminal-nautilus.cc:567
+#: src/terminal-nautilus.cc:562
 msgid "Open a terminal"
 msgstr "Ireki terminala"

-#: src/terminal-notebook-menu.ui:43 src/terminal-window.cc:3261
+#: src/terminal-notebook-menu.ui:43 src/terminal-window.cc:3253
 msgid "C_lose Terminal"
 msgstr "_Itxi terminala"

@@ -2152,29 +2152,29 @@ msgstr "Lasterbideak"
 msgid "Profiles"
 msgstr "Profilak"

-#: src/terminal-screen.cc:1401
+#: src/terminal-screen.cc:1425
 msgid "No command supplied nor shell requested"
 msgstr "Ez da komandorik eman edo shell-ik eskatu"

-#: src/terminal-screen.cc:1517 src/terminal-screen.cc:1864
+#: src/terminal-screen.cc:1541 src/terminal-screen.cc:1888
 msgid "_Relaunch"
 msgstr "_Berriro abiarazi"

-#: src/terminal-screen.cc:1520
+#: src/terminal-screen.cc:1544
 msgid "There was an error creating the child process for this terminal"
 msgstr "Errorea gertatu da terminal honetako prozesu haurra sortzean"

-#: src/terminal-screen.cc:1868
+#: src/terminal-screen.cc:1892
 #, c-format
 msgid "The child process exited normally with status %d."
 msgstr "Prozesu haurra normal irten da %d egoerarekin."

-#: src/terminal-screen.cc:1871
+#: src/terminal-screen.cc:1895
 #, c-format
 msgid "The child process was aborted by signal %d."
 msgstr "Prozesu haurra %d seinalearekin abortatu da."

-#: src/terminal-screen.cc:1874
+#: src/terminal-screen.cc:1898
 msgid "The child process was aborted."
 msgstr "Prozesu haurra abortatu egin da."

@@ -2243,83 +2243,83 @@ msgstr "GNOME Terminal programarekin batera GNU Lizentzia Publiko Orokorraren ko
 msgid "“file” scheme with remote hostname not supported"
 msgstr "\"file\" eskema urruneko ostalari-izenarekin ez dago onartuta"

-#: src/terminal-window.cc:473
+#: src/terminal-window.cc:463
 msgid "Could not save contents"
 msgstr "Ezin izan da edukia gorde"

-#: src/terminal-window.cc:493
+#: src/terminal-window.cc:483
 msgid "Save as…"
 msgstr "Gorde honela…"

-#: src/terminal-window.cc:496
+#: src/terminal-window.cc:486
 msgid "_Cancel"
 msgstr "_Utzi"

-#: src/terminal-window.cc:497
+#: src/terminal-window.cc:487
 msgid "_Save"
 msgstr "_Gorde"

-#: src/terminal-window.cc:1712
+#: src/terminal-window.cc:1705
 msgid "Open _Hyperlink"
 msgstr "Ireki _hiperesteka"

-#: src/terminal-window.cc:1713
+#: src/terminal-window.cc:1706
 msgid "Copy Hyperlink _Address"
 msgstr "Kopiatu hiperestekaren h_elbidea"

-#: src/terminal-window.cc:1723
+#: src/terminal-window.cc:1716
 msgid "Send Mail _To…"
 msgstr "Bidali mezua h_oni…"

-#: src/terminal-window.cc:1724
+#: src/terminal-window.cc:1717
 msgid "Copy Mail _Address"
 msgstr "Kopiatu _posta-helbidea"

-#: src/terminal-window.cc:1727
+#: src/terminal-window.cc:1720
 msgid "Call _To…"
 msgstr "Deitu ho_ni…"

-#: src/terminal-window.cc:1728
+#: src/terminal-window.cc:1721
 msgid "Copy Call _Address "
 msgstr "Kopiatu deiaren he_lbidea "

-#: src/terminal-window.cc:1733
+#: src/terminal-window.cc:1726
 msgid "_Open Link"
 msgstr "_Ireki esteka"

-#: src/terminal-window.cc:1734
+#: src/terminal-window.cc:1727
 msgid "Copy _Link"
 msgstr "Kopiatu _esteka"

-#: src/terminal-window.cc:1790
+#: src/terminal-window.cc:1783
 msgid "P_rofiles"
 msgstr "_Profilak"

-#: src/terminal-window.cc:1825
+#: src/terminal-window.cc:1818
 msgid "L_eave Full Screen"
 msgstr "_Irten pantaila osotik"

-#: src/terminal-window.cc:3248
+#: src/terminal-window.cc:3240
 msgid "Close this window?"
 msgstr "Itxi leiho hau?"

-#: src/terminal-window.cc:3248
+#: src/terminal-window.cc:3240
 msgid "Close this terminal?"
 msgstr "Itxi terminal hau?"

-#: src/terminal-window.cc:3252
+#: src/terminal-window.cc:3244
 msgid ""
 "There are still processes running in some terminals in this window. Closing "
 "the window will kill all of them."
 msgstr "Oraindik prozesu batzuk exekutatzen ari dira leiho honetako terminal batzuetan. Leiho hau ixtean prozesu guzti horiek hilko dira."

-#: src/terminal-window.cc:3256
+#: src/terminal-window.cc:3248
 msgid ""
 "There is still a process running in this terminal. Closing the terminal will "
 "kill it."
 msgstr "Oraindik prozesu bat exekutatzen ari da terminal honetan. Terminal hau ixtean prozesu hori hilko da."

-#: src/terminal-window.cc:3261
+#: src/terminal-window.cc:3253
 msgid "C_lose Window"
 msgstr "It_xi leihoa"


--- a/po/it.po
+++ b/po/it.po
--- a/po/ka.po
+++ b/po/ka.po
--- a/po/tr.po
+++ b/po/tr.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-terminal master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-terminal/issues\n"
-"POT-Creation-Date: 2022-02-12 19:41+0000\n"
-"PO-Revision-Date: 2022-02-23 12:34+0300\n"
+"POT-Creation-Date: 2022-02-14 11:00+0000\n"
+"PO-Revision-Date: 2022-02-23 12:35+0300\n"
 "Last-Translator: Emin Tufan Çetin <etcetin@gmail.com>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
 "Language: tr\n"
@@ -1757,7 +1757,7 @@ msgstr "_4. 132×43"
 msgid "_Inspector"
 msgstr "_İnceleyici"

-#: src/terminal-headermenu.ui:106 src/terminal-screen.cc:1516
+#: src/terminal-headermenu.ui:106 src/terminal-screen.cc:1513
 #: src/terminal-window.cc:1795
 msgid "_Preferences"
 msgstr "_Tercihler"
@@ -2256,29 +2256,29 @@ msgstr "Kısayollar"
 msgid "Profiles"
 msgstr "Profiller"

-#: src/terminal-screen.cc:1401
+#: src/terminal-screen.cc:1398
 msgid "No command supplied nor shell requested"
 msgstr "Ne bir komut sağlandı ne de kabuk istendi"

-#: src/terminal-screen.cc:1517 src/terminal-screen.cc:1864
+#: src/terminal-screen.cc:1514 src/terminal-screen.cc:1861
 msgid "_Relaunch"
 msgstr "_Yeniden başlat"

-#: src/terminal-screen.cc:1520
+#: src/terminal-screen.cc:1517
 msgid "There was an error creating the child process for this terminal"
 msgstr "Bu uçbirim için oğul işlem yaratırken bir hata oluştu"

-#: src/terminal-screen.cc:1868
+#: src/terminal-screen.cc:1865
 #, c-format
 msgid "The child process exited normally with status %d."
 msgstr "Çocuk süreç %d durum kodu ile olağan biçimde çıkış yaptı."

-#: src/terminal-screen.cc:1871
+#: src/terminal-screen.cc:1868
 #, c-format
 msgid "The child process was aborted by signal %d."
 msgstr "Çocuk süreç %d sinyaliyle iptal edildi."

-#: src/terminal-screen.cc:1874
+#: src/terminal-screen.cc:1871
 msgid "The child process was aborted."
 msgstr "Çocuk süreç iptal edildi."


--- a/src/meson.build
+++ b/src/meson.build
@@ -204,7 +204,7 @@ server_incs = [
  src_inc,
 ]

-server_cxxflags = [
+server_cxxflags = version_cxxflags + [
  '-DTERMINAL_COMPILATION',
  '-DVTE_DISABLE_DEPRECATION_WARNINGS',
  '-DTERM_LOCALEDIR="@0@"'.format(gt_prefix / gt_localedir),
@@ -288,7 +288,7 @@ client_incs = [
  src_inc,
 ]

-client_cxxflags = [
+client_cxxflags = version_cxxflags + [
  '-DTERMINAL_COMPILATION',
  '-DTERMINAL_CLIENT',
  '-DTERM_DATADIR="@0@"'.format(gt_prefix / gt_datadir),
@@ -357,7 +357,7 @@ if get_option('nautilus_extension')
    src_inc,
  ]

-  nautilus_cxxflags = [
+  nautilus_cxxflags = glib_version_cxxflags + [
    '-DTERM_LOCALEDIR="@0@"'.format(gt_prefix / gt_localedir),
  ]


--- a/src/profile-editor.cc
+++ b/src/profile-editor.cc
@@ -741,7 +741,6 @@ typedef struct {

 /* These MUST be sorted by charset so that bsearch can work! */
 static const EncodingEntry encodings[] = {
-  { "ARMSCII-8",      N_("Armenian"),            GROUP_OBSOLETE },
  { "BIG5",           N_("Chinese Traditional"), GROUP_CJKV },
  { "BIG5-HKSCS",     N_("Chinese Traditional"), GROUP_CJKV },
  { "CP866",          N_("Cyrillic/Russian"),    GROUP_OBSOLETE },
@@ -751,15 +750,12 @@ static const EncodingEntry encodings[] = {
  { "GB18030",        N_("Chinese Simplified"),  GROUP_CJKV },
  { "GB2312",         N_("Chinese Simplified"),  GROUP_CJKV },
  { "GBK",            N_("Chinese Simplified"),  GROUP_CJKV },
-  { "GEORGIAN-PS",    N_("Georgian"),            GROUP_OBSOLETE },
  { "IBM850",         N_("Western"),             GROUP_OBSOLETE },
  { "IBM852",         N_("Central European"),    GROUP_OBSOLETE },
  { "IBM855",         N_("Cyrillic"),            GROUP_OBSOLETE },
  { "IBM857",         N_("Turkish"),             GROUP_OBSOLETE },
  { "IBM862",         N_("Hebrew"),              GROUP_OBSOLETE },
  { "IBM864",         N_("Arabic"),              GROUP_OBSOLETE },
-  { "ISO-2022-JP",    N_("Japanese"),            GROUP_CJKV },
-  { "ISO-2022-KR",    N_("Korean"),              GROUP_CJKV },
  { "ISO-8859-1",     N_("Western"),             GROUP_OBSOLETE },
  { "ISO-8859-10",    N_("Nordic"),              GROUP_OBSOLETE },
  { "ISO-8859-13",    N_("Baltic"),              GROUP_OBSOLETE },
@@ -775,7 +771,6 @@ static const EncodingEntry encodings[] = {
  { "ISO-8859-8",     N_("Hebrew Visual"),       GROUP_OBSOLETE },
  { "ISO-8859-8-I",   N_("Hebrew"),              GROUP_OBSOLETE },
  { "ISO-8859-9",     N_("Turkish"),             GROUP_OBSOLETE },
-  { "ISO-IR-111",     N_("Cyrillic"),            GROUP_OBSOLETE },
  { "KOI8-R",         N_("Cyrillic"),            GROUP_OBSOLETE },
  { "KOI8-U",         N_("Cyrillic/Ukrainian"),  GROUP_OBSOLETE },
  { "MAC-CYRILLIC",   N_("Cyrillic"),            GROUP_OBSOLETE },
@@ -835,6 +830,10 @@ append_encodings_for_group (GtkTreeStore *store,
    if (encodings[i].group != group)
      continue;

+    /* Skip encodings not supported by ICU */
+    if (terminal_util_translate_encoding (encodings[i].charset) == nullptr)
+      continue;
+
    gs_free char *name = g_strdup_printf ("%s " EM_DASH " %s",
                                          _(encodings[i].name), encodings[i].charset);


--- a/src/terminal-client-utils.cc
+++ b/src/terminal-client-utils.cc
@@ -140,6 +140,49 @@ terminal_client_get_environment_filters (void)
  return filters;
 }

+char const* const*
+terminal_client_get_environment_prefix_filters (void)
+{
+  static char const* filters[] = {
+    "GNOME_TERMINAL_",
+
+    /* other terminals */
+    "FOOT_",
+    "ITERM2_",
+    "MC_",
+    "MINTTY_",
+    "PUTTY_",
+    "RXVT_",
+    "TERM_",
+    "URXVT_",
+    "WEZTERM_",
+    "XTERM_",
+    nullptr
+  };
+
+  return filters;
+}
+
+static char**
+terminal_environ_unsetenv_prefix (char** envv,
+                                  char const* prefix)
+{
+  if (!envv)
+    return envv;
+
+  for (auto i = 0; envv[i]; ++i) {
+    if (!g_str_has_prefix (envv[i], prefix))
+      continue;
+
+    auto const equal = strchr(envv[i], '=');
+    g_assert(equal != nullptr);
+    gs_free char* env = g_strndup(envv[i], equal - envv[i]);
+    envv = g_environ_unsetenv (envv, env);
+  }
+
+  return envv;
+}
+
 /**
 * terminal_client_filter_environment:
 * @envv: (transfer full): the environment
@@ -154,10 +197,14 @@ terminal_client_filter_environment (char** envv)
  if (envv == nullptr)
    return nullptr;

-  char const* const* filters = terminal_client_get_environment_filters ();
-  for (unsigned i = 0; filters[i]; ++i)
+  auto filters = terminal_client_get_environment_filters ();
+  for (auto i = 0; filters[i]; ++i)
    envv = g_environ_unsetenv (envv, filters[i]);

+  filters = terminal_client_get_environment_prefix_filters ();
+  for (auto i = 0; filters[i]; ++i)
+    envv = terminal_environ_unsetenv_prefix (envv, filters[i]);
+
  return envv;
 }


--- a/src/terminal-client-utils.hh
+++ b/src/terminal-client-utils.hh
@@ -51,6 +51,8 @@ char * terminal_client_get_fallback_startup_id      (void) G_GNUC_MALLOC;

 char const* const* terminal_client_get_environment_filters (void);

+char const* const* terminal_client_get_environment_prefix_filters (void);
+
 char** terminal_client_filter_environment           (char** envv) G_GNUC_MALLOC;

 GSettings* terminal_g_settings_new (GSettingsSchemaSource* source,

--- a/src/terminal-nautilus.cc
+++ b/src/terminal-nautilus.cc
@@ -18,8 +18,6 @@
 */

 #include "config.h"
-#undef GDK_VERSION_MIN_REQUIRED
-#undef GDK_VERSION_MAX_ALLOWED

 #include <glib.h>
 #include <glib/gi18n-lib.h>
@@ -708,15 +706,15 @@ terminal_nautilus_get_file_items (NautilusMenuProvider *provider,
 }

 static void
-terminal_nautilus_menu_provider_iface_init (NautilusMenuProviderIface *iface)
+terminal_nautilus_menu_provider_interface_init (NautilusMenuProviderInterface *interface)
 {
-  iface->get_background_items = terminal_nautilus_get_background_items;
-  iface->get_file_items = terminal_nautilus_get_file_items;
+  interface->get_background_items = terminal_nautilus_get_background_items;
+  interface->get_file_items = terminal_nautilus_get_file_items;
 }

 G_DEFINE_DYNAMIC_TYPE_EXTENDED (TerminalNautilus, terminal_nautilus, G_TYPE_OBJECT, 0,
                                G_IMPLEMENT_INTERFACE_DYNAMIC (NAUTILUS_TYPE_MENU_PROVIDER,
-                                                               terminal_nautilus_menu_provider_iface_init))
+                                                               terminal_nautilus_menu_provider_interface_init))

 static void 
 terminal_nautilus_init (TerminalNautilus *nautilus)

--- a/src/terminal-regex.hh
+++ b/src/terminal-regex.hh
@@ -88,7 +88,7 @@
 /* Ends with :: */
 #define IPV6_RIGHT "(?x: (?&S6C){1,7} : )"
 /* Is "::" and nothing more */
-#define IPV6NULL  "(?x: :: )"
+#define IPV6_NULL  "(?x: :: )"

 /* The same ones for IPv4-embedded notation, without the actual IPv4 part */
 #define IPV6V4_FULL  "(?x: (?&S6C){6} )"
@@ -98,7 +98,7 @@

 /* IPV6: An IPv6 address (possibly with an embedded IPv4).
 * This macro defines both IPV4 and IPV6, since the latter one requires the former. */
-#define IP_DEF IPV4_DEF S6_DEF "(?(DEFINE)(?<IPV6>(?x: (?: " IPV6NULL " | " IPV6_LEFT " | " IPV6_MID " | " IPV6_RIGHT " | " IPV6_FULL " | (?: " IPV6V4_FULL " | " IPV6V4_LEFT " | " IPV6V4_MID " | " IPV6V4_RIGHT " ) (?&IPV4) ) (?! [.:[:xdigit:]] ) )))"
+#define IP_DEF IPV4_DEF S6_DEF "(?(DEFINE)(?<IPV6>(?x: (?: " IPV6_NULL " | " IPV6_LEFT " | " IPV6_MID " | " IPV6_RIGHT " | " IPV6_FULL " | (?: " IPV6V4_FULL " | " IPV6V4_LEFT " | " IPV6V4_MID " | " IPV6V4_RIGHT " ) (?&IPV4) ) (?! [.:[:xdigit:]] ) )))"

 /* Either an alphanumeric character or dash; or if [negative lookahead] not ASCII
 * then any graphical Unicode character.

--- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc
@@ -1407,6 +1407,17 @@ terminal_screen_get_child_command (TerminalScreen *screen,
  return TRUE;
 }

+static gboolean
+remove_prefixed_cb(void* key,
+                   void* value,
+                   void* user_data)
+{
+  auto const env = reinterpret_cast<char const*>(key);
+  auto const prefix = reinterpret_cast<char const*>(user_data);
+
+  return g_str_has_prefix(env, prefix);
+}
+
 static char**
 terminal_screen_get_child_environment (TerminalScreen *screen,
                                       char **initial_envv,
@@ -1442,10 +1453,17 @@ terminal_screen_get_child_environment (TerminalScreen *screen,
    }

  /* Remove unwanted env variables */
-  char const* const* filters = terminal_client_get_environment_filters ();
+  auto const filters = terminal_client_get_environment_filters ();
  for (i = 0; filters[i]; ++i)
    g_hash_table_remove (env_table, filters[i]);

+  auto const pfilters = terminal_client_get_environment_filters ();
+  for (i = 0; pfilters[i]; ++i) {
+    g_hash_table_foreach_remove (env_table,
+                                 GHRFunc(remove_prefixed_cb),
+                                 (void*)pfilters[i]);
+  }
+
  terminal_util_add_proxy_env (env_table);

  /* Add gnome-terminal private env vars used to communicate back to g-t-server */