* net/dbus.el (top): Don't check for (getenv

"DBUS_SESSION_BUS_ADDRESS").  It's done in dbusbind.c now.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9d178f367428ced7b1f6c1775ce6012ee85f8d17..19d8c262889854389085d49e3078223ee8ac5c11 100644 (file)
--- 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 273d531ed3525256245e30993ce613a3d158a93f..aeff93f6d26dcb528576a464bdb6c6c33a3e94e3 100644 (file)
--- 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)