[gnome-terminal/gnome-3-20] screen: Remove WINDOWID env var on non-X11

[Christian Persch <chpe src gnome org>]

commit a0d7456691997cadb066d47b871513e01f8ef8f4
Author: Christian Persch <chpe src gnome org>
Date:   Mon Nov 7 18:30:17 2016 +0100

    screen: Remove WINDOWID env var on non-X11

 src/terminal-screen.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index 33a34ab..005ee46 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -1236,7 +1236,9 @@ get_child_environment (TerminalScreen *screen,
                                             GDK_WINDOW_XID (gtk_widget_get_window (window))));
       g_hash_table_replace (env_table, g_strdup ("DISPLAY"), g_strdup (gdk_display_get_name 
(gtk_widget_get_display (window))));
     }
+  else
 #endif
+    g_hash_table_remove (env_table, "WINDOWID");
 
   /* We need to put the working directory also in PWD, so that
    * e.g. bash starts in the right directory if @cwd is a symlink.