diff options
| author | Eli Zaretskii | 2013-03-28 20:13:59 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-03-28 20:13:59 +0200 |
| commit | d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e (patch) | |
| tree | 04fa8bc7bd2058a316a7ee30f8741d25bfd0b060 /src/dbusbind.c | |
| parent | 2ef26ceb192c7683754cf0b4aa3087f501254332 (diff) | |
| parent | e74aeda863cd6896e06e92586f87b45d63d67d15 (diff) | |
| download | emacs-d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e.tar.gz emacs-d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e.zip | |
Merge from trunk and resolve conflicts.
Diffstat (limited to 'src/dbusbind.c')
| -rw-r--r-- | src/dbusbind.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbusbind.c b/src/dbusbind.c index 80086946fc4..863f7634eb5 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Elisp bindings for D-Bus. | 1 | /* Elisp bindings for D-Bus. |
| 2 | Copyright (C) 2007-2012 Free Software Foundation, Inc. | 2 | Copyright (C) 2007-2013 Free Software Foundation, Inc. |
| 3 | 3 | ||
| 4 | This file is part of GNU Emacs. | 4 | This file is part of GNU Emacs. |
| 5 | 5 | ||
| @@ -1203,7 +1203,7 @@ this connection to those buses. */) | |||
| 1203 | xd_registered_buses = Fcons (Fcons (bus, val), xd_registered_buses); | 1203 | xd_registered_buses = Fcons (Fcons (bus, val), xd_registered_buses); |
| 1204 | 1204 | ||
| 1205 | /* We do not want to abort. */ | 1205 | /* We do not want to abort. */ |
| 1206 | putenv ((char *) "DBUS_FATAL_WARNINGS=0"); | 1206 | xputenv ("DBUS_FATAL_WARNINGS=0"); |
| 1207 | 1207 | ||
| 1208 | /* Cleanup. */ | 1208 | /* Cleanup. */ |
| 1209 | dbus_error_free (&derror); | 1209 | dbus_error_free (&derror); |