From: Michael Albinus Date: Sun, 24 Aug 2008 20:16:15 +0000 (+0000) Subject: * net/dbus.el (dbus-introspect): Use `dbus-call-method-non-blocking'. X-Git-Tag: emacs-pretest-23.0.90~3294 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=736215fd6c23488e9082eec19113a9caff723452;p=emacs.git * net/dbus.el (dbus-introspect): Use `dbus-call-method-non-blocking'. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4695b9d023d..e0078c15944 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-08-24 Michael Albinus + + * net/dbus.el (dbus-introspect): Use `dbus-call-method-non-blocking'. + 2008-08-24 Romain Francoise * progmodes/python.el (run-python): Remove '' from sys.path. diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index 4fcfcef9a3f..955e99e3e54 100644 --- 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)