[goffice/goffice-0-6] OSX: Backport 8773a2b60351e7f2d88a77ccbe479da8b6f300c2 for compilation.

[Morten Welinder <mortenw src gnome org>]

commit fd3ca41d6582e8ecfc16bfa84911e25db4a5dd4e
Author: Morten Welinder <terra gnome org>
Date:   Fri May 15 10:17:02 2009 -0400

    OSX: Backport 8773a2b60351e7f2d88a77ccbe479da8b6f300c2 for compilation.
---
 ChangeLog                                          |    5 +++++
 configure.in                                       |    2 +-
 .../foocanvas/foo-canvas-rect-ellipse.c            |    9 ++++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dd3fdc1..3efc1f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-25  Morten Welinder  <terra gnome org>
+
+	* Backport 8773a2b60351e7f2d88a77ccbe479da8b6f300c2 for OSX
+	compilation.
+
 2008-10-08  Jody Goldberg <jody gnome org>
 
 	* goffice/cut-n-paste/foocanvas/foo-canvas.c (foo_canvas_crossing) :
diff --git a/configure.in b/configure.in
index 2e56ba6..2c25955 100644
--- a/configure.in
+++ b/configure.in
@@ -399,7 +399,7 @@ if test "x$goffice_with_gtk" = "xtrue" ; then
   AC_CHECK_FUNCS(gtk_dialog_get_response_for_widget)
   AC_CHECK_FUNCS(gtk_widget_set_tooltip_text gtk_tool_item_set_tooltip_text,
 		 [test $gtk_disable_deprecated = no || gtk_disable_deprecated=yes])
-  AC_CHECK_FUNCS(gdk_cairo_set_source_pixbuf)
+  AC_CHECK_FUNCS(gdk_cairo_set_source_pixbuf gdk_x11_drawable_get_xdisplay)
 fi
 CFLAGS=$SAVE_CFLAGS
 LIBS=$SAVE_LIBS
diff --git a/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.c b/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.c
index b8126fc..2f954c4 100644
--- a/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.c
+++ b/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.c
@@ -42,7 +42,9 @@
 #include <string.h>
 
 #ifdef HAVE_RENDER
+#ifdef HAVE_GDK_X11_DRAWABLE_GET_XDISPLAY
 #include <gdk/gdkx.h>
+#endif
 #include <X11/extensions/Xrender.h>
 #endif
 
@@ -844,6 +846,7 @@ foo_canvas_rect_realize  (FooCanvasItem *item)
 
 	priv = FOO_CANVAS_RECT (item)->priv;
 
+#ifdef HAVE_GDK_X11_DRAWABLE_GET_XDISPLAY
 	dpy = gdk_x11_drawable_get_xdisplay (GTK_WIDGET (item->canvas)->window);
 	priv->use_render = XRenderQueryExtension (dpy, &event_base, &error_base);
 
@@ -856,6 +859,10 @@ foo_canvas_rect_realize  (FooCanvasItem *item)
 
 		priv->format = XRenderFindVisualFormat (dpy, visual);
 	}
+#else
+	priv->use_render = FALSE;
+	priv->format = NULL;
+#endif
 #endif
 
 	if (FOO_CANVAS_ITEM_CLASS (rect_parent_class)->realize) {
@@ -888,7 +895,7 @@ render_rect_alpha (FooCanvasRect *rect,
 	b = (rgba >> 8) & 0xff;
 	a = (rgba >> 0) & 0xff;
 
-#ifdef HAVE_RENDER
+#if defined(HAVE_RENDER) && defined(HAVE_GDK_X11_DRAWABLE_GET_XDISPLAY)
 	/* Every visual is not guaranteed to have a matching
 	 * XRenderPictFormat. So make sure that format is not null before
 	 * trying to render using Xrender calls.