Made clg_gdk_cairo_surface_get_window actually work

diff --git a/gdk/alien/glue.c b/gdk/alien/glue.c
index e734784a099936bf8187189c9bea8a55f0375af3..38c9a8321fdd1291d0a932766c61cd3afd3da0b3 100644 (file)
--- a/gdk/alien/glue.c
+++ b/gdk/alien/glue.c
@@ -21,7 +21,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
  * 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>
 
 
 #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
      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);
   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)
 #elif defined (G_OS_WIN32)
   HDC hdc = (HDC)cairo_win32_surface_get_dc (surface);
   if (hdc)