diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-07-20 17:29:21 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-07-20 17:29:26 +0100 |
| commit | 251354fc96c0a82c1ee8897ae39755e13f330272 (patch) | |
| tree | a98c20a2dad0a11520ad0ec67a4bf17d0a23aff0 /telepathy-glib/extra-gtkdoc.h | |
| parent | 11f06e38a50fffe3ef02540e09123aeca4113200 (diff) | |
| parent | 001d1c37b5acdd2a74bdc6a41346b6a67284804c (diff) | |
| download | telepathy-glib-251354fc96c0a82c1ee8897ae39755e13f330272.tar.gz | |
Merge branch 'protocol3' into spec
Reviewed by Andre (partially) and Senko (the rest).
Conflicts:
spec/Connection_Manager.xml
spec/Makefile.am
spec/Protocol.xml
spec/all.xml
telepathy-glib/extra-gtkdoc.h
Diffstat (limited to 'telepathy-glib/extra-gtkdoc.h')
| -rw-r--r-- | telepathy-glib/extra-gtkdoc.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/telepathy-glib/extra-gtkdoc.h b/telepathy-glib/extra-gtkdoc.h index a38450d9d..48bafc3ff 100644 --- a/telepathy-glib/extra-gtkdoc.h +++ b/telepathy-glib/extra-gtkdoc.h @@ -759,3 +759,16 @@ * * Since: 0.11.9 */ + +/** + * SECTION:svc-protocol + * @title: Service-side Protocol interface + * @short_description: GInterface for Telepathy Protocol objects + * @see_also: #TpBaseProtocol + * + * The #TpSvcProtocol interface (auto-generated from the Telepathy + * spec) makes it easier to export an object implementing the Telepathy + * Protocol interface. + * + * Since: 0.11.UNRELEASED + */ |