[gtk+/client-side-windows: 60/284] Handle mask == NULL in shape_combine_mask

[Alexander Larsson <alexl src gnome org>]

commit 890503099fea2176076cef0ad3081fa168bd2499
Author: Alexander Larsson <alexl redhat com>
Date:   Wed Dec 17 13:57:48 2008 +0100

    Handle mask == NULL in shape_combine_mask
---
 gdk/gdkwindow.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 8fdb622..01e4ef7 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -6219,7 +6219,10 @@ gdk_window_shape_combine_mask (GdkWindow *window,
 
   private = (GdkWindowObject *) window;
 
-  region = _gdk_windowing_get_shape_for_mask (mask);
+  if (mask)
+    region = _gdk_windowing_get_shape_for_mask (mask);
+  else
+    region = NULL;
 
   gdk_window_shape_combine_region (window,
 				   region,
@@ -6383,7 +6386,10 @@ gdk_window_input_shape_combine_mask (GdkWindow *window,
 
   private = (GdkWindowObject *) window;
 
-  region = _gdk_windowing_get_shape_for_mask (mask);
+  if (mask)
+    region = _gdk_windowing_get_shape_for_mask (mask);
+  else
+    region = NULL;
 
   gdk_window_input_shape_combine_region (window,
 					 region,