diff options
| author | Michael Albinus | 2009-08-20 15:24:58 +0000 |
|---|---|---|
| committer | Michael Albinus | 2009-08-20 15:24:58 +0000 |
| commit | 6fd2d19a36635272bb7293a8fbfd63172875dc96 (patch) | |
| tree | 33db5041a21c4b7f6a71780107cbca6f810646a7 /lisp/net | |
| parent | 3f56d3c665c4d63064832628d110f646781c6353 (diff) | |
| download | emacs-6fd2d19a36635272bb7293a8fbfd63172875dc96.tar.gz emacs-6fd2d19a36635272bb7293a8fbfd63172875dc96.zip | |
* net/dbus.el (top): Don't check for (getenv
"DBUS_SESSION_BUS_ADDRESS"). It's done in dbusbind.c now.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/dbus.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index 273d531ed35..aeff93f6d26 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el | |||
| @@ -836,9 +836,8 @@ name of the property, and its value. If there are no properties, | |||
| 836 | ;; descriptors to input_wait_mask, in order to detect incoming | 836 | ;; descriptors to input_wait_mask, in order to detect incoming |
| 837 | ;; messages immediately. | 837 | ;; messages immediately. |
| 838 | (dbus-ignore-errors | 838 | (dbus-ignore-errors |
| 839 | (when (getenv "DBUS_SESSION_BUS_ADDRESS") | 839 | (dbus-init-bus :system) |
| 840 | (dbus-init-bus :system) | 840 | (dbus-init-bus :session)) |
| 841 | (dbus-init-bus :session))) | ||
| 842 | 841 | ||
| 843 | (provide 'dbus) | 842 | (provide 'dbus) |
| 844 | 843 | ||