at-spi r1136 - in trunk: . atk-bridge cspi libspi

[liyuan svn gnome org]

Author: liyuan
Date: Fri Dec 12 07:36:16 2008
New Revision: 1136
URL: http://svn.gnome.org/viewvc/at-spi?rev=1136&view=rev

Log:
2008-12-12  Li Yuan  <li yuan sun com>

        * atk-bridge/bridge.c: (gtk_module_init),
        (gnome_accessibility_module_init),
        (gnome_accessibility_module_shutdown):
        Bug #563943. Allow applications choose not to load atk-bridge during
        startup.
        * atk-bridge/Makefile.am:
        * configure.in:
        * cspi/Makefile.am:
        * libspi/Makefile.am:
        Bug #563806. Reduce unused direct dependencies. Initial patch from
        Matthias Clasen.


Modified:
   trunk/ChangeLog
   trunk/atk-bridge/Makefile.am
   trunk/atk-bridge/bridge.c
   trunk/configure.in
   trunk/cspi/Makefile.am
   trunk/libspi/Makefile.am

Modified: trunk/atk-bridge/Makefile.am
==============================================================================
--- trunk/atk-bridge/Makefile.am	(original)
+++ trunk/atk-bridge/Makefile.am	Fri Dec 12 07:36:16 2008
@@ -33,4 +33,4 @@
 
 libatk_bridge_la_LIBADD = \
 	$(top_builddir)/libspi/libspi.la	\
-	$(ATK_BRIDGE_LIBS)	
+	$(ATK_BRIDGE_LIBS) $(X_LIBS)

Modified: trunk/atk-bridge/bridge.c
==============================================================================
--- trunk/atk-bridge/bridge.c	(original)
+++ trunk/atk-bridge/bridge.c	Fri Dec 12 07:36:16 2008
@@ -480,7 +480,13 @@
 int
 gtk_module_init (gint *argc, gchar **argv[])
 {
+  const gchar *load_bridge = g_getenv ("NO_AT_BRIDGE");
+
+  if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0)
+    {
 	return atk_bridge_init (argc, argv);
+    }
+  return 0;
 }
 
 static void
@@ -650,11 +656,16 @@
 void
 gnome_accessibility_module_init (void)
 {
-  atk_bridge_init (NULL, NULL);
+  const gchar *load_bridge = g_getenv ("NO_AT_BRIDGE");
 
-  if (g_getenv ("AT_BRIDGE_SHUTDOWN"))
+  if (!load_bridge || g_ascii_strtod (load_bridge, NULL) == 0)
     {
-	g_print("Atk Accessibility bridge initialized\n");
+      atk_bridge_init (NULL, NULL);
+
+      if (g_getenv ("AT_SPI_DEBUG"))
+        {
+	    g_print("Atk Accessibility bridge initialized\n");
+        }
     }
 }
 
@@ -673,7 +684,7 @@
   atk_bridge_initialized = FALSE;
   this_app = NULL;
 
-  if (g_getenv ("AT_BRIDGE_SHUTDOWN"))
+  if (g_getenv ("AT_SPI_DEBUG"))
     {
 	g_print("Atk Accessibility bridge shutdown\n");
     }

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Dec 12 07:36:16 2008
@@ -77,7 +77,7 @@
 if test x$no_x = xyes ; then
 	AC_MSG_ERROR([X development libraries not found])
 else
-	X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+	X_LIBS="$X_LIBS -lX11"
 fi
 
 AC_SUBST(X_LIBS)
@@ -144,7 +144,6 @@
 AC_SUBST(BONOBO_ACTIVATION_IDL_DIR)
 AC_SUBST(LIBBONOBO_IDL_DIR)
 
-LIBS="$LIBS $X_LIBS"
 dnl path to Xtst
 AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, XTST_LIBS=-lXtst,[
 	AC_MSG_ERROR([Couldn't find the Xtst library. Check config.log])],

Modified: trunk/cspi/Makefile.am
==============================================================================
--- trunk/cspi/Makefile.am	(original)
+++ trunk/cspi/Makefile.am	Fri Dec 12 07:36:16 2008
@@ -14,7 +14,7 @@
 
 LDADD =				\
 	$(top_builddir)/libspi/libspi.la	\
-	$(LIBCSPI_LIBS) $(X_LIBS)
+	$(LIBCSPI_LIBS) 
 
 libcspidir = $(includedir)/at-spi-1.0/cspi
 libcspi_HEADERS =		\

Modified: trunk/libspi/Makefile.am
==============================================================================
--- trunk/libspi/Makefile.am	(original)
+++ trunk/libspi/Makefile.am	Fri Dec 12 07:36:16 2008
@@ -10,7 +10,7 @@
            $(X_CFLAGS)
 
 libspi_la_LDFLAGS = @LT_VERSION_INFO@ -no-undefined
-libspi_la_LIBADD = $(LIBSPI_LIBS) $(XTST_LIBS)
+libspi_la_LIBADD = $(LIBSPI_LIBS)
 
 libspiincludedir = $(includedir)/at-spi-1.0/libspi