diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-06-15 09:38:53 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-06-15 09:38:53 +0800 |
| commit | a55021bcef7eb082b48e56aac361bd35a3a77b64 (patch) | |
| tree | 9bcf1c1bbf522c87beac5d199b258f8aa24c7d7e /libgnomecanvas/gailcanvasitem.c | |
| parent | ead63f16b2269325c1e4080b3dce8818bbafe189 (diff) | |
| download | gsoc2013-evolution-a55021bcef7eb082b48e56aac361bd35a3a77b64.tar gsoc2013-evolution-a55021bcef7eb082b48e56aac361bd35a3a77b64.tar.gz gsoc2013-evolution-a55021bcef7eb082b48e56aac361bd35a3a77b64.tar.bz2 gsoc2013-evolution-a55021bcef7eb082b48e56aac361bd35a3a77b64.tar.lz gsoc2013-evolution-a55021bcef7eb082b48e56aac361bd35a3a77b64.tar.xz gsoc2013-evolution-a55021bcef7eb082b48e56aac361bd35a3a77b64.tar.zst gsoc2013-evolution-a55021bcef7eb082b48e56aac361bd35a3a77b64.zip | |
Revert "Fix all remaining GTK3 issues."
This reverts commit fd8b55edaa88906b588aa07d9eadcacd34a7a774.
Something in this commit seriously hosed ETable, making Evolution pretty
much unusable. Reverting this until I can track down the problem.
Diffstat (limited to 'libgnomecanvas/gailcanvasitem.c')
| -rw-r--r-- | libgnomecanvas/gailcanvasitem.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libgnomecanvas/gailcanvasitem.c b/libgnomecanvas/gailcanvasitem.c index 5ae7c8bee3..f059e1909c 100644 --- a/libgnomecanvas/gailcanvasitem.c +++ b/libgnomecanvas/gailcanvasitem.c @@ -199,7 +199,7 @@ gail_canvas_item_ref_state_set (AtkObject *obj) { item = GNOME_CANVAS_ITEM (g_obj); - if (item->flags & GNOME_CANVAS_ITEM_VISIBLE) + if (item->object.flags & GNOME_CANVAS_ITEM_VISIBLE) { atk_state_set_add_state (state_set, ATK_STATE_VISIBLE); if (is_item_on_screen (item)) @@ -482,16 +482,14 @@ is_item_in_window (GnomeCanvasItem *item, gint height) { GtkWidget *widget; - GdkWindow *window; gboolean retval; widget = GTK_WIDGET (item->canvas); - window = gtk_widget_get_window (widget); - if (window) + if (widget->window) { int window_width, window_height; - gdk_window_get_geometry (window, NULL, NULL, + gdk_window_get_geometry (widget->window, NULL, NULL, &window_width, &window_height, NULL); /* * Check whether rectangles intersect |