Mercurial > emacs
changeset 110840:eb0cb131cf06
* dbusbind.c (syms_of_dbusbind): Move putenv call ...
(Fdbus_init_bus): ... here. (Bug#7113)
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Sun, 03 Oct 2010 11:23:07 +0200 |
| parents | 018f0b2e8f23 |
| children | c93b5b77a985 |
| files | src/ChangeLog src/dbusbind.c |
| diffstat | 2 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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):
--- 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);