* net/dbus.el (dbus-introspect): Use `dbus-call-method-non-blocking'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4695b9d023d05221f4922f1cc69125e352044e3f..e0078c159441aba0d7aaee133c59f5c50fa15397 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-24  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/dbus.el (dbus-introspect): Use `dbus-call-method-non-blocking'.
+
 2008-08-24  Romain Francoise  <romain@orebokech.com>
 
        * progmodes/python.el (run-python): Remove '' from sys.path.

diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 4fcfcef9a3f8f2adef5277f81a06ab02d2e01c5b..955e99e3e547e9b3eafbf103214c936d6794f271 100644 (file)
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -445,9 +445,11 @@ BUS must be either the symbol `:system' or the symbol `:session'.
 SERVICE must be a known service name, and PATH must be a valid
 object path.  The last two parameters are strings.  The result,
 the introspection data, is a string in XML format."
-  ;; We don't want to raise errors.
+  ;; We don't want to raise errors.  `dbus-call-method-non-blocking'
+  ;; is used, because the handler can be registered in our Emacs
+  ;; instance; caller an callee would block each other.
   (dbus-ignore-errors
-    (dbus-call-method
+    (dbus-call-method-non-blocking
      bus service path dbus-interface-introspectable "Introspect")))
 
 (defun dbus-introspect-xml (bus service path)