+2010-02-28 Michael Albinus <michael.albinus@gmx.de>
+
+ * net/dbus.el (dbus-introspect, dbus-get-property)
+ (dbus-set-property, dbus-get-all-properties): Use
+ `dbus-call-method' when noninteractive. (Bug#5645)
+
2010-02-28 Chong Yidong <cyd@stupidchicken.com>
* textmodes/reftex-toc.el (reftex-toc-promote-prepare):
;; 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-non-blocking
+ (funcall
+ (if noninteractive 'dbus-call-method 'dbus-call-method-non-blocking)
bus service path dbus-interface-introspectable "Introspect")))
(defun dbus-introspect-xml (bus service path)
(dbus-ignore-errors
;; "Get" returns a variant, so we must use the `car'.
(car
- (dbus-call-method-non-blocking
+ (funcall
+ (if noninteractive 'dbus-call-method 'dbus-call-method-non-blocking)
bus service path dbus-interface-properties
"Get" :timeout 500 interface property))))
returned."
(dbus-ignore-errors
;; "Set" requires a variant.
- (dbus-call-method-non-blocking
+ (funcall
+ (if noninteractive 'dbus-call-method 'dbus-call-method-non-blocking)
bus service path dbus-interface-properties
"Set" :timeout 500 interface property (list :variant value))
;; Return VALUE.
;; "GetAll" returns "a{sv}".
(let (result)
(dolist (dict
- (dbus-call-method-non-blocking
+ (funcall
+ (if noninteractive
+ 'dbus-call-method
+ 'dbus-call-method-non-blocking)
bus service path dbus-interface-properties
"GetAll" :timeout 500 interface)
result)