diff options
| author | Michael Albinus | 2008-07-13 15:12:58 +0000 |
|---|---|---|
| committer | Michael Albinus | 2008-07-13 15:12:58 +0000 |
| commit | 9b7993b44fda68afbcb6254058307a7be7184126 (patch) | |
| tree | d6075dc7295e19b5e99df3f2652f86fa87705bd1 /doc/misc | |
| parent | 944cc4a8833392d5e689f8187d3432b7a772dd70 (diff) | |
| download | emacs-9b7993b44fda68afbcb6254058307a7be7184126.tar.gz emacs-9b7993b44fda68afbcb6254058307a7be7184126.zip | |
* dbus.texi (Receiving Method Calls): Fix description of
`dbus-register-method'.
(Signals): Allow also signal arguments for filtering in
`dbus-register-signal'.
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/ChangeLog | 7 | ||||
| -rw-r--r-- | doc/misc/dbus.texi | 19 |
2 files changed, 19 insertions, 7 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index d037ee225f8..c9e7c3671ca 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2008-07-13 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * dbus.texi (Receiving Method Calls): Fix description of | ||
| 4 | `dbus-register-method'. | ||
| 5 | (Signals): Allow also signal arguments for filtering in | ||
| 6 | `dbus-register-signal'. | ||
| 7 | |||
| 1 | 2008-07-13 Vincent Belaïche <vincent.b.1@hotmail.fr> | 8 | 2008-07-13 Vincent Belaïche <vincent.b.1@hotmail.fr> |
| 2 | 9 | ||
| 3 | * calc.texi (Manipulating Vectors): Clarify definition of `rnorm' and | 10 | * calc.texi (Manipulating Vectors): Clarify definition of `rnorm' and |
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi index c2ca6ec7882..2baf6d68d60 100644 --- a/doc/misc/dbus.texi +++ b/doc/misc/dbus.texi | |||
| @@ -550,7 +550,7 @@ seconds. This value could be even smaller, depending on the calling | |||
| 550 | client. Therefore, @var{handler} shall not last longer than | 550 | client. Therefore, @var{handler} shall not last longer than |
| 551 | absolutely necessary. | 551 | absolutely necessary. |
| 552 | 552 | ||
| 553 | @code{dbus-register-method} returns a Lisp symbol, which can be used | 553 | @code{dbus-register-method} returns a Lisp object, which can be used |
| 554 | as argument in @code{dbus-unregister-object} for removing the | 554 | as argument in @code{dbus-unregister-object} for removing the |
| 555 | registration for @var{method}. Example: | 555 | registration for @var{method}. Example: |
| 556 | 556 | ||
| @@ -623,7 +623,7 @@ Conversion}. Example: | |||
| 623 | @end lisp | 623 | @end lisp |
| 624 | @end defun | 624 | @end defun |
| 625 | 625 | ||
| 626 | @defun dbus-register-signal bus service path interface signal handler | 626 | @defun dbus-register-signal bus service path interface signal handler &rest args |
| 627 | With this function, an application registers for @var{signal} on the | 627 | With this function, an application registers for @var{signal} on the |
| 628 | D-Bus @var{bus}. | 628 | D-Bus @var{bus}. |
| 629 | 629 | ||
| @@ -648,7 +648,16 @@ provide @var{signal}. | |||
| 648 | 648 | ||
| 649 | @var{handler} is a Lisp function to be called when the @var{signal} is | 649 | @var{handler} is a Lisp function to be called when the @var{signal} is |
| 650 | received. It must accept as arguments the output parameters | 650 | received. It must accept as arguments the output parameters |
| 651 | @var{signal} is sending. Example: | 651 | @var{signal} is sending. |
| 652 | |||
| 653 | All other arguments @var{args}, if specified, must be strings. They | ||
| 654 | stand for the respective arguments of @var{signal} in their order, and | ||
| 655 | are used for filtering as well. A @code{nil} argument might be used | ||
| 656 | to preserve the order. | ||
| 657 | |||
| 658 | @code{dbus-register-signal} returns a Lisp object, which can be used | ||
| 659 | as argument in @code{dbus-unregister-object} for removing the | ||
| 660 | registration for @var{signal}. Example: | ||
| 652 | 661 | ||
| 653 | @lisp | 662 | @lisp |
| 654 | (defun my-dbus-signal-handler (device) | 663 | (defun my-dbus-signal-handler (device) |
| @@ -673,10 +682,6 @@ The callback function @code{my-dbus-signal-handler} must define one | |||
| 673 | single string argument therefore. Plugging an USB device to your | 682 | single string argument therefore. Plugging an USB device to your |
| 674 | machine, when registered for signal @code{DeviceAdded}, will show you | 683 | machine, when registered for signal @code{DeviceAdded}, will show you |
| 675 | which objects the GNU/Linux @code{hal} daemon adds. | 684 | which objects the GNU/Linux @code{hal} daemon adds. |
| 676 | |||
| 677 | @code{dbus-register-signal} returns a Lisp symbol, which can be used | ||
| 678 | as argument in @code{dbus-unregister-object} for removing the | ||
| 679 | registration for @var{signal}. | ||
| 680 | @end defun | 685 | @end defun |
| 681 | 686 | ||
| 682 | @defun dbus-unregister-object object | 687 | @defun dbus-unregister-object object |