Mercurial > emacs
changeset 108938:319b48a599cf
* net/dbus.el: Fix typos and declare function.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Sat, 05 Jun 2010 22:36:27 +0200 |
| parents | 8245aa950dd1 |
| children | dbf3fd5a1594 |
| files | lisp/ChangeLog lisp/net/dbus.el |
| diffstat | 2 files changed, 18 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Jun 04 12:15:51 2010 -0400 +++ b/lisp/ChangeLog Sat Jun 05 22:36:27 2010 +0200 @@ -1,3 +1,11 @@ +2010-06-05 Juanma Barranquero <lekktu@gmail.com> + + * net/dbus.el (dbus-register-method): Declare function. + (dbus-handle-event, dbus-property-handler): Fix typos in docstrings. + (dbus-introspect): Doc fix. + (dbus-event-bus-name, dbus-introspect-get-interface) + (dbus-introspect-get-argument): Reflow docstrings. + 2010-06-04 Chong Yidong <cyd@stupidchicken.com> * term/common-win.el (x-colors): Add "dark green" and "dark @@ -424,7 +432,7 @@ * files.el (auto-mode-alist): Accept more verilog file patterns. -2010-03-09 Miles Bader <miles@gnu.org>> +2010-03-09 Miles Bader <miles@gnu.org> * vc-git.el (vc-git-print-log): Use "tformat:" for shortlog, instead of "format:"; this ensures that the output is
--- a/lisp/net/dbus.el Fri Jun 04 12:15:51 2010 -0400 +++ b/lisp/net/dbus.el Sat Jun 05 22:36:27 2010 +0200 @@ -38,6 +38,7 @@ (declare-function dbus-method-return-internal "dbusbind.c") (declare-function dbus-method-error-internal "dbusbind.c") (declare-function dbus-register-signal "dbusbind.c") +(declare-function dbus-register-method "dbusbind.c") (defvar dbus-debug) (defvar dbus-registered-objects-table) @@ -398,7 +399,7 @@ "Handle events from the D-Bus. EVENT is a D-Bus event, see `dbus-check-event'. HANDLER, being part of the event, is called with arguments ARGS. -If the HANDLER returns an `dbus-error', it is propagated as return message." +If the HANDLER returns a `dbus-error', it is propagated as return message." (interactive "e") (condition-case err (let (result) @@ -434,8 +435,7 @@ "Return the bus name the event is coming from. The result is either the symbol `:system' or the symbol `:session'. EVENT is a D-Bus event, see `dbus-check-event'. This function -raises a `dbus-error' signal in case the event is not well -formed." +raises a `dbus-error' signal in case the event is not well formed." (dbus-check-event event) (nth 1 event)) @@ -562,7 +562,7 @@ ;;; D-Bus introspection. (defun dbus-introspect (bus service path) - "This function returns all interfaces and sub-nodes of SERVICE, + "Return all interfaces and sub-nodes of SERVICE, registered at object path PATH at bus BUS. BUS must be either the symbol `:system' or the symbol `:session'. @@ -634,9 +634,8 @@ (defun dbus-introspect-get-interface (bus service path interface) "Return the INTERFACE of SERVICE in D-Bus BUS at object path PATH. The return value is an XML object. INTERFACE must be a string, -element of the list returned by -`dbus-introspect-get-interface-names'. The resulting -\"interface\" object can contain \"method\", \"signal\", +element of the list returned by `dbus-introspect-get-interface-names'. +The resulting \"interface\" object can contain \"method\", \"signal\", \"property\" and \"annotation\" children." (let ((elt (xml-get-children (dbus-introspect-xml bus service path) 'interface))) @@ -776,8 +775,8 @@ (defun dbus-introspect-get-argument (bus service path interface name arg) "Return argument ARG as XML object. -NAME must be a \"method\" or \"signal\" object. ARG must be a -string, element of the list returned by `dbus-introspect-get-argument-names'." +NAME must be a \"method\" or \"signal\" object. ARG must be a string, +element of the list returned by `dbus-introspect-get-argument-names'." (let ((elt (xml-get-children (or (dbus-introspect-get-method bus service path interface name) (dbus-introspect-get-signal bus service path interface name)) @@ -922,7 +921,7 @@ (list key (list service path)))) (defun dbus-property-handler (&rest args) - "Default Handler for the \"org.freedesktop.DBus.Properties\" interface. + "Default handler for the \"org.freedesktop.DBus.Properties\" interface. It will be registered for all objects created by `dbus-register-object'." (let ((bus (dbus-event-bus-name last-input-event)) (path (dbus-event-path-name last-input-event))