summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2010-08-24 12:35:26 +1000
committerDanielle Madeley <danielle.madeley@collabora.co.uk>2010-08-24 12:35:26 +1000
commit78a92c9ed475c2651cbddf3fb49e6a728b010a2d (patch)
treee9af1d253781159851568e3d1ca88bf6e68bf5cc
parent5354ce2749f7cdf75c0e48b7404371a691510b50 (diff)
Fix up mistakes in TpBaseClient description
-rw-r--r--docs/book/C/channel-dispatcher.xml15
1 files changed, 8 insertions, 7 deletions
diff --git a/docs/book/C/channel-dispatcher.xml b/docs/book/C/channel-dispatcher.xml
index 373b873..fb898c5 100644
--- a/docs/book/C/channel-dispatcher.xml
+++ b/docs/book/C/channel-dispatcher.xml
@@ -896,8 +896,7 @@
service on the D-Bus.
<classname>TpBaseClient</classname> is an abstract base class that can
be inherited to create any mixture of client types. telepathy-glib
- also provides three basic implementations concrete classes, one for
- each client type:
+ also provides three basic concrete classes, one for each client type:
<classname>TpSimpleObserver</classname>,
<classname>TpSimpleApprover</classname> and
<classname>TpSimpleHandler</classname>.
@@ -933,16 +932,18 @@
</para>
<para>
The Accept and Fail methods are used to return from the
- <methodname>ObserveChannels</methodname> D-Bus method, either
+ <methodname>ObserveChannels</methodname>,
+ <methodname>AddDispatchOperation</methodname> and
+ <methodname>HandleChannels</methodname> D-Bus methods, either
successfully or with an error condition.
</para>
<para>
The Delay method is used if you have further
preparation to carry out before ultimately calling either Accept or
- Fail. This is often used for things that need to be done before the
- Handler is given the channel, like inspecting the pending message
- queue. You must reference the context object to hold it outside the
- callback.
+ Fail. This is often used for things that Observers or Approvers need to
+ do before the Handler is given the channel, like inspecting the pending
+ message queue. You must reference the context object to hold it outside
+ the callback.
<xref linkend="ex.channel-dispatcher.clients.impl.tpsimpleobserver"/>
shows an example of using the delay method.
</para>