Merge branch 'master' into p2p

Conflicts:
	configure.ac

diff --git a/NEWS b/NEWS
index d571c8e..f9f8a40 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+What's new in at-spi2-atk 1.91.0:
+
+* --disable-relocate is the default again.
+
 What's new in at-spi2-atk 0.3.92:
 
 * Have value methods return 0 on failure rather than fail, as in original pyatspi

diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index 5fcd4fc..6747a4d 100644 (file)
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -211,6 +211,7 @@ get_registered_event_listeners (SpiBridge *app)
                                          SPI_DBUS_PATH_REGISTRY,
                                          SPI_DBUS_INTERFACE_REGISTRY,
                                          "GetRegisteredEvents");
+  spi_global_app_data->events_initialized = TRUE;
   if (!message)
     return;
 

diff --git a/atk-adaptor/bridge.h b/atk-adaptor/bridge.h
index 728b245..1a3ebee 100644 (file)
--- a/atk-adaptor/bridge.h
+++ b/atk-adaptor/bridge.h
@@ -61,6 +61,7 @@ struct _SpiBridge
   gchar *desktop_path;
 char *app_bus_addr;
   GList *events;
+  gboolean events_initialized;
 };
 
 extern SpiBridge *spi_global_app_data;

diff --git a/atk-adaptor/event.c b/atk-adaptor/event.c
index 4b23c64..0de5bb0 100644 (file)
--- a/atk-adaptor/event.c
+++ b/atk-adaptor/event.c
@@ -343,6 +343,9 @@ signal_is_needed (const gchar *klass, const gchar *major, const gchar *minor)
   gboolean ret = FALSE;
   GList *list;
 
+  if (!spi_global_app_data->events_initialized)
+    return TRUE;
+
   data [0] = ensure_proper_format (klass + 21);
   data [1] = ensure_proper_format (major);
   data [2] = ensure_proper_format (minor);

diff --git a/configure.ac b/configure.ac
index 89ca462..dfc05d5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([at-spi2-atk], [0.5.1], [accessibility-atspi@lists.linux-foundation.org])
+AC_INIT([at-spi2-atk], [1.91.0], [accessibility-atspi@lists.linux-foundation.org])
 AC_CONFIG_AUX_DIR(config)
 
 AT_SPI_ATK_MAJOR_VERSION=0