Index: ChangeLog
===================================================================
--- ChangeLog	(revision 882)
+++ ChangeLog	(working copy)
@@ -1,3 +1,11 @@
+<<<<<<< .mine
+2007-01-29  Bill Haneman <billh@gnome.org>
+
+	* atk-bridge/bridge.c:
+	(atk_bridge_init): Register event listeners even if we don't 
+	register as a full-fledged app; fixes bug #400709.
+	
+=======
 2007-01-22  Li Yuan  <li.yuan@sun.com>
 
 	* configure.in, NEWS: Uprev/release 1.7.16 for gnome 2.18.0 Beta 1.
@@ -29,6 +37,7 @@
 	(spi_atk_bridge_register_application), (spi_atk_emit_eventv):
 	Bug #372988, #381670. Fix memory leak.
 
+>>>>>>> .r882
 2007-01-02  Bill Haneman <billh@gnome.org>
 
 	* libspi/text.c:
Index: atk-bridge/bridge.c
===================================================================
--- atk-bridge/bridge.c	(revision 882)
+++ atk-bridge/bridge.c	(working copy)
@@ -223,11 +223,17 @@
                         "children-changed::remove",
                         (GCallback) spi_atk_bridge_toplevel_removed, 
                         NULL);
+      /* in this case we redefine 'success' to mean 'registry is present' */
+      success = (spi_atk_bridge_get_registry () != CORBA_OBJECT_NIL); 
     }
   else
     {
       success = spi_atk_bridge_do_registration ();
     }
+  /* 
+   * we must emit events even if we are not registered as a 
+   * full-fledged app; See bugzilla #400709. 
+   */
   if (success) 
     {
       spi_atk_register_event_listeners ();
