From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 10 Jan 2011 11:21:01 +0000 (+0100)
Subject: * net/dbus.el (dbus-unregister-service): Complete doc.  Fix
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~239^2~10
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5c0b407077350a6d1c12983a3937f2a18f4ef3c9;p=emacs.git

* net/dbus.el (dbus-unregister-service): Complete doc.  Fix
call of dbus-error signal.
---

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  <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>
 
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.