From 5c0b407077350a6d1c12983a3937f2a18f4ef3c9 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 10 Jan 2011 12:21:01 +0100 Subject: [PATCH] * net/dbus.el (dbus-unregister-service): Complete doc. Fix call of dbus-error signal. --- lisp/ChangeLog | 4 +++- lisp/net/dbus.el | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 33dd97aa5af..c836c76bb9e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,8 @@ 2011-01-10 Michael Albinus - * 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 diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index ca223522eda..ca1a1743231 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -183,7 +183,18 @@ association to the service from D-Bus." (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 @@ denoting the bus address. SERVICE must be a known service name." (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. -- 2.39.5