gst/gsttaglist.c: Fix doc syntax.

Original commit message from CVS:
* gst/gsttaglist.c:
Fix doc syntax.
* gst/gstutils.c:
* gst/gstutils.h:
Add deprecation guards.
* libs/gst/base/gstcollectpads.h:
Don't document object (this is implicitly private).

ChangeLog

@@ -1,3 +1,15 @@
+2007-07-10  Stefan Kost  <ensonic@users.sf.net>
+
+	* gst/gsttaglist.c:
+	  Fix doc syntax.
+
+	* gst/gstutils.c:
+	* gst/gstutils.h:
+	  Add deprecation guards.
+
+	* libs/gst/base/gstcollectpads.h:
+	  Don't document object (this is implicitly private).
+
 2007-07-08  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/gststructure.c: (gst_structure_parse_value):

gst/gsttaglist.c

@@ -298,7 +298,7 @@ gst_tag_lookup (GQuark entry)
  * any additional values will silenty be discarded when being added (unless
  * #GST_TAG_MERGE_REPLACE, #GST_TAG_MERGE_REPLACE_ALL, or
  * #GST_TAG_MERGE_PREPEND is used as merge mode, in which case the new
- * value will replace the old one in the list). 
+ * value will replace the old one in the list).
  *
  * The merge function will be called from gst_tag_list_copy_value() when
  * it is required that one or more values for a tag be condensed into
@@ -426,7 +426,7 @@ gst_tag_get_description (const gchar * tag)
  *
  * Gets the flag of @tag.
  *
- * Returns the flag of this tag.
+ * Returns: the flag of this tag.
  */
 GstTagFlag
 gst_tag_get_flag (const gchar * tag)
@@ -1330,8 +1330,8 @@ TAG_MERGE_FUNCS (pointer, gpointer)
  *
  * Use gst_tag_list_get_string_index (list, tag, 0, value) if you want
  * to retrieve the first string associated with this tag unmodified.
- * 
- * The resulting string in @value should be freed by the caller using g_free 
+ *
+ * The resulting string in @value should be freed by the caller using g_free
  * when no longer needed
  *
  * Returns: TRUE, if a value was copied, FALSE if the tag didn't exist in the
@@ -1347,7 +1347,7 @@ TAG_MERGE_FUNCS (pointer, gpointer)
  * Gets the value that is at the given index for the given tag in the given
  * list.
  *
- * The resulting string in @value should be freed by the caller using g_free 
+ * The resulting string in @value should be freed by the caller using g_free
  * when no longer needed
  *
  * Returns: TRUE, if a value was copied, FALSE if the tag didn't exist in the

gst/gstutils.c

@@ -2425,11 +2425,13 @@ gst_buffer_join (GstBuffer * buf1, GstBuffer * buf2)
  * Deprecated: use gst_buffer_copy_metadata() instead, it provides more
  * control.
  */
+#ifndef GST_REMOVE_DEPRECATED
 void
 gst_buffer_stamp (GstBuffer * dest, const GstBuffer * src)
 {
   gst_buffer_copy_metadata (dest, src, GST_BUFFER_COPY_TIMESTAMPS);
 }
+#endif
 
 static gboolean
 intersect_caps_func (GstPad * pad, GValue * ret, GstPad * orig)

gst/gstutils.h

@@ -656,7 +656,9 @@ GstPad *                gst_bin_find_unconnected_pad    (GstBin *bin, GstPadDire
 /* buffer functions */
 GstBuffer *		gst_buffer_merge		(GstBuffer * buf1, GstBuffer * buf2);
 GstBuffer *		gst_buffer_join			(GstBuffer * buf1, GstBuffer * buf2);
+#ifndef GST_DISABLE_DEPRECATED
 void			gst_buffer_stamp		(GstBuffer * dest, const GstBuffer * src);
+#endif /* GST_DISABLE_DEPRECATED */
 
 /* atomic functions */
 void                    gst_atomic_int_set              (gint * atomic_int, gint value);

libs/gst/base/gstcollectpads.h

@@ -103,10 +103,9 @@ typedef GstFlowReturn (*GstCollectPadsFunction) (GstCollectPads *pads, gpointer
 
 /**
  * GstCollectPads:
- * @object: the #GstObject parent structure.
  * @data: #GList of #GstCollectData managed by this #GstCollectPads.
  *
- * Collectpads object. 
+ * Collectpads object.
  */
 struct _GstCollectPads {
   GstObject      object;