[Emacs-diffs] /srv/bzr/emacs/trunk r102813: * net/dbus.el (dbus-unregister-service): Complete doc. Fix

[Michael Albinus]

------------------------------------------------------------
revno: 102813
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Mon 2011-01-10 12:21:01 +0100
message:
  * net/dbus.el (dbus-unregister-service): Complete doc.  Fix
  call of dbus-error signal.
modified:
  lisp/ChangeLog
  lisp/net/dbus.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-10 10:53:13 +0000
+++ b/lisp/ChangeLog    2011-01-10 11:21:01 +0000
@@ -1,6 +1,8 @@
 2011-01-10  Michael Albinus  <address@hidden>
 
-       * 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  <address@hidden>
 

=== modified file 'lisp/net/dbus.el'
--- a/lisp/net/dbus.el  2011-01-10 10:53:13 +0000
+++ b/lisp/net/dbus.el  2011-01-10 11:21:01 +0000
@@ -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.