[at-spi] Make at-spi compile with -DGSEAL_ENABLE

[Li Yuan <liyuan src gnome org>]

commit 3371ba6e52d047a2ee3fdb33305cf1c2679f17c7
Author: André Klapper <a9016009%40gmx.de>
Date:   Fri Mar 12 19:00:34 2010 +0800

    Make at-spi compile with -DGSEAL_ENABLE
    
    Bug #612554.

 configure.in                    |    2 +-
 test/keysynth-demo.c            |    8 ++++----
 test/login-helper-server-test.c |    6 +++---
 test/test-simple.c              |    2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/configure.in b/configure.in
index 33f306f..95f4764 100644
--- a/configure.in
+++ b/configure.in
@@ -27,7 +27,7 @@ AC_SUBST(LT_AGE)
 
 dnl required versions of other tools.
 m4_define([req_ver_atk],	[1.29.2])
-m4_define([req_ver_gtk],	[2.10.0])
+m4_define([req_ver_gtk],	[2.19.7])
 m4_define([req_ver_dbus],	[0.76])
 m4_define([req_ver_gconf],	[2.0.0])
 m4_define([req_ver_gail],	[1.9.0])
diff --git a/test/keysynth-demo.c b/test/keysynth-demo.c
index 5f6b6f7..42a376a 100644
--- a/test/keysynth-demo.c
+++ b/test/keysynth-demo.c
@@ -305,11 +305,11 @@ keysynth_realize (GtkWidget *widget)
   wm_hints.flags = InputHint;
   wm_hints.input = False;
   
-  XSetWMHints (GDK_WINDOW_XDISPLAY (widget->window),
-	       GDK_WINDOW_XWINDOW (widget->window), &wm_hints);
+  XSetWMHints (GDK_WINDOW_XDISPLAY (gtk_widget_get_window(widget)),
+	       GDK_WINDOW_XWINDOW (gtk_widget_get_window(widget)), &wm_hints);
   
-  XSetWMProtocols (GDK_WINDOW_XDISPLAY (widget->window),
-		   GDK_WINDOW_XWINDOW (widget->window), wm_window_protocols, 2);
+  XSetWMProtocols (GDK_WINDOW_XDISPLAY (gtk_widget_get_window(widget)),
+		   GDK_WINDOW_XWINDOW (gtk_widget_get_window(widget)), wm_window_protocols, 2);
 }
 
 static void
diff --git a/test/login-helper-server-test.c b/test/login-helper-server-test.c
index b42c9d1..0294f64 100644
--- a/test/login-helper-server-test.c
+++ b/test/login-helper-server-test.c
@@ -118,7 +118,7 @@ static Window*
 test_get_raise_windows (LoginHelper *helper)
 {
         Window *winlist = g_new0 (Window, 2);
-	winlist[0] = GDK_WINDOW_XWINDOW (mainwin->window);
+	winlist[0] = GDK_WINDOW_XWINDOW (gtk_widget_get_window(mainwin));
 	winlist[1] = None;
         return winlist;
 }
@@ -136,8 +136,8 @@ test_set_wm_dock (void)
 
   atom_type[0] = gdk_x11_get_xatom_by_name ("_NET_WM_WINDOW_TYPE_DOCK");
 
-  XChangeProperty (GDK_WINDOW_XDISPLAY (mainwin->window), 
-		   GDK_WINDOW_XWINDOW (mainwin->window), 
+  XChangeProperty (GDK_WINDOW_XDISPLAY (gtk_widget_get_window(mainwin)),
+		   GDK_WINDOW_XWINDOW (gtk_widget_get_window(mainwin)),
 		   atom_window_type,
 		   XA_ATOM, 32, PropModeReplace,
 		   (guchar *) &atom_type, 1);
diff --git a/test/test-simple.c b/test/test-simple.c
index 695c3ff..ae66964 100644
--- a/test/test-simple.c
+++ b/test/test-simple.c
@@ -65,7 +65,7 @@ focus_me (GtkWidget *widget)
 	/* Force a focus event - even if the WM focused
 	 * us before our at-bridge's idle handler registered
 	 * our interest */
-	if (!GTK_WIDGET_HAS_FOCUS (widget))
+	if (!gtk_widget_has_focus (widget))
 		gtk_widget_grab_focus (widget);
 /*	else: FIXME - gtk_widget_grab_focus should send a notify */
 		atk_focus_tracker_notify (aobject);