[at-spi2-core] Clear AT_SPI_BUS property on launcher exit

[Colin Walters <walters src gnome org>]

commit 84ffac8a40f3288767dd83f60605063a399b0704
Author: Colin Walters <walters verbum org>
Date:   Thu Mar 24 13:30:51 2011 -0400

    Clear AT_SPI_BUS property on launcher exit
    
    Clear the X property if our bus is gone; in the case where e.g.
    GDM is launching a login on an X server it was using before,
    we don't want early login processes to pick up the stale address.

 bus/at-spi-bus-launcher.c |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c
index 37ad60f..0d6b4b7 100644
--- a/bus/at-spi-bus-launcher.c
+++ b/bus/at-spi-bus-launcher.c
@@ -385,6 +385,23 @@ main (int    argc,
 
   if (_global_app->a11y_bus_pid > 0)
     kill (_global_app->a11y_bus_pid, SIGTERM);
+
+  /* Clear the X property if our bus is gone; in the case where e.g. 
+   * GDM is launching a login on an X server it was using before,
+   * we don't want early login processes to pick up the stale address.
+   */
+  {
+    Display *display = XOpenDisplay (NULL);
+    if (display)
+      {
+        Atom bus_address_atom = XInternAtom (display, "AT_SPI_BUS", False);
+        XDeleteProperty (display,
+                         XDefaultRootWindow (display),
+                         bus_address_atom);
+      }
+    XFlush (display);
+    XCloseDisplay (display);
+  }
     
   if (_global_app->a11y_launch_error_message)
     {