aboutsummaryrefslogtreecommitdiffstats
path: root/libgnomecanvas
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-10-23 22:54:13 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-10-30 01:51:38 +0800
commitdf5ff95999e486568f6c229ac9dcbef70aeaff4f (patch)
tree74b4cba848c75d38776bbadb3c460a3167d58ab5 /libgnomecanvas
parentac3903ac0fccf9e64e993f861e97c11e232dbf32 (diff)
downloadgsoc2013-evolution-df5ff95999e486568f6c229ac9dcbef70aeaff4f.tar.gz
gsoc2013-evolution-df5ff95999e486568f6c229ac9dcbef70aeaff4f.tar.zst
gsoc2013-evolution-df5ff95999e486568f6c229ac9dcbef70aeaff4f.zip
Adapt branch for building with GTK+ 2.22.
Diffstat (limited to 'libgnomecanvas')
-rw-r--r--libgnomecanvas/Makefile.am1
-rw-r--r--libgnomecanvas/gailcanvasitem.c6
2 files changed, 5 insertions, 2 deletions
diff --git a/libgnomecanvas/Makefile.am b/libgnomecanvas/Makefile.am
index 939712f37a..828de3c500 100644
--- a/libgnomecanvas/Makefile.am
+++ b/libgnomecanvas/Makefile.am
@@ -62,7 +62,6 @@ MARSHAL_GENERATED = \
gnome-canvas-marshal.h
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 1c08d66f5f..54e0b7c576 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);
}