summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog2
-rw-r--r--src/dbusbind.c4
2 files changed, 4 insertions, 2 deletions
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);