summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2010-04-06 20:30:39 -0400
committerMatthias Clasen <mclasen@redhat.com>2010-04-06 20:33:19 -0400
commit0efb24f589a74c4a4e78a1803d6e7205be9c1984 (patch)
treeeba71c1a7576eda10c9c7643db3583320735a423 /gdk
parentb9516e70f55b59c9ef8c1c510cc5683dba5cec66 (diff)
downloadgtk+-0efb24f589a74c4a4e78a1803d6e7205be9c1984.tar.gz
Yet another fix for shape handling
This should fix problems with awn and notify-osd.
Diffstat (limited to 'gdk')
-rw-r--r--gdk/x11/gdkwindow-x11.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index f7789d4ef4..1771873218 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)