mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-29 07:58:28 +00:00
Code Issues Releases Activity

* net/dbus.el (dbus-introspect, dbus-get-property)

Browse Source 
(dbus-set-property, dbus-get-all-properties): Use
`dbus-call-method' when noninteractive.  (Bug#5645)
This commit is contained in:
Michael Albinus 2010-02-28 11:27:39 +01:00
parent 5794c2a5f7
commit d4b067837e
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -1,3 +1,9 @@
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):

14
lisp/net/dbus.el
View File

@ -573,7 +573,8 @@ the introspection data, is a string in XML format."
;; 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)
@ -831,7 +832,8 @@ valid D-Bus value, or `nil' if there is no PROPERTY."
(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))))
@ -842,7 +844,8 @@ been set successful, the result is VALUE. Otherwise, `nil' is
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.
@ -857,7 +860,10 @@ name of the property, and its value. If there are no properties,
;; "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)