summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIain Lane <iain.lane@canonical.com>2014-03-21 15:18:38 +0000
committerOlivier CrĂȘte <olivier.crete@collabora.com>2014-05-06 00:35:45 -0400
commitc84c351e3dd55f3cd77e4031d4faf86e5637b4bc (patch)
tree43b44830857c61c93501525bc4d9beafeedd5214
parent32dcff23964fa6d6910584b1b664150734033fd2 (diff)
downloadfarstream-c84c351e3dd55f3cd77e4031d4faf86e5637b4bc.tar.gz
Fix some mismatched / redundant <para> gtk-doc tags
gtk-doc 1.20 got more strict about correctness here wrt. balanced tags. Also bump the relevant gtk-doc requirement, these tags were added for a reason back then. https://bugs.freedesktop.org/show_bug.cgi?id=76458
-rw-r--r--configure.ac2
-rw-r--r--farstream/fs-conference.c4
-rw-r--r--farstream/fs-session.c4
-rw-r--r--farstream/fs-stream.c4
-rw-r--r--gst/fsrtpconference/fs-rtp-session.c4
5 files changed, 9 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index ef98c4db..4f918a30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,7 +200,7 @@ dnl check for gobject-introspection
GOBJECT_INTROSPECTION_CHECK([0.10.1])
dnl check for documentation tools
-GTK_DOC_CHECK([1.8])
+GTK_DOC_CHECK([1.18])
AS_PATH_PYTHON([2.1])
AG_GST_PLUGIN_DOCS([1.8],[2.1])
diff --git a/farstream/fs-conference.c b/farstream/fs-conference.c
index f6d64046..7c6327a4 100644
--- a/farstream/fs-conference.c
+++ b/farstream/fs-conference.c
@@ -43,7 +43,7 @@
*
* This will communicate asynchronous events to the user through #GstMessage
* of type #GST_MESSAGE_ELEMENT sent over the #GstBus.
- * </para>
+ *
* <refsect2><title>The "<literal>farstream-error</literal>" message</title>
* |[
* "src-object" #GObject The object (#FsConference, #FsSession or #FsStream) that emitted the error
@@ -54,7 +54,7 @@
* The message is sent on asynchronous errors.
* </para>
* </refsect2>
- * <para>
+ *
*/
diff --git a/farstream/fs-session.c b/farstream/fs-session.c
index f6cc23a7..08a15172 100644
--- a/farstream/fs-session.c
+++ b/farstream/fs-session.c
@@ -39,7 +39,7 @@
*
* This will communicate asynchronous events to the user through #GstMessage
* of type #GST_MESSAGE_ELEMENT sent over the #GstBus.
- * </para>
+ *
* <refsect2><title>The "<literal>farstream-send-codec-changed</literal>"
* message</title>
* <table>
@@ -132,7 +132,7 @@
* telephony event has stopped.
* </para>
* </refsect2>
- * <para>
+ *
*/
#ifdef HAVE_CONFIG_H
diff --git a/farstream/fs-stream.c b/farstream/fs-stream.c
index de7126aa..c3b92176 100644
--- a/farstream/fs-stream.c
+++ b/farstream/fs-stream.c
@@ -36,7 +36,7 @@
*
* This will communicate asynchronous events to the user through #GstMessage
* of type #GST_MESSAGE_ELEMENT sent over the #GstBus.
- * </para>
+ *
* <refsect2><title>The "<literal>farstream-new-local-candidate</literal>" message</title>
* |[
* "stream" #FsStream The stream that emits the message
@@ -93,7 +93,7 @@
* This message is emitted the state of a component of a stream changes.
* </para>
* </refsect2>
- * <para>
+ *
*/
#ifdef HAVE_CONFIG_H
diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index 5b5818bb..fee5fd1d 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -30,7 +30,7 @@
* fs_conference_new_session() on a #FsRtpConference. It can be either
* Audio or Video. It also represents data send with one and only one
* SSRC (although if there is a SSRC collision, that SSRC may change).
- * </para>
+ *
* <refsect2><title>Codec profiles</title>
* <para>
* It is possible to define "codec profiles", that is non-autodetected
@@ -50,7 +50,7 @@
* Also, it is possible to declare profiles with only a decoding pipeline,
* you will only be able to receive from this codec, the encoding may be a
* secondary pad of some other codec.
- * </para></refsect2><para>
+ * </para></refsect2>
*/
#ifdef HAVE_CONFIG_H