[gtk+] Yet another fix for shape handling

[Matthias Clasen <matthiasc src gnome org>]

commit 0efb24f589a74c4a4e78a1803d6e7205be9c1984
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Apr 6 20:30:39 2010 -0400

    Yet another fix for shape handling
    
    This should fix problems with awn and notify-osd.

 gdk/x11/gdkwindow-x11.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index f7789d4..1771873 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -4610,10 +4610,7 @@ _xwindow_get_shape (Display *xdisplay,
 			     window,
 			     shape_type, &rn, &ord);
 
-  if (xrl == NULL)
-    return NULL; /* XShape not supported */
-
-  if (rn == 0)
+  if (xrl == NULL || rn == 0)
     return gdk_region_new (); /* Empty */
 
   if (ord != YXBanded)