diff options
| author | Mike Gorse <mgorse@linux-l2tz.site> | 2011-05-13 17:32:06 +0200 |
|---|---|---|
| committer | Mike Gorse <mgorse@linux-l2tz.site> | 2011-05-13 17:32:06 +0200 |
| commit | 0a787b81281b9b6e2ab91882e2b124ba3abe16a4 (patch) | |
| tree | 5dff225625c00def08329e28ccb5579663599d8f | |
| parent | 8a6c00e6d88983e849464f5f1fa045fa4d29cc5f (diff) | |
| download | at-spi2-atk-0a787b81281b9b6e2ab91882e2b124ba3abe16a4.tar.gz | |
Reentrancy fixes when using --disable-p2p
| -rw-r--r-- | atk-adaptor/bridge.c | 4 | ||||
| -rw-r--r-- | atk-adaptor/event.c | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c index f25f520..86bfc47 100644 --- a/atk-adaptor/bridge.c +++ b/atk-adaptor/bridge.c @@ -708,11 +708,7 @@ 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 atspi_dbus_connection_setup_with_g_main (spi_global_app_data->bus, NULL); diff --git a/atk-adaptor/event.c b/atk-adaptor/event.c index 4752ce7..d489a13 100644 --- a/atk-adaptor/event.c +++ b/atk-adaptor/event.c @@ -59,13 +59,11 @@ typedef struct _SpiReentrantCallClosure static void switch_main_context (GMainContext *cnx) { -/* This code won't work on dbus-glib earlier than 0.9.0 because of FDO#30574 */ - if (spi_global_app_data->app_bus_addr [0] == '\0') - return; - GList *list; +#ifndef DISABLE_P2P atspi_dbus_server_setup_with_g_main (spi_global_app_data->server, cnx); +#endif atspi_dbus_connection_setup_with_g_main (spi_global_app_data->bus, cnx); for (list = spi_global_app_data->direct_connections; list; list = list->next) atspi_dbus_connection_setup_with_g_main (list->data, cnx); @@ -373,6 +371,7 @@ signal_is_needed (const gchar *klass, const gchar *major, const gchar *minor) } } +//printf("event: %s %s %s: %d\n", data[0], data[1], data[2], ret); g_free (data [2]); g_free (data [1]); g_free (data [0]); |