* dbusbind.c (xd_remove_watch): Do not assume C99 comments.

2 files changed, 8 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 75853f3d354..b8da88f3d6c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * dbusbind.c (xd_remove_watch): Do not assume C99 comments.
+
 2012-08-21  Dmitry Antipov  <dmantipov@yandex.ru>
 
         Avoid direct writes to contents member of struct Lisp_Vector.
diff --git a/src/dbusbind.c b/src/dbusbind.c
index c1b1310454c..f63f2948304 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -1039,11 +1039,13 @@ xd_remove_watch (DBusWatch *watch, void *data)
     return;
 
   /* Unset session environment.  */
+#if 0
   if (XSYMBOL (QCdbus_session_bus) == data)
     {
-      //      XD_DEBUG_MESSAGE ("unsetenv DBUS_SESSION_BUS_ADDRESS");
-      //      unsetenv ("DBUS_SESSION_BUS_ADDRESS");
+      XD_DEBUG_MESSAGE ("unsetenv DBUS_SESSION_BUS_ADDRESS");
+      unsetenv ("DBUS_SESSION_BUS_ADDRESS");
     }
+#endif
 
   if (flags & DBUS_WATCH_WRITABLE)
     delete_write_fd (fd);