Fix for BGO#641338: Gracefully handle errors listening to dbus server for p2p

diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index e856c82..0baf6f8 100644 (file)
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -37,6 +37,7 @@
 
 #include <droute/droute.h>
 #include <gmodule.h>
+#include <glib/gi18n.h>
 
 #include "bridge.h"
 #include "event.h"
@@ -527,10 +528,15 @@ setup_bus (void)
 
   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)
+  {
+    g_warning (_("atk-bridge: Couldn't listen on dbus server: %s"), err.message);
+    dbus_error_init (&err);
+    spi_global_app_data->app_bus_addr [0] = '\0';
+    g_main_context_unref (spi_global_app_data->main_context);
+    spi_global_app_data->main_context = NULL;
     return -1;
+  }
 
   dbus_server_setup_with_g_main(server, NULL);
   dbus_server_set_new_connection_function(server, new_connection_cb, NULL, NULL);

diff --git a/atk-adaptor/event.c b/atk-adaptor/event.c
index cc1877a..81a0f34 100644 (file)
--- a/atk-adaptor/event.c
+++ b/atk-adaptor/event.c
@@ -55,15 +55,16 @@ typedef struct _SpiReentrantCallClosure
 static void
 switch_main_context (GMainContext *cnx)
 {
-#ifndef DISABLE_P2P
 /* 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;
 
   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);
-#endif
 }
 
 static void

diff --git a/po/POTFILES.in b/po/POTFILES.in
index ebb0efe..2d9aefd 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,4 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 at-spi2.schemas.in
+atk-adaptor/bridge.c