# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1286097787 -7200
# Node ID eb0cb131cf0683493304b453ee82704e93594fda
# Parent  018f0b2e8f2352795f69d68b27e5212f1cbadd4a
* dbusbind.c (syms_of_dbusbind): Move putenv call ...
(Fdbus_init_bus): ... here.  (Bug#7113)

diff -r 018f0b2e8f23 -r eb0cb131cf06 src/ChangeLog
--- a/src/ChangeLog	Sat Oct 02 21:27:39 2010 -0400
+++ b/src/ChangeLog	Sun Oct 03 11:23:07 2010 +0200
@@ -1,3 +1,8 @@
+2010-10-03  Michael Albinus  <michael.albinus@gmx.de>
+
+	* dbusbind.c (syms_of_dbusbind): Move putenv call ...
+	(Fdbus_init_bus): ... here.  (Bug#7113)
+
 2010-10-03  Glenn Morris  <rgm@gnu.org>
 
 	* buffer.c (before-change-functions, after-change-functions):
diff -r 018f0b2e8f23 -r eb0cb131cf06 src/dbusbind.c
--- a/src/dbusbind.c	Sat Oct 02 21:27:39 2010 -0400
+++ b/src/dbusbind.c	Sun Oct 03 11:23:07 2010 +0200
@@ -854,6 +854,9 @@
 					    NULL, (void*) XHASH (bus), NULL))
     XD_SIGNAL1 (build_string ("Cannot add watch functions"));
 
+  /* We do not want to abort.  */
+  putenv ("DBUS_FATAL_WARNINGS=0");
+
   /* Return.  */
   return Qnil;
 }
@@ -2130,12 +2133,11 @@
     doc: /* If non-nil, debug messages of D-Bus bindings are raised.  */);
 #ifdef DBUS_DEBUG
   Vdbus_debug = Qt;
-  /* We can also set environment DBUS_VERBOSE=1 in order to see more
-     traces.  */
+  /* We can also set environment variable DBUS_VERBOSE=1 in order to
+     see more traces.  This requires libdbus-1 to be configured with
+     --enable-verbose-mode.  */
 #else
   Vdbus_debug = Qnil;
-  /* We do not want to abort.  */
-  putenv ("DBUS_FATAL_WARNINGS=0");
 #endif
 
   Fprovide (intern_c_string ("dbusbind"), Qnil);