[at-spi2-atk] Some fixes for--disable-p2p



commit 9059241db02f04a4445909826206dee90b46cf8e
Author: Mike Gorse <mgorse novell com>
Date:   Wed Dec 15 16:31:14 2010 -0500

    Some fixes for--disable-p2p

 atk-adaptor/bridge.c |    4 ++++
 configure.ac         |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index ce1ea51..42ec92c 100644
--- 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
--- 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



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]