From d996f9c5bd83a6974ca6e220ae15bc781f47d28e Mon Sep 17 00:00:00 2001
Message-Id: <d996f9c5bd83a6974ca6e220ae15bc781f47d28e.1715297766.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Fri, 7 Sep 2007 07:38:22 +0000
Subject: [PATCH] Made clg_gdk_cairo_surface_get_window actually work
Organization: Straylight/Edgeware

From: espen <espen>

---
 gdk/alien/glue.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/gdk/alien/glue.c b/gdk/alien/glue.c
index 38d343c..b2be36c 100644
--- a/gdk/alien/glue.c
+++ b/gdk/alien/glue.c
@@ -21,7 +21,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/* $Id: glue.c,v 1.7 2007-06-02 19:17:47 espen Exp $ */
+/* $Id: glue.c,v 1.8 2007-09-07 07:38:22 espen Exp $ */
 
 
 #include <gdk/gdk.h>
@@ -48,12 +48,16 @@ GdkWindow *clg_gdk_cairo_surface_get_window (cairo_surface_t *surface)
      portable way to find the GdkWindow of a Cairo surface. */
   
 #ifdef GDK_WINDOWING_X11
+  g_return_if_fail (cairo_surface_get_type (surface) == CAIRO_SURFACE_TYPE_XLIB);
+  
   Display* display = cairo_xlib_surface_get_display (surface);
-  Drawable window = cairo_xlib_surface_get_drawable (surface);
-  if (display && window)
-    return gdk_window_lookup_for_display (window, display);
-  else
-    return NULL;
+  if (display) {
+    Drawable window = cairo_xlib_surface_get_drawable (surface);
+    if (window)
+      return gdk_window_lookup_for_display (window, display);
+  }
+
+  return NULL;
 #elif defined (G_OS_WIN32)
   HDC hdc = (HDC)cairo_win32_surface_get_dc (surface);
   if (hdc)
-- 
[mdw]