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

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

* net/dbus.el (top): Don't check for (getenv
"DBUS_SESSION_BUS_ADDRESS"). It's done in dbusbind.c now.
6fd2d19a · Michael Albinus · 3f56d3c6 · 6fd2d19a · 6fd2d19a
Commit 6fd2d19a authored Aug 20, 2009 by Michael Albinus
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

lisp/ChangeLog lisp/ChangeLog +5 -0

lisp/net/dbus.el lisp/net/dbus.el +2 -3

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+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.

--- 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)