Merge branch 'p2p'

Conflicts:
	atk-adaptor/bridge.c

diff --combined atk-adaptor/bridge.c
index 35086f4,398ebda..ce1ea51
--- 1/atk-adaptor/bridge.c
--- 2/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@@ -32,6 -32,7 +32,7 @@@
  #include <stdio.h>
  #include <stdarg.h>
  #include <string.h>
+ #include<sys/stat.h>
  #include <atk/atk.h>
  
  #include <droute/droute.h>
@@@ -175,23 -176,6 +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
@@@ -274,7 -258,6 +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
          {
@@@ -306,6 -289,7 +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);
  
@@@ -332,6 -316,15 +316,15 @@@
    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));
+ #ifndef DISABLE_P2P
+ sprintf(app->app_bus_addr, "unix:path=/tmp/at-spi2/socket-%d-%d", getpid(),
+ rand());
+ #endif
+ 
    return TRUE;
  }
  
@@@ -508,6 -501,45 +501,45 @@@ 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)
+ {
+ #ifndef DISABLE_P2P
+   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;
+ #endif
+ 
+   return 0;
+ }
+ 
+ 
  gchar *atspi_dbus_name = NULL;
  static gboolean atspi_no_register = FALSE;
  
@@@ -622,6 -654,7 +654,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.
   *
   */
@@@ -688,8 -721,9 +721,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 ();
@@@ -705,7 -739,7 +739,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);
@@@ -743,6 -777,9 +777,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 ();
  
@@@ -757,6 -794,10 +794,8 @@@
    else
      get_registered_event_listeners (spi_global_app_data);
  
 -  g_atexit (exit_func);
 -
+   setup_bus();
+ 
    return 0;
  }
  

diff --combined configure.ac
index 88b9864,c1c7397..5f7afb7
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,4 -1,4 +1,4 @@@
 -AC_INIT([at-spi2-atk], [1.91.0], [accessibility-atspi@lists.linux-foundation.org])
 +AC_INIT([at-spi2-atk], [1.91.3], [accessibility-atspi@lists.linux-foundation.org])
  AC_CONFIG_AUX_DIR(config)
  
  AT_SPI_ATK_MAJOR_VERSION=0
@@@ -43,7 -43,10 +43,10 @@@ PKG_CHECK_MODULES(GLIB, [glib-2.0]
  AC_SUBST(GLIB_LIBS)
  AC_SUBST(GLIB_CFLAGS)
  
- PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= 0.7.0])
+ PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.90, dbus_glib=yes, dbus_glib=no)
+ if test "x$dbus_glib" = "xno"; then
+       PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.7.0, dbus_glib_old=yes)
+ fi
  AC_SUBST(DBUS_GLIB_LIBS)
  AC_SUBST(DBUS_GLIB_CFLAGS)
  
@@@ -105,6 -108,12 +108,12 @@@ DBIND_CHECK_ALIGNOF(dbind_pointer
  DBIND_CHECK_ALIGNOF(dbind_struct)
  CPPFLAGS=$orig_CPPFLAGS 
  
+ if test "x$dbus_glib_old" = "xyes"; then
+       P2P_CFLAGS=-DDISABLE_P2P
+       AC_MSG_WARN([found dbus-glib older than 0.9.0; disabling peer-to-peer support])
+ fi
+ AC_SUBST(P2P_CFLAGS)
+ 
  AC_CONFIG_FILES([Makefile
                 dbind/dbind-config.h
                 dbind/Makefile