Mercurial > emacs
changeset 112184:060a9a41dd53
* net/dbus.el (dbus-unregister-service): Complete doc. Fix
call of dbus-error signal.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Mon, 10 Jan 2011 12:21:01 +0100 |
| parents | adafd735e9aa |
| children | 318f49ef9a11 |
| files | lisp/ChangeLog lisp/net/dbus.el |
| diffstat | 2 files changed, 16 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Jan 10 11:53:13 2011 +0100 +++ b/lisp/ChangeLog Mon Jan 10 12:21:01 2011 +0100 @@ -1,6 +1,8 @@ 2011-01-10 Michael Albinus <michael.albinus@gmx.de> - * net/dbus.el (dbus-register-property): Use `dont-register' keyword. + * net/dbus.el (dbus-unregister-service): Complete doc. Fix + call of dbus-error signal. + (dbus-register-property): Use `dont-register' keyword. 2011-01-10 Jan Moringen <jan.moringen@uni-bielefeld.de>
--- a/lisp/net/dbus.el Mon Jan 10 11:53:13 2011 +0100 +++ b/lisp/net/dbus.el Mon Jan 10 12:21:01 2011 +0100 @@ -183,7 +183,18 @@ (defun dbus-unregister-service (bus service) "Unregister all objects related to SERVICE from D-Bus BUS. BUS is either a Lisp symbol, `:system' or `:session', or a string -denoting the bus address. SERVICE must be a known service name." +denoting the bus address. SERVICE must be a known service name. + +The function returns a keyword, indicating the result of the +operation. One of the following keywords is returned: + +`:released': Service has become the primary owner of the name. + +`:non-existent': Service name does not exist on this bus. + +`:not-owner': We are neither the primary owner nor waiting in the +queue of this service." + (maphash (lambda (key value) (dolist (elt value) @@ -200,7 +211,7 @@ (1 :released) (2 :non-existent) (3 :not-owner) - (t (signal 'dbus-error "Could not unregister service"))))) + (t (signal 'dbus-error (list "Could not unregister service" service)))))) (defun dbus-call-method-non-blocking-handler (&rest args) "Handler for reply messages of asynchronous D-Bus message calls.