diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2012-02-20 17:31:41 -0500 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2012-02-20 17:31:41 -0500 |
| commit | 7d56e7b4b3c801a5ef5e9f88fc34c84656e0aa0d (patch) | |
| tree | fa2d5d617855b7a849c65197e474bbfe823f601b /doc | |
| parent | ac8cae2410b5ba8c59249d51ba0b53b79754ea9c (diff) | |
| parent | bf1bb9987d0f9ad5bdccc42d67fb0a8e78feaf0a (diff) | |
Merge branch 'call1'
Conflicts:
configure.ac
examples/call-handler.c
extensions/Makefile.am
extensions/call-content.xml
telepathy-farstream/call-content.c
telepathy-farstream/call-stream.c
telepathy-farstream/stream.c
telepathy-farstream/telepathy-farstream.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lib/Makefile.am | 2 | ||||
| -rw-r--r-- | doc/lib/telepathy-farstream-sections.txt | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/doc/lib/Makefile.am b/doc/lib/Makefile.am index 674c326..47587f8 100644 --- a/doc/lib/Makefile.am +++ b/doc/lib/Makefile.am @@ -46,7 +46,7 @@ CFILE_GLOB=$(top_srcdir)/telepathy-farstream/channel.c $(top_srcdir)/telepathy-f # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h IGNORE_HFILES=channel-priv.h content-priv.h session-priv.h stream-priv.h \ stream.h call-channel.h call-content.h call-stream.h tf-signals-marshal.h \ - media-signalling-channel.h media-signalling-content.h + media-signalling-channel.h media-signalling-content.h utils.h # Images to copy into HTML directory. # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png diff --git a/doc/lib/telepathy-farstream-sections.txt b/doc/lib/telepathy-farstream-sections.txt index 4a1382d..41903c4 100644 --- a/doc/lib/telepathy-farstream-sections.txt +++ b/doc/lib/telepathy-farstream-sections.txt @@ -1,6 +1,5 @@ <SECTION> -<TITLE>Core</TITLE> -tf_init +<TITLE>Utilities</TITLE> tp_media_type_to_fs </SECTION> @@ -12,6 +11,10 @@ TfContentClass tf_content_iterate_src_pads tf_content_error tf_content_error_literal +tf_content_receiving_failed +tf_content_receiving_failed_literal +tf_content_sending_failed +tf_content_sending_failed_literal <SUBSECTION Private> TfContentPrivate <SUBSECTION Standard> |