gst/: Fix two typos in the inline documentation.

Original commit message from CVS:
* gst/gstformat.c:
* gst/gstquery.c:
Fix two typos in the inline documentation.
* gst/gsttag.c: (gst_tag_register):
Don't spew out an assertion warning if a tag is
already registered, unless the new type differs
from the old one (fixes #308438).
This commit is contained in:
Tim-Philipp Müller 2005-06-21 08:40:48 +00:00
parent 802f77d9ad
commit 86ae3a8c77
5 changed files with 23 additions and 4 deletions

View file

@ -1,3 +1,14 @@
2005-06-21 Tim-Philipp Müller <tim at centricular dot net>
* gst/gstformat.c:
* gst/gstquery.c:
Fix two typos in the inline documentation.
* gst/gsttag.c: (gst_tag_register):
Don't spew out an assertion warning if a tag is
already registered, unless the new type differs
from the old one (fixes #308438).
2005-06-19 Luca Ognibene <luogni@tin.it> 2005-06-19 Luca Ognibene <luogni@tin.it>
* gst/registries/gstlibxmlregistry.c (gst_xml_registry_get_property): * gst/registries/gstlibxmlregistry.c (gst_xml_registry_get_property):

View file

@ -66,7 +66,7 @@ _gst_format_initialize (void)
* @description: The description of the new format * @description: The description of the new format
* *
* Create a new GstFormat based on the nick or return an * Create a new GstFormat based on the nick or return an
* allrady registered format with that nick * already registered format with that nick
* *
* Returns: A new GstFormat or an already registered format * Returns: A new GstFormat or an already registered format
* with the same nick. * with the same nick.

View file

@ -68,7 +68,7 @@ _gst_query_type_initialize (void)
* @description: The description of the new query * @description: The description of the new query
* *
* Create a new GstQueryType based on the nick or return an * Create a new GstQueryType based on the nick or return an
* allrady registered query with that nick * already registered query with that nick
* *
* Returns: A new GstQueryType or an already registered query * Returns: A new GstQueryType or an already registered query
* with the same nick. * with the same nick.

View file

@ -280,7 +280,11 @@ gst_tag_register (const gchar * name, GstTagFlag flag, GType type,
key = g_quark_from_string (name); key = g_quark_from_string (name);
info = gst_tag_lookup (key); info = gst_tag_lookup (key);
g_return_if_fail (info == NULL);
if (info) {
g_return_if_fail (info->type == type);
return;
}
info = g_new (GstTagInfo, 1); info = g_new (GstTagInfo, 1);
info->flag = flag; info->flag = flag;

View file

@ -280,7 +280,11 @@ gst_tag_register (const gchar * name, GstTagFlag flag, GType type,
key = g_quark_from_string (name); key = g_quark_from_string (name);
info = gst_tag_lookup (key); info = gst_tag_lookup (key);
g_return_if_fail (info == NULL);
if (info) {
g_return_if_fail (info->type == type);
return;
}
info = g_new (GstTagInfo, 1); info = g_new (GstTagInfo, 1);
info->flag = flag; info->flag = flag;