From d3f29749a5e2ca5a21f9900717d6c0fc4ace906c Mon Sep 17 00:00:00 2001 From: monsta Date: Sat, 20 Jan 2018 12:05:51 +0300 Subject: [PATCH] screen: stop setting TERM and COLORTERM environment variables closes https://github.com/mate-desktop/mate-terminal/issues/209 taken from: https://git.gnome.org/browse/gnome-terminal/commit/?id=a0ecd018f070b96a6ca2ff778ddda0f7fde5b847 https://git.gnome.org/browse/gnome-terminal/commit/?id=1d5c1b6ca6373c1301494edbc9e43c3e6a9c9aaf --- src/Makefile.am | 1 - src/terminal-screen.c | 3 --- 2 files changed, 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 239fded..8994e3a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -64,7 +64,6 @@ nodist_mate_terminal_SOURCES= $(BUILT_SOURCES) mate_terminal_CPPFLAGS = \ -DTERMINAL_COMPILATION \ - -DEXECUTABLE_NAME=\"mate-terminal\" \ -DTERM_DATADIR="\"$(datadir)\"" \ -DTERM_LOCALEDIR="\"$(datadir)/locale\"" \ -DTERM_PKGDATADIR="\"$(pkgdatadir)\"" \ diff --git a/src/terminal-screen.c b/src/terminal-screen.c index bbdbf6e..421b144 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c @@ -1424,9 +1424,6 @@ get_child_environment (TerminalScreen *screen, g_hash_table_remove (env_table, "LINES"); g_hash_table_remove (env_table, "MATE_DESKTOP_ICON"); - g_hash_table_replace (env_table, g_strdup ("COLORTERM"), g_strdup (EXECUTABLE_NAME)); - g_hash_table_replace (env_table, g_strdup ("TERM"), g_strdup ("xterm")); /* FIXME configurable later? */ - /* FIXME: moving the tab between windows, or the window between displays will make the next two invalid... */ g_hash_table_replace (env_table, g_strdup ("WINDOWID"), g_strdup_printf ("%ld", GDK_WINDOW_XID (gtk_widget_get_window (window)))); g_hash_table_replace (env_table, g_strdup ("DISPLAY"), g_strdup (gdk_display_get_name (display)));