bug 693343 - comment check of DBUS_SESSION_BUS_ADDRESS
authorTrevor Saunders <trev.saunders@gmail.com>
Thu, 05 Jan 2012 21:47:59 -0500
changeset 85336 39acd9b60ebc2090731a3461b25b12454d66bf43
parent 85335 eed7b12a22a548a1f48363b3b8839f6c89377bd7
child 85337 3a47e5f593ad543c7f5a2217228696b75424f569
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs693343
milestone12.0a1
bug 693343 - comment check of DBUS_SESSION_BUS_ADDRESS
accessible/src/atk/nsApplicationAccessibleWrap.cpp
--- a/accessible/src/atk/nsApplicationAccessibleWrap.cpp
+++ b/accessible/src/atk/nsApplicationAccessibleWrap.cpp
@@ -879,16 +879,19 @@ PreInit()
 #ifdef MOZ_ENABLE_DBUS
   static bool sChecked = FALSE;
   if (sChecked)
     return;
 
   sChecked = TRUE;
 
   // dbus is only checked if GNOME_ACCESSIBILITY is unset
+  // also make sure that a session bus address is available to prevent dbus from
+  // starting a new one.  Dbus confuses the test harness when it creates a new
+  // process (see bug 693343)
   if (PR_GetEnv(sAccEnv) || !PR_GetEnv("DBUS_SESSION_BUS_ADDRESS"))
     return;
 
   DBusConnection* bus = dbus_bus_get(DBUS_BUS_SESSION, nsnull);
   if (!bus)
     return;
 
   dbus_connection_set_exit_on_disconnect(bus, FALSE);