diff src/dbusbind.c @ 110627:6a7fb61524be

Merge changes from emacs-23 branch.
author Juanma Barranquero <lekktu@gmail.com>
date Tue, 28 Sep 2010 01:25:27 +0200
parents 7867879a43ce cf68fbaebcfe
children 55c8c3ca3d48
line wrap: on
line diff
--- a/src/dbusbind.c	Mon Sep 27 23:07:47 2010 +0000
+++ b/src/dbusbind.c	Tue Sep 28 01:25:27 2010 +0200
@@ -2161,8 +2161,12 @@
     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.  */
+  setenv ("DBUS_FATAL_WARNINGS", "0", 1);
 #endif
 
   Fprovide (intern_c_string ("dbusbind"), Qnil);