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

9b994fed · Paul Eggert · 01b13eb7 · 9b994fed · 9b994fed
Commit 9b994fed authored Aug 21, 2012 by Paul Eggert
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

src/ChangeLog src/ChangeLog +4 -0

src/dbusbind.c src/dbusbind.c +4 -2

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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.

--- 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);