Revved to 1.6.2.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@726 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/NEWS b/NEWS
index 711bcf4..60df8f0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+What's new in at-spi-1.6.2: 
+
+* fixes for problems at logout time (hangs, crashes)
+
+* bugfixes for #160862, #152147.
+
+* minor enhancements to test login-helper-server-test.
+
+(Padraig O'Briain)
+
 What's new in at-spi-1.6.1: 
 
 * LoginHelper API docs improved.

diff --git a/README b/README
index 92164e8..7b1c4ec 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 README
 
-at-spi version 1.6.1
+at-spi version 1.6.2
 
 *** Welcome to the Gnome Accessibility Project! ***
 

diff --git a/configure.in b/configure.in
index ed318d7..7eae3b7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,9 +2,9 @@ AC_INIT(idl/Accessibility.idl)
 
 AT_SPI_MAJOR_VERSION=1
 AT_SPI_MINOR_VERSION=6
-AT_SPI_MICRO_VERSION=1
-AT_SPI_INTERFACE_AGE=1
-AT_SPI_BINARY_AGE=1
+AT_SPI_MICRO_VERSION=2
+AT_SPI_INTERFACE_AGE=2
+AT_SPI_BINARY_AGE=2
 AT_SPI_VERSION="$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION.$AT_SPI_MICRO_VERSION"
 AM_INIT_AUTOMAKE(at-spi, $AT_SPI_VERSION)
 AC_SUBST(AT_SPI_MAJOR_VERSION)
@@ -16,7 +16,7 @@ AC_SUBST(AT_SPI_BINARY_AGE)
 # libtool versioning
 LT_RELEASE=$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION
 LT_CURRENT=10
-LT_REVISION=5
+LT_REVISION=2
 LT_AGE=10
 LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
 AC_SUBST(LT_VERSION_INFO)

diff --git a/test/login-helper-server-test.c b/test/login-helper-server-test.c
index ba6a274..b7c53c8 100644 (file)
--- a/test/login-helper-server-test.c
+++ b/test/login-helper-server-test.c
@@ -1,5 +1,8 @@
 #include <libbonobo.h>
 #include <login-helper/login-helper.h>
+#include <gtk/gtkwindow.h>
+#include <gdk/gdkx.h>
+#include <X11/Xatom.h>
 
 static void test_init_login_helper_vpointers (LoginHelper *helper, 
                                              gpointer test_set_safe, 
@@ -12,6 +15,12 @@ static LoginHelperDeviceReqFlags test_get_device_reqs (LoginHelper *helper);
 
 static Window* test_get_raise_windows (LoginHelper *helper);
 
+static void    test_post_window (void);
+
+static void    test_set_wm_dock (void);
+
+static GtkWidget *mainwin = NULL;
+
 int
 main (int argc, char **argv)
 {
@@ -24,7 +33,7 @@ main (int argc, char **argv)
                g_error ("Could not initialize oaf / Bonobo");
        }
        
-       obj_id = "OAFIID:GNOME_GOK:1.0";  /* just for testing, stolen from GOK */
+       obj_id = "OAFIID:GNOME_TEST:1.0";  /* just for testing, install manually */
        
        helper = BONOBO_OBJECT (g_object_new (LOGIN_HELPER_TYPE, NULL));
        
@@ -72,6 +81,10 @@ main (int argc, char **argv)
        
        test_init_login_helper_vpointers ((LoginHelper*)helper, test_set_safe, test_get_device_reqs, test_get_raise_windows);
 
+       gtk_init (&argc, &argv);
+
+       test_post_window ();
+
        bonobo_main ();
 }
 
@@ -96,11 +109,51 @@ test_set_safe (LoginHelper *helper, gboolean safe)
 static LoginHelperDeviceReqFlags
 test_get_device_reqs (LoginHelper *helper)
 {
-       return 0;
+       return LOGIN_HELPER_POST_WINDOWS;
 }
 
 static Window*
 test_get_raise_windows (LoginHelper *helper)
 {
-       return NULL;
+        Window *winlist = g_new0 (Window, 2);
+       winlist[0] = GDK_WINDOW_XWINDOW (mainwin->window);
+       winlist[1] = None;
+        return winlist;
+}
+
+
+void
+test_set_wm_dock ()
+{
+  Atom atom_type[1], atom_window_type;
+
+  gtk_widget_hide (mainwin);
+
+  gdk_error_trap_push ();
+  atom_window_type = gdk_x11_get_xatom_by_name ("_NET_WM_WINDOW_TYPE");
+
+  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), 
+                  atom_window_type,
+                  XA_ATOM, 32, PropModeReplace,
+                  (guchar *) &atom_type, 1);
+  gdk_error_trap_pop ();
+
+  gtk_widget_show (mainwin);
+
+}
+
+static void
+test_post_window ()
+{
+        mainwin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+
+       gtk_window_set_screen (GTK_WINDOW (mainwin), gdk_screen_get_default ());
+
+        /* gtk_window_set_keep_above (GTK_WINDOW (mainwin), true); optional */
+       /* test_set_wm_dock (); optional */
+
+       gtk_widget_show_all (mainwin);
 }