[evolution/rendering-cleanup] Adapt branch for building with GTK+ 2.22.

[Matthew Barnes <mbarnes src gnome org>]

commit ca56d90fbbca8b5e1a8d6e61ef134cfe8a80ff2f
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Oct 23 10:54:13 2010 -0400

    Adapt branch for building with GTK+ 2.22.

 e-util/gtk-compat.h             |   20 ++++++++++++++++++++
 libgnomecanvas/Makefile.am      |    1 -
 libgnomecanvas/gailcanvasitem.c |    6 +++++-
 widgets/misc/Makefile.am        |    1 -
 widgets/table/Makefile.am       |    1 -
 5 files changed, 25 insertions(+), 4 deletions(-)
---
diff --git a/e-util/gtk-compat.h b/e-util/gtk-compat.h
index 3b9c7ef..43e6977 100644
--- a/e-util/gtk-compat.h
+++ b/e-util/gtk-compat.h
@@ -12,6 +12,26 @@
 #define gtk_combo_box_text_get_active_text	gtk_combo_box_get_active_text
 #define GTK_COMBO_BOX_TEXT			GTK_COMBO_BOX
 #define GtkComboBoxText				GtkComboBox
+
+static inline gint
+gdk_window_get_width (GdkWindow *window)
+{
+	gint width, height;
+
+	gdk_drawable_get_size (GDK_DRAWABLE (window), &width, &height);
+
+	return width;
+}
+
+static inline gint
+gdk_window_get_height (GdkWindow *window)
+{
+	gint width, height;
+
+	gdk_drawable_get_size (GDK_DRAWABLE (window), &width, &height);
+
+	return height;
+}
 #endif
 
 #if GTK_CHECK_VERSION (2,23,0)
diff --git a/libgnomecanvas/Makefile.am b/libgnomecanvas/Makefile.am
index 76e5022..87ec6fd 100644
--- a/libgnomecanvas/Makefile.am
+++ b/libgnomecanvas/Makefile.am
@@ -61,7 +61,6 @@ MARSHAL_GENERATED =				\
 @EVO_MARSHAL_RULE@
 
 libgnomecanvas_la_LIBADD = \
-	$(top_builddir)/libart_lgpl/libart_lgpl.la	\
 	$(GNOME_PLATFORM_LIBS)
 
 libgnomecanvas_la_LDFLAGS = $(NO_UNDEFINED)
diff --git a/libgnomecanvas/gailcanvasitem.c b/libgnomecanvas/gailcanvasitem.c
index 1c08d66..54e0b7c 100644
--- a/libgnomecanvas/gailcanvasitem.c
+++ b/libgnomecanvas/gailcanvasitem.c
@@ -24,6 +24,9 @@
 #include "gailcanvasitem.h"
 #include <libgail-util/gailmisc.h>
 
+/* backward-compatibility cruft */
+#include "e-util/gtk-compat.h"
+
 static void       gail_canvas_item_initialize               (AtkObject         *obj,
 							     gpointer          data);
 static AtkObject* gail_canvas_item_get_parent               (AtkObject         *obj);
@@ -398,7 +401,8 @@ is_item_in_window (GnomeCanvasItem    *item,
       
       window_rect.x = 0;
       window_rect.y = 0;
-      gdk_drawable_get_size (window, &window_rect.width, &window_rect.height);
+      window_rect.width = gdk_window_get_width (window);
+      window_rect.height = gdk_window_get_height (window);
 
       retval = gdk_rectangle_intersect (extents, &window_rect, NULL);
     }
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 21faf33..909a9f7 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -151,7 +151,6 @@ libemiscwidgets_la_LIBADD =					\
 	$(top_builddir)/filter/libfilter.la			\
 	$(top_builddir)/a11y/libevolution-a11y.la		\
 	$(top_builddir)/libgnomecanvas/libgnomecanvas.la	\
-	$(top_builddir)/libart_lgpl/libart_lgpl.la		\
 	$(EVOLUTION_MAIL_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(MATH_LIB)						\
diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am
index a1fe865..b2afc99 100644
--- a/widgets/table/Makefile.am
+++ b/widgets/table/Makefile.am
@@ -173,7 +173,6 @@ libetable_la_LIBADD =						\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/widgets/text/libetext.la		\
 	$(top_builddir)/libgnomecanvas/libgnomecanvas.la	\
-	$(top_builddir)/libart_lgpl/libart_lgpl.la		\
 	$(E_UTIL_LIBS)						\
 	$(E_WIDGETS_LIBS)					\
 	$(MATH_LIB)						\