? at-spi-1.7.11.tar.gz
? at-spi-1.7.12.tar.gz
? at-spi-3.patch
? at-spi-4.diff
? at-spi-doc-signals.diff
? depcomp
? gtk-doc.make
? noref.patch
? registry-remove-app-crash.diff
? docs/reference/cspi/at-spi-cspi.interfaces
? docs/reference/cspi/at-spi-cspi.prerequisites
? docs/reference/cspi/tmpl/at-spi-cspi-unused.sgml
? docs/reference/cspi/tmpl/spi_document.sgml
? docs/reference/cspi/tmpl/spi_streamable_content.sgml
? docs/reference/idl/doxygen-output.txt
? docs/reference/idl/doxygen-warnings.txt
? docs/reference/idl/xml
? login-helper/Accessibility_LoginHelper-common.c
? login-helper/Accessibility_LoginHelper-imodule.c
? login-helper/Accessibility_LoginHelper-skels.c
? login-helper/Accessibility_LoginHelper-stubs.c
? login-helper/Accessibility_LoginHelper.h
? po/stamp-it
? test/event-listener-test
? test/keypad-test
? test/keysynth-test
? test/login-helper-client-test
? test/login-helper-server-test
? test/screen-review-test
? test/stress-test
? test/window-listener-test
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/at-spi/ChangeLog,v
retrieving revision 1.543
diff -u -r1.543 ChangeLog
--- ChangeLog	25 Sep 2006 10:53:01 -0000	1.543
+++ ChangeLog	16 Oct 2006 15:01:30 -0000
@@ -1,3 +1,7 @@
+2006-10-01  Bill Haneman <bill.haneman@sun.com>
+
+	* configure.in: Uprev/release 1.7.12 for gnome 2.16.1.
+
 2006-09-25  Bill Haneman <bill.haneman@sun.com>
 
 	* registryd/registry.c:
Index: configure.in
===================================================================
RCS file: /cvs/gnome/at-spi/configure.in,v
retrieving revision 1.191
diff -u -r1.191 configure.in
--- configure.in	1 Oct 2006 18:10:04 -0000	1.191
+++ configure.in	16 Oct 2006 15:01:30 -0000
@@ -27,9 +27,9 @@
 
 dnl required versions of other tools.
 m4_define([req_ver_atk],	[1.12.0])
+m4_define([req_ver_gtk],	[2.10.0])
+m4_define([req_ver_gail],	[1.9.0])
 m4_define([req_ver_libbonobo],	[1.107.0])
-m4_define([req_ver_gail],	[1.3.0])
-m4_define([req_ver_gtk],	[2.0.0])
 
 dnl Specify a header configuration file
 AM_CONFIG_HEADER(config.h)
@@ -84,8 +84,6 @@
 PKG_CHECK_MODULES(LIBSPI, [
 	libbonobo-2.0	>= req_ver_libbonobo
 	atk		>= req_ver_atk
-	gtk+-2.0	>= req_ver_gtk
-	gail		>= req_ver_gail
 ])
 AC_SUBST(LIBSPI_LIBS)
 AC_SUBST(LIBSPI_CFLAGS)
@@ -110,7 +108,7 @@
 PKG_CHECK_MODULES(ATK_BRIDGE, [
 	libbonobo-2.0	>= req_ver_libbonobo
 	atk		>= req_ver_atk
-])
+])	
 AC_SUBST(ATK_BRIDGE_LIBS)
 AC_SUBST(ATK_BRIDGE_CFLAGS)
 
Index: atk-bridge/bridge.c
===================================================================
RCS file: /cvs/gnome/at-spi/atk-bridge/bridge.c,v
retrieving revision 1.96
diff -u -r1.96 bridge.c
--- atk-bridge/bridge.c	20 Sep 2006 15:33:23 -0000	1.96
+++ atk-bridge/bridge.c	16 Oct 2006 15:01:31 -0000
@@ -23,6 +23,8 @@
 
 #include "config.h"
 
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -83,6 +85,7 @@
 static void     spi_atk_bridge_exit_func               (void);
 static void     spi_atk_register_event_listeners       (void);
 static void     spi_atk_bridge_focus_tracker           (AtkObject             *object);
+static gchar   *spi_atk_bridge_get_registry_ior        (void);
 static void     spi_atk_bridge_register_application    (Accessibility_Registry registry);
 static gboolean spi_atk_bridge_property_event_listener (GSignalInvocationHint *signal_hint,
 							guint                  n_param_values,
@@ -332,10 +335,41 @@
     return canonical_display_name;
 }
 
