Some fixes for--disable-p2p

diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index ce1ea51..42ec92c 100644 (file)
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -721,7 +721,11 @@ adaptor_init (gint * argc, gchar ** argv[])
         }
     }
 
+#ifndef DISABLE_P2P
   spi_global_app_data->main_context = g_main_context_new ();
+#else
+  spi_global_app_data->main_context = NULL;
+#endif
 
   dbus_connection_setup_with_g_main (spi_global_app_data->bus, NULL);
 

diff --git a/configure.ac b/configure.ac
index d477c4a..a13f776 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -136,5 +136,5 @@ AC_OUTPUT
 
 if test "x$dbus_glib_old" = "xyes"; then
        P2P_CFLAGS=-DDISABLE_P2P
-       AC_MSG_WARN([found dbus-glib older than 0.9.0; disabling peer-to-peer support])
+       AC_MSG_WARN([found dbus-glib older than 0.90; disabling peer-to-peer support])
 fi