at-spi r1139 - in branches/gnome-2-24: . atk-bridge

[liyuan svn gnome org]

Author: liyuan
Date: Fri Dec 19 03:46:42 2008
New Revision: 1139
URL: http://svn.gnome.org/viewvc/at-spi?rev=1139&view=rev

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

        * NEWS:
        * README:
        * configure.in:
        Uprev/release 1.24.1.
        * 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.


Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/NEWS
   branches/gnome-2-24/README
   branches/gnome-2-24/atk-bridge/bridge.c
   branches/gnome-2-24/configure.in

Modified: branches/gnome-2-24/NEWS
==============================================================================
--- branches/gnome-2-24/NEWS	(original)
+++ branches/gnome-2-24/NEWS	Fri Dec 19 03:46:42 2008
@@ -1,3 +1,7 @@
+What's new in at-spi-1.24.1:
+
+* Bugfixes: #563943.
+
 What's new in at-spi-1.24.0:
 
 * Bugfixes: #535827.

Modified: branches/gnome-2-24/README
==============================================================================
--- branches/gnome-2-24/README	(original)
+++ branches/gnome-2-24/README	Fri Dec 19 03:46:42 2008
@@ -1,6 +1,6 @@
 README
 
-at-spi version 1.24.0
+at-spi version 1.24.1
 
 This version of at-spi requires atk 1.17.0 or later.
 

Modified: branches/gnome-2-24/atk-bridge/bridge.c
==============================================================================
--- branches/gnome-2-24/atk-bridge/bridge.c	(original)
+++ branches/gnome-2-24/atk-bridge/bridge.c	Fri Dec 19 03:46:42 2008
@@ -481,7 +481,13 @@
 int
 gtk_module_init (gint *argc, gchar **argv[])
 {
+  const gchar *load_bridge = g_getenv ("NO_AT_BRIDGE");
+
+  if (!load_bridge || atoi (load_bridge) == 0)
+    {
 	return atk_bridge_init (argc, argv);
+    }
+  return 0;
 }
 
 static void
@@ -651,11 +657,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 || atoi (load_bridge) == 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");
+        }
     }
 }
 
@@ -674,7 +685,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: branches/gnome-2-24/configure.in
==============================================================================
--- branches/gnome-2-24/configure.in	(original)
+++ branches/gnome-2-24/configure.in	Fri Dec 19 03:46:42 2008
@@ -2,7 +2,7 @@
 
 AT_SPI_MAJOR_VERSION=1
 AT_SPI_MINOR_VERSION=24
-AT_SPI_MICRO_VERSION=0
+AT_SPI_MICRO_VERSION=1
 AT_SPI_INTERFACE_AGE=0
 AT_SPI_BINARY_AGE=0
 AT_SPI_VERSION="$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION.$AT_SPI_MICRO_VERSION"