[gtk+] gtkwindow: Fix resize without "_GTK_FRAME_EXTENTS"

[Benjamin Otte <otte src gnome org>]

commit 9757ea2c49b21c11710e7148d8cda19275453b80
Author: Olivier Fourdan <ofourdan redhat com>
Date:   Mon Nov 9 12:05:37 2015 +0100

    gtkwindow: Fix resize without "_GTK_FRAME_EXTENTS"
    
    git commit a5b1cdd0 introduced a regression where CSD windows are not
    resizable with metacity.
    
    Reason being that metacity does not support "_GTK_FRAME_EXTENTS" and
    therefore gtk_window_supports_client_shadow() would always return FALSE.
    
    This explains why it works with window managers which support
    "_GTK_FRAME_EXTENTS" such as mutter/gnome-shell or xfwm4.
    
    Partially revert commit a5b1cdd0 to reinstate the logic in
    get_shadow_width().
    
    Bugzilla: https://bugzilla.gnome.org/show_bug.cgi?id=757805

 gtk/gtkwindow.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 9c4fcb2..a76ea04 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -6722,10 +6722,8 @@ get_shadow_width (GtkWindow *window,
   if (!priv->decorated)
     return;
 
-  if (!priv->client_decorated)
-    return;
-
-  if (!(gtk_window_should_use_csd (window) &&
+  if (!priv->client_decorated &&
+      !(gtk_window_should_use_csd (window) &&
         gtk_window_supports_client_shadow (window)))
     return;