* net/dbus.el (top): Initialize only when `dbusbind' is loaded.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4d60e1da31db1ef96f35fa3096bfe54fb1f55394..0a5ca4cf515ff6c20b20658c0506007766cd800f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-21  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/dbus.el (top): Initialize only when `dbusbind' is loaded.
+
 2009-08-21  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * loadup.el: Remove leftover macos code.

diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index aeff93f6d26dcb528576a464bdb6c6c33a3e94e3..ccda21a2d224fd9098b66baaa5f00c7da3c1eca0 100644 (file)
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -835,9 +835,10 @@ name of the property, and its value.  If there are no properties,
 ;; Initialize :system and :session buses.  This adds their file
 ;; descriptors to input_wait_mask, in order to detect incoming
 ;; messages immediately.
-(dbus-ignore-errors
- (dbus-init-bus :system)
- (dbus-init-bus :session))
+(when (featurep 'dbusbind)
+  (dbus-ignore-errors
+    (dbus-init-bus :system)
+    (dbus-init-bus :session)))
 
 (provide 'dbus)