diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/dbus.el | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9d178f36742..19d8c262889 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-08-20 Michael Albinus <michael.albinus@gmx.de> + + * net/dbus.el (top): Don't check for (getenv + "DBUS_SESSION_BUS_ADDRESS"). It's done in dbusbind.c now. + 2009-08-19 Magnus Henoch <magnus.henoch@gmail.com> * log-edit.el (log-edit-strip-single-file-name): New var. 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, ;; descriptors to input_wait_mask, in order to detect incoming ;; messages immediately. (dbus-ignore-errors - (when (getenv "DBUS_SESSION_BUS_ADDRESS") - (dbus-init-bus :system) - (dbus-init-bus :session))) + (dbus-init-bus :system) + (dbus-init-bus :session)) (provide 'dbus) |