+static     Display *bridge_display = NULL;
+
+static gchar *
+spi_atk_bridge_get_registry_ior (void)
+{
+     
+     Atom AT_SPI_IOR;
+     Atom actual_type;
+     int actual_format;
+     unsigned char *data = NULL;  
+     unsigned long nitems;
+     unsigned long leftover;
+     if (!bridge_display) 
+       bridge_display = XOpenDisplay (spi_display_name ());
+
+     AT_SPI_IOR = XInternAtom (bridge_display, "AT_SPI_IOR", False); 
+     XGetWindowProperty(bridge_display, 
+			XDefaultRootWindow (bridge_display),
+			AT_SPI_IOR, 0L, 
+			(long)BUFSIZ, False, 
+			(Atom) 31, &actual_type, &actual_format,
+			&nitems, &leftover, &data);
+     if (data == NULL)
+	  g_critical (_("AT_SPI_REGISTRY was not started at session startup."));
+     
+     return (gchar *) data;
+     
+}
+
+
 static Accessibility_Registry
 spi_atk_bridge_get_registry (void)
 {
   CORBA_Environment ev;
+  char *ior =  NULL;
 
   if (registry_died || (registry == CORBA_OBJECT_NIL)) {
 	  CORBA_exception_init (&ev);
@@ -346,10 +380,17 @@
               else
 	        DBG (1, g_warning ("registry died! restarting..."));
             }
-	  bonobo_activation_set_activation_env_value ("AT_SPI_DISPLAY", spi_display_name ());
 
-	  registry = bonobo_activation_activate_from_id (
-		  "OAFIID:Accessibility_Registry:1.0", 0, NULL, &ev);
+	  /* XXX: This presumes that the registry has successfully restarted itself already...*/
+	  ior = (char *) spi_atk_bridge_get_registry_ior ();
+
+	  if (ior != NULL)
+	       registry = CORBA_ORB_string_to_object (bonobo_activation_orb_get (), 
+						      ior, &ev);
+	  else {
+	       g_warning ("IOR not set.");  
+	       registry = CORBA_OBJECT_NIL;
+	  }
 	  
 	  if (ev._major != CORBA_NO_EXCEPTION)
 	  {
@@ -555,6 +596,8 @@
     {
       g_assert (!bonobo_debug_shutdown ());
     }
+  if (bridge_display)
+    XCloseDisplay (bridge_display);
 }
 
 void
Index: registryd/registry-main.c
===================================================================
RCS file: /cvs/gnome/at-spi/registryd/registry-main.c,v
retrieving revision 1.19
diff -u -r1.19 registry-main.c
--- registryd/registry-main.c	19 Jul 2006 17:27:20 -0000	1.19
+++ registryd/registry-main.c	16 Oct 2006 15:01:32 -0000
@@ -27,11 +27,15 @@
 
 #include <config.h>
 #include <string.h>
-#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
 #include <libbonobo.h>
 #include <glib/gmain.h>
 #include "registry.h"
 
+#define spi_get_display() GDK_DISPLAY()
+
+static void registry_set_ior (SpiRegistry *registry);
+
 int
 main (int argc, char **argv)
 {
@@ -40,7 +44,6 @@
   const char  *display_name;
   char        *cp, *dp;
   SpiRegistry *registry;
-  GSList      *reg_env = NULL;
 
   if (!bonobo_init (&argc, argv))
     {
@@ -54,19 +57,18 @@
   display_name = g_getenv ("AT_SPI_DISPLAY");
   if (!display_name)
   {
-      display_name = g_strdup (gdk_display_get_name (gdk_display_get_default ()));
+      display_name = g_getenv ("DISPLAY");
       cp = strrchr (display_name, '.');
       dp = strrchr (display_name, ':');
       if (cp && dp && (cp > dp)) *cp = '\0';
   }
 
-  reg_env = bonobo_activation_registration_env_set ( reg_env, "AT_SPI_DISPLAY", 
-						     display_name);
   ret = bonobo_activation_register_active_server (
 	  obj_id,
 	  bonobo_object_corba_objref (bonobo_object (registry)),
-	  reg_env);
-  bonobo_activation_registration_env_free (reg_env);
+	  NULL);
+
+  registry_set_ior (registry);
 
   if (ret != Bonobo_ACTIVATION_REG_SUCCESS)
     {
@@ -85,3 +87,32 @@
   return 0;
 }
 
+static void
+registry_set_ior (SpiRegistry *registry){
+  CORBA_Environment ev;
+  Atom  AT_SPI_IOR = XInternAtom (spi_get_display (), "AT_SPI_IOR", FALSE);
+  char *iorstring = NULL;
+
+  CORBA_exception_init (&ev);
+
+  iorstring = CORBA_ORB_object_to_string (bonobo_activation_orb_get (),
+                                     bonobo_object_corba_objref (bonobo_object (registry)),
+                                     &ev);
+
+  XChangeProperty (spi_get_display(),
+		   XDefaultRootWindow (spi_get_display ()),
+		   AT_SPI_IOR, (Atom) 31, 8,
+		   PropModeReplace,
+		   (unsigned char *) iorstring,
+		   iorstring ? strlen (iorstring) : 0);
+
+  if (ev._major != CORBA_NO_EXCEPTION)
+	  {
+		  g_error ("Error setting IOR %s",
+			   CORBA_exception_id (&ev));
+                  CORBA_exception_free (&ev);
+           }
+
+  CORBA_exception_free (&ev);
+
+}
Index: registryd/registry.h
===================================================================
RCS file: /cvs/gnome/at-spi/registryd/registry.h,v
retrieving revision 1.18
diff -u -r1.18 registry.h
--- registryd/registry.h	5 Sep 2003 15:13:26 -0000	1.18
+++ registryd/registry.h	16 Oct 2006 15:01:32 -0000
@@ -25,7 +25,6 @@
 #define SPI_REGISTRY_H_
 
 #include <glib/gmain.h>
-#include <gdk/gdk.h>
 #include <libspi/listener.h>
 
 typedef struct _SpiRegistry SpiRegistry;
