From 9590879e2f550a29d230099680081a9d3a90d414 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 18 Jun 2015 16:10:36 +0100 Subject: [PATCH] Revert "window: Reinstate logic for should_use_csd()" This reverts commit f043fd532dc66a7abb1d4ea57c666655330cc429. The whole point of having can_use_csd() return TRUE when GTK_CSD is unset is to use it inside enable_csd(). https://bugzilla.gnome.org/show_bug.cgi?id=751140 --- gtk/gtkwindow.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 7f4e74b37f..fb8e0b019d 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -4079,7 +4079,8 @@ gtk_window_can_use_csd (GtkWindow *window) csd_env = g_getenv ("GTK_CSD"); - return (g_strcmp0 (csd_env, "1") == 0); + /* If GTK_CSD is unset we default to CSD support */ + return csd_env == NULL || (strcmp (csd_env, "1") == 0); } static void