[gtk+] gtkwindow: Force CSD on Wayland

[Jasper St. Pierre <jstpierre src gnome org>]

commit 6325e4a037d10074442043287223eb639479fc78
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Jun 26 10:30:29 2014 -0400

    gtkwindow: Force CSD on Wayland
    
    We rely on CSD here on the Wayland platform and giving the opportunity
    to turn it off doesn't make too much sense.

 gtk/gtkwindow.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index f8e71fc..2fef625 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -5575,14 +5575,13 @@ gtk_window_should_use_csd (GtkWindow *window)
     return TRUE;
 #endif
 
-  csd_env = g_getenv ("GTK_CSD");
-
 #ifdef GDK_WINDOWING_WAYLAND
-  if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))) &&
-      g_strcmp0 (csd_env, "0") != 0)
+  if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))))
     return TRUE;
 #endif
 
+  csd_env = g_getenv ("GTK_CSD");
+
   return (g_strcmp0 (csd_env, "1") == 0);
 }