From: Mike Gorse <mgorse@novell.com>
Date: Fri, 3 Dec 2010 20:47:48 +0000 (-0500)
Subject: Merge branch 'p2p'
X-Git-Tag: AT_SPI2_ATK_2_12_0~336
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=commitdiff_plain;h=3ca4f9b7ac013b9f00c1c9ee379ed803943a96fd

Merge branch 'p2p'

Conflicts:
	atk-adaptor/bridge.c
---

3ca4f9b7ac013b9f00c1c9ee379ed803943a96fd
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;
  }