Merge from trunk and resolve conflicts.

1 files changed, 9 insertions, 4 deletions

diff --git a/src/dbusbind.c b/src/dbusbind.c
index 8997e01b068..4852739d8e4 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -761,7 +761,7 @@ xd_append_arg (int dtype, Lisp_Object object, DBusMessageIter *iter)
                 && STRINGP (CAR_SAFE (XD_NEXT_VALUE (object)))
                 && NILP (CDR_SAFE (XD_NEXT_VALUE (object))))
               {
-                strcpy (signature, SSDATA (CAR_SAFE (XD_NEXT_VALUE (object))));
+                lispstpcpy (signature, CAR_SAFE (XD_NEXT_VALUE (object)));
                 object = CDR_SAFE (XD_NEXT_VALUE (object));
               }
 
@@ -1054,6 +1054,7 @@ xd_remove_watch (DBusWatch *watch, void *data)
 
   /* Unset session environment.  */
 #if 0
+  /* This is buggy, since unsetenv is not thread-safe.  */
   if (XSYMBOL (QCdbus_session_bus) == data)
     {
       XD_DEBUG_MESSAGE ("unsetenv DBUS_SESSION_BUS_ADDRESS");
@@ -1219,9 +1220,6 @@ this connection to those buses.  */)
       XSETFASTINT (val, (intptr_t) connection);
       xd_registered_buses = Fcons (Fcons (bus, val), xd_registered_buses);
 
-      /* We do not want to abort.  */
-      xputenv ("DBUS_FATAL_WARNINGS=0");
-
       /* Cleanup.  */
       dbus_error_free (&derror);
     }
@@ -1738,6 +1736,13 @@ xd_read_queued_messages (int fd, void *data)
 
 
 void
+init_dbusbind (void)
+{
+  /* We do not want to abort.  */
+  xputenv ("DBUS_FATAL_WARNINGS=0");
+}
+
+void
 syms_of_dbusbind (void)
 {