Merge branch 'master' into p2p

diff --git a/NEWS b/NEWS
index 68f82be..396a275 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+What's new in at-spi2-atk 0.3.91:
+
+* Default to --enable-relocate for now.
+
+* Fix for FDO#29880: gtk module can't handle reloading.
+
 What's new in at-spi2-atk 0.3.90:
 
 * FDO#29365: Stop using a deprecated glib function.

diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index 5b697a0..5fcd4fc 100644 (file)
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -36,6 +36,7 @@
 #include <atk/atk.h>
 
 #include <droute/droute.h>
+#include <gmodule.h>
 
 #include "bridge.h"
 #include "event.h"
@@ -809,6 +810,14 @@ gtk_module_init (gint * argc, gchar ** argv[])
   return 0;
 }
 
+gchar*
+g_module_check_init (GModule *module)
+{
+  g_module_make_resident (module);
+
+  return NULL;
+}
+
 void
 gnome_accessibility_module_init (void)
 {

diff --git a/configure.ac b/configure.ac
index 7cc6f5b..b4aef5b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([at-spi2-atk], [0.3.90], [accessibility-atspi@lists.linux-foundation.org])
+AC_INIT([at-spi2-atk], [0.3.91], [accessibility-atspi@lists.linux-foundation.org])
 AC_CONFIG_AUX_DIR(config)
 
 AT_SPI_ATK_MAJOR_VERSION=0
@@ -72,7 +72,7 @@ else
 fi
 AC_SUBST(X_LIBS)
 
-AC_ARG_ENABLE(relocate, [  --enable-relocate  Relocate to coexist with CORBA [default=no]], enable_relocate="$enableval", enable_relocate=no)
+AC_ARG_ENABLE(relocate, [  --enable-relocate  Relocate to coexist with CORBA [default=yes]], enable_relocate="$enableval", enable_relocate=yes)
 if test x$enable_relocate = xyes ; then
        AC_DEFINE(RELOCATE, , [Relocate to coexist with CORBA])
 fi