Merge branch 'master' into p2p

Conflicts:
	configure.ac

diff --combined atk-adaptor/bridge.c
index 5fcd4fc,f476e96..6747a4d
--- 1/atk-adaptor/bridge.c
--- 2/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@@ -32,7 -32,6 +32,7 @@@
  #include <stdio.h>
  #include <stdarg.h>
  #include <string.h>
 +#include<sys/stat.h>
  #include <atk/atk.h>
  
  #include <droute/droute.h>
@@@ -176,6 -175,23 +176,6 @@@ set_reply (DBusPendingCall *pending, vo
      *replyptr = dbus_pending_call_steal_reply (pending);
  }
  
 -static DBusMessage *
 -send_and_allow_reentry (DBusConnection *bus, DBusMessage *message, DBusError *error)
 -{
 -    DBusPendingCall *pending;
 -    DBusMessage *reply = NULL;
 -
 -    if (!dbus_connection_send_with_reply (bus, message, &pending, -1))
 -    {
 -        return NULL;
 -    }
 -    dbus_pending_call_set_notify (pending, set_reply, (void *)&reply, NULL);
 -    while (!reply)
 -    {
 -      if (!dbus_connection_read_write_dispatch (bus, -1)) return NULL;
 -    }
 -    return reply;
 -}
  /*---------------------------------------------------------------------------*/
  
  static void
@@@ -211,6 -227,7 +211,7 @@@ get_registered_event_listeners (SpiBrid
                                           SPI_DBUS_PATH_REGISTRY,
                                           SPI_DBUS_INTERFACE_REGISTRY,
                                           "GetRegisteredEvents");
+   spi_global_app_data->events_initialized = TRUE;
    if (!message)
      return;
  
@@@ -257,6 -274,7 +258,6 @@@ register_reply (DBusPendingCall *pendin
        if (strcmp (dbus_message_get_signature (reply), "(so)") != 0)
          {
            g_warning ("AT-SPI: Could not obtain desktop path or name\n");
 -printf("sig: %s\n", dbus_message_get_signature(reply));
          }
        else
          {
@@@ -288,7 -306,6 +289,7 @@@ register_application (SpiBridge * app
    DBusMessageIter iter;
    DBusError error;
    DBusPendingCall *pending;
 +  const int max_addr_length = 128; /* should be long enough */
  
    dbus_error_init (&error);
  
@@@ -315,13 -332,6 +316,13 @@@
    if (message)
      dbus_message_unref (message);
  
 +/* could this be better, we accept some amount of race in getting the temp name*/
 +/* make sure the directory exists */
 +mkdir("/tmp/at-spi2/", S_IRWXU);
 +app->app_bus_addr = g_malloc(max_addr_length * sizeof(char));
 +sprintf(app->app_bus_addr, "unix:path=/tmp/at-spi2/socket-%d-%d", getpid(),
 +rand());
 +
    return TRUE;
  }
  
@@@ -498,43 -508,6 +499,43 @@@ install_plug_hooks (
    socket_class->embed = socket_embed_hook;
  }
  
 +static void
 +new_connection_cb (DBusServer *server, DBusConnection *con, void *data)
 +{
 +  GList *new_list;
 +
 +  dbus_connection_ref(con);
 +  dbus_connection_setup_with_g_main(con, NULL);
 +  droute_intercept_dbus (con);
 +  droute_context_register (spi_global_app_data->droute, con);
 +
 +  new_list = g_list_append (spi_global_app_data->direct_connections, con);
 +  if (new_list)
 +    spi_global_app_data->direct_connections = new_list;
 +}
 +
 +static int
 +setup_bus (void)
 +{
 +  DBusServer *server;
 +  DBusError err;
 +
 +  dbus_error_init(&err);
 +  server = dbus_server_listen(spi_global_app_data->app_bus_addr, &err);
 +
 +  /* is there a better way to handle this */
 +  if (server == NULL)
 +    return -1;
 +
 +  dbus_server_setup_with_g_main(server, NULL);
 +  dbus_server_set_new_connection_function(server, new_connection_cb, NULL, NULL);
 +
 +  spi_global_app_data->server = server;
 +
 +  return 0;
 +}
 +
 +
  gchar *atspi_dbus_name = NULL;
  static gboolean atspi_no_register = FALSE;
  
@@@ -649,7 -622,6 +650,7 @@@ signal_filter (DBusConnection *bus, DBu
   *
   * - DRoute for routing message to their accessible objects.
   * - Event handlers for emmitting signals on specific ATK events.
 + * - setup the bus for p2p communication
   * - Application registration with the AT-SPI registry.
   *
   */
@@@ -716,9 -688,8 +717,9 @@@ adaptor_init (gint * argc, gchar ** arg
          }
      }
  
 -  dbus_connection_setup_with_g_main (spi_global_app_data->bus,
 -                                     g_main_context_default ());
 +  spi_global_app_data->main_context = g_main_context_new ();
 +
 +  dbus_connection_setup_with_g_main (spi_global_app_data->bus, NULL);
  
    /* Hook our plug-and socket functions */
    install_plug_hooks ();
@@@ -734,7 -705,7 +735,7 @@@
  
    /* Register droute for routing AT-SPI messages */
    spi_global_app_data->droute =
 -    droute_new (spi_global_app_data->bus);
 +    droute_new ();
  
    treepath = droute_add_one (spi_global_app_data->droute,
                               "/org/a11y/atspi/cache", spi_global_cache);
@@@ -772,9 -743,6 +773,9 @@@
    spi_initialize_text (accpath);
    spi_initialize_value (accpath);
  
 +  droute_context_register (spi_global_app_data->droute,
 +                           spi_global_app_data->bus);
 +
    /* Register methods to send D-Bus signals on certain ATK events */
    spi_atk_register_event_listeners ();
  
@@@ -789,8 -757,6 +790,8 @@@
    else
      get_registered_event_listeners (spi_global_app_data);
  
 +  setup_bus();
 +
    g_atexit (exit_func);
  
    return 0;

diff --combined atk-adaptor/bridge.h
index 728b245,0c8b70d..1a3ebee
--- 1/atk-adaptor/bridge.h
--- 2/atk-adaptor/bridge.h
+++ b/atk-adaptor/bridge.h
@@@ -48,9 -48,6 +48,9 @@@ struct _SpiBridg
  
    DBusConnection *bus;
    DRouteContext  *droute;
 +  GMainContext *main_context;
 +  DBusServer *server;
 +  GList *direct_connections;
  
  /*
    SpiRegister *reg;
@@@ -59,8 -56,8 +59,9 @@@
  */
    gchar *desktop_name;
    gchar *desktop_path;
 +char *app_bus_addr;
    GList *events;
+   gboolean events_initialized;
  };
  
  extern SpiBridge *spi_global_app_data;

diff --combined atk-adaptor/event.c
index 4b23c64,f843f4f..0de5bb0
--- 1/atk-adaptor/event.c
--- 2/atk-adaptor/event.c
+++ b/atk-adaptor/event.c
@@@ -53,23 -53,11 +53,23 @@@ typedef struct _SpiReentrantCallClosur
  } SpiReentrantCallClosure;
  
  static void
 +switch_main_context (GMainContext *cnx)
 +{
 +  GList *list;
 +
 +  dbus_server_setup_with_g_main (spi_global_app_data->server, cnx);
 +  dbus_connection_setup_with_g_main (spi_global_app_data->bus, cnx);
 +  for (list = spi_global_app_data->direct_connections; list; list = list->next)
 +    dbus_connection_setup_with_g_main (list->data, cnx);
 +}
 +
 +static void
  set_reply (DBusPendingCall * pending, void *user_data)
  {
    SpiReentrantCallClosure* closure = (SpiReentrantCallClosure *) user_data; 
  
    closure->reply = dbus_pending_call_steal_reply (pending);
 +  switch_main_context (NULL);
    g_main_loop_quit (closure->loop);
  }
  
