From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 27 Sep 2010 12:44:26 +0000 (+0200)
Subject: * dbusbind.c (syms_of_dbusbind): Set $DBUS_FATAL_WARNINGS to "0".
X-Git-Tag: emacs-pretest-23.2.90~93^2~5
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=11a5af7c3f30a5aa9823cf386ac82a56b3b81f2c;p=emacs.git

* dbusbind.c (syms_of_dbusbind): Set $DBUS_FATAL_WARNINGS to "0".
(Bug#7113)
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 380e8becc1f..c74dd66edbb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,6 @@
 2010-09-27  Michael Albinus  <michael.albinus@gmx.de>
 
-	* dbusbind.c (syms_of_dbusbind): Unset $DBUS_FATAL_WARNINGS.
+	* dbusbind.c (syms_of_dbusbind): Set $DBUS_FATAL_WARNINGS to "0".
 	(Bug#7113)
 
 2010-09-26  Jan Djärv  <jan.h.d@swipnet.se>
diff --git a/src/dbusbind.c b/src/dbusbind.c
index 6fc5a923422..0b5d32ce467 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -2130,10 +2130,12 @@ message arrives.  */);
     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.  */
 #else
   Vdbus_debug = Qnil;
   /* We do not want to abort.  */
-  unsetenv ("DBUS_FATAL_WARNINGS");
+  setenv ("DBUS_FATAL_WARNINGS", 0, 1);
 #endif
 
   Fprovide (intern_c_string ("dbusbind"), Qnil);