? at-spi-all.patch
? at-spi.patch
? depcomp
? gtk-doc.make
? atk-bridge/atk-bridge-ior-gdm.patch
? 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: configure.in
===================================================================
RCS file: /cvs/gnome/at-spi/configure.in,v
retrieving revision 1.190
diff -u -r1.190 configure.in
--- configure.in	22 Aug 2006 15:06:41 -0000	1.190
+++ configure.in	25 Sep 2006 20:43:43 -0000
@@ -110,7 +110,8 @@
 PKG_CHECK_MODULES(ATK_BRIDGE, [
 	libbonobo-2.0	>= req_ver_libbonobo
 	atk		>= req_ver_atk
-])
+	gtk+-2.0	>= req_ver_gtk
+])	
 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.95
diff -u -r1.95 bridge.c
--- atk-bridge/bridge.c	22 Aug 2006 14:57:50 -0000	1.95
+++ atk-bridge/bridge.c	25 Sep 2006 20:43:44 -0000
@@ -28,6 +28,8 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
 #include <libbonobo.h>
 #include <orbit/orbit.h>
 #include <atk/atk.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,
@@ -327,10 +330,37 @@
     return canonical_display_name;
 }
 
+
+static gchar *
+spi_atk_bridge_get_registry_ior (void)
+{
+     
+     Atom AT_SPI_IOR = XInternAtom (GDK_DISPLAY(), "AT_SPI_IOR", False); 
+     Atom actual_type;
+     int actual_format;
+     unsigned char *data = NULL;  
+     unsigned long nitems;
+     unsigned long leftover;
+
+     XGetWindowProperty(GDK_DISPLAY (), GDK_ROOT_WINDOW (), AT_SPI_IOR, 0L, 
+			(long)BUFSIZ, False, 
+			(Atom) 31, &actual_type, &actual_format,
+			&nitems, &leftover, &data);
+     
+     if (data == NULL)
+	  g_critical ("AT_SPI_REGISTRY ior was not set \n"
+		      "at gnome-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);
@@ -343,9 +373,17 @@
             }
 	  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);
-	  
+	  ior = (char *) spi_atk_bridge_get_registry_ior ();
+
+	  if (ior != NULL)
+	       registry = CORBA_ORB_string_to_object (bonobo_activation_orb_get (), 
+						      ior, &ev);
+	  else if (!strcmp (g_get_user_name (), "gdm")) 
+	       registry = bonobo_activation_activate_from_id  ("OAFIID:Accessibility_Registry:1.0", 
+							       0, NULL, &ev);
+	  else
+	       g_critical ("IOR not set.");  
+
 	  if (ev._major != CORBA_NO_EXCEPTION)
 	  {
 		  g_error ("Accessibility app error: exception during "
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	25 Sep 2006 20:43:44 -0000
@@ -32,6 +32,8 @@
 #include <glib/gmain.h>
 #include "registry.h"
 
+static void registry_set_ior (SpiRegistry *registry);
+
 int
 main (int argc, char **argv)
 {
@@ -68,6 +70,8 @@
 	  reg_env);
   bonobo_activation_registration_env_free (reg_env);
 
+  registry_set_ior (registry);
+
   if (ret != Bonobo_ACTIVATION_REG_SUCCESS)
     {
 #ifdef AT_SPI_DEBUG
@@ -85,3 +89,31 @@
   return 0;
 }
 
+static void
+registry_set_ior (SpiRegistry *registry){
+  CORBA_Environment ev;
+  GdkAtom  AT_SPI_IOR = gdk_atom_intern ("AT_SPI_IOR", FALSE);
+  char *name = NULL;
+
+  CORBA_exception_init (&ev);
+
+  name = CORBA_ORB_object_to_string (bonobo_activation_orb_get (),
+                                     bonobo_object_corba_objref (bonobo_object (registry)),
+                                     &ev);
+
+  gdk_property_change (gdk_get_default_root_window (),
+                       AT_SPI_IOR, (GdkAtom) 31, 8,
+                       GDK_PROP_MODE_REPLACE,
+                       (unsigned char *) name,
+                       name ? strlen (name) : 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);
+
+}
