X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=blobdiff_plain;f=atk-adaptor%2Fevent.c;h=859d3992c3c7ac9cc6002d8e04ae764fad4072f3;hp=1cbda2305034e87f328c73bcd82d7e3f7c6b6b71;hb=8e03fc29c9dc15f90cbb6433e05b55ab535658a1;hpb=6fbb1ba2c5281706525ae93bd78ee6cd1f1c9bc8

diff --git a/atk-adaptor/event.c b/atk-adaptor/event.c
index 1cbda23..859d399 100644
--- a/atk-adaptor/event.c
+++ b/atk-adaptor/event.c
@@ -64,9 +64,8 @@ switch_main_context (GMainContext *cnx)
 {
   GList *list;
 
-#ifndef DISABLE_P2P
-  atspi_dbus_server_setup_with_g_main (spi_global_app_data->server, cnx);
-#endif
+  if (spi_global_app_data->server)
+    atspi_dbus_server_setup_with_g_main (spi_global_app_data->server, cnx);
   atspi_dbus_connection_setup_with_g_main (spi_global_app_data->bus, cnx);
   for (list = spi_global_app_data->direct_connections; list; list = list->next)
     atspi_dbus_connection_setup_with_g_main (list->data, cnx);