@@@ -78,20 -66,26 +78,20 @@@ send_and_allow_reentry (DBusConnection 
  {
    DBusPendingCall *pending;
    SpiReentrantCallClosure closure;
 +  GMainContext *main_context;
  
 -  if (!dbus_connection_send_with_reply (bus, message, &pending, -1))
 -      return NULL;
 -  dbus_pending_call_set_notify (pending, set_reply, (void *) &closure, NULL);
 -  closure.loop = g_main_loop_new (NULL, FALSE);
 +  main_context = (g_getenv ("AT_SPI_CLIENT") ? NULL :
 +                  spi_global_app_data->main_context);
 +  closure.loop = g_main_loop_new (main_context, FALSE);
 +  switch_main_context (main_context);
  
 -  /* TODO: Remove old AT_SPI_CLIENT name */
 -  if (getenv ("AT_SPI_CLIENT") || getenv ("AT_SPI_REENTER_G_MAIN_LOOP"))
 -    {
 -      g_main_loop_run  (closure.loop);
 -    }
 -  else
 +  if (!dbus_connection_send_with_reply (bus, message, &pending, -1))
      {
 -      closure.reply = NULL;
 -      while (!closure.reply)
 -        {
 -          if (!dbus_connection_read_write_dispatch (spi_global_app_data->bus, 1000))
 -            return NULL;
 -        }
 +      switch_main_context (NULL);
 +      return NULL;
      }
 +  dbus_pending_call_set_notify (pending, set_reply, (void *) &closure, NULL);
 +  g_main_loop_run  (closure.loop);
    
    g_main_loop_unref (closure.loop);
    return closure.reply;
@@@ -343,6 -337,9 +343,9 @@@ signal_is_needed (const gchar *klass, c
    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);