[at-spi2-atk: 13/14] Merge branch 'p2p'

[Mike Gorse <mgorse src gnome org>]

commit 3ca4f9b7ac013b9f00c1c9ee379ed803943a96fd
Merge: 9180950 344dedd
Author: Mike Gorse <mgorse novell com>
Date:   Fri Dec 3 15:47:48 2010 -0500

    Merge branch 'p2p'
    
    Conflicts:
    	atk-adaptor/bridge.c

 atk-adaptor/Makefile.include               |    2 +-
 atk-adaptor/adaptors/Makefile.am           |    2 +-
 atk-adaptor/adaptors/application-adaptor.c |   21 +++++++
 atk-adaptor/bridge.c                       |   81 +++++++++++++++++++-------
 atk-adaptor/bridge.h                       |    4 +
 atk-adaptor/event.c                        |   41 ++++++++-----
 atk-adaptor/introspection.c                |   12 +++-
 configure.ac                               |   11 +++-
 droute/Makefile.am                         |    6 +-
 droute/droute.c                            |   86 +++++++++++++++++++++-------
 droute/droute.h                            |   11 +++-
 11 files changed, 205 insertions(+), 72 deletions(-)
---
diff --cc atk-adaptor/bridge.c
index 35086f4,398ebda..ce1ea51
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@@ -757,6 -794,10 +794,8 @@@ adaptor_init (gint * argc, gchar ** arg
    else
      get_registered_event_listeners (spi_global_app_data);
  
+   setup_bus();
+ 
 -  g_atexit (exit_func);
 -
    return 0;
  }