From 858e6bcd658b060757cc88d8106518540ec432b8 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Thu, 27 Aug 2009 13:34:00 +0200
Subject: [PATCH] Allow x and y to be NULL in gdk_window_get_geometry

Fixes a crash reported in bug #593249
---
 gdk/gdkwindow.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 08317046b9..fa8e63c8ab 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -7368,8 +7368,10 @@ gdk_window_get_geometry (GdkWindow *window,
 	  parent = private->parent;
 	  if (parent && !gdk_window_has_impl (parent))
 	    {
-	      *x -= parent->abs_x;
-	      *y -= parent->abs_y;
+	      if (x)
+		*x -= parent->abs_x;
+	      if (y)
+		*y -= parent->abs_y;
 	    }
 	}
       else