diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2010-10-03 11:23:07 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2010-10-03 11:23:07 +0200 |
| commit | a79b0f2863d2222fed175f6c6b3d535590c59558 (patch) | |
| tree | 1a105ee621607ee8a958e031e9ddd6a9f3b5ceae /src | |
| parent | 83b8ea28ea1d3f9f7c73af717fefaaeca18a1594 (diff) | |
* dbusbind.c (syms_of_dbusbind): Move putenv call ...
(Fdbus_init_bus): ... here. (Bug#7113)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/dbusbind.c | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e985c8f84c..156e64a1d4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 --git a/src/dbusbind.c b/src/dbusbind.c index f3a573d3bc..460cf52364 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -854,6 +854,9 @@ This is an internal function, it shall not be used outside dbus.el. */) 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 @@ 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. */ + /* 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); |