From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 20 Aug 2009 15:24:58 +0000 (+0000)
Subject: * net/dbus.el (top): Don't check for (getenv
X-Git-Tag: emacs-pretest-23.1.90~1773
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6fd2d19a36635272bb7293a8fbfd63172875dc96;p=emacs.git

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