diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2009-08-21 06:45:22 +0000 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2009-08-21 06:45:22 +0000 |
| commit | 9e8465231357c094d68d5675488605e2272dad8d (patch) | |
| tree | 90f085687ae2656e59dd8a885aa12df9021e3148 | |
| parent | bcc5db2443c225d6c2d1c43a81db396679b053d5 (diff) | |
| download | emacs-9e8465231357c094d68d5675488605e2272dad8d.tar.gz | |
* net/dbus.el (top): Initialize only when `dbusbind' is loaded.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/net/dbus.el | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4d60e1da31d..0a5ca4cf515 100644 --- 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 aeff93f6d26..ccda21a2d22 100644 --- 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) |