diff options
| author | Juanma Barranquero | 2010-09-28 01:25:27 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2010-09-28 01:25:27 +0200 |
| commit | 95b6d681b1121e1be8955aa3f79dd39098edf4cf (patch) | |
| tree | 445d016578b131a7435fac83fc1fbd49f3a45877 /src/dbusbind.c | |
| parent | 9f2d52e714dfa161c9c9393075a3bcdf056a4ac8 (diff) | |
| parent | 0cceab3d5942aef608dc33be4616b77206201115 (diff) | |
| download | emacs-95b6d681b1121e1be8955aa3f79dd39098edf4cf.tar.gz emacs-95b6d681b1121e1be8955aa3f79dd39098edf4cf.zip | |
Merge changes from emacs-23 branch.
Diffstat (limited to 'src/dbusbind.c')
| -rw-r--r-- | src/dbusbind.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/dbusbind.c b/src/dbusbind.c index a0881a06f66..ffa02e8e9c9 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c | |||
| @@ -2161,8 +2161,12 @@ be called when the D-Bus reply message arrives. */); | |||
| 2161 | doc: /* If non-nil, debug messages of D-Bus bindings are raised. */); | 2161 | doc: /* If non-nil, debug messages of D-Bus bindings are raised. */); |
| 2162 | #ifdef DBUS_DEBUG | 2162 | #ifdef DBUS_DEBUG |
| 2163 | Vdbus_debug = Qt; | 2163 | Vdbus_debug = Qt; |
| 2164 | /* We can also set environment DBUS_VERBOSE=1 in order to see more | ||
| 2165 | traces. */ | ||
| 2164 | #else | 2166 | #else |
| 2165 | Vdbus_debug = Qnil; | 2167 | Vdbus_debug = Qnil; |
| 2168 | /* We do not want to abort. */ | ||
| 2169 | setenv ("DBUS_FATAL_WARNINGS", "0", 1); | ||
| 2166 | #endif | 2170 | #endif |
| 2167 | 2171 | ||
| 2168 | Fprovide (intern_c_string ("dbusbind"), Qnil); | 2172 | Fprovide (intern_c_string ("dbusbind"), Qnil); |