summaryrefslogtreecommitdiff
path: root/giscanner
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2009-06-23 17:51:15 -0400
committerColin Walters <walters@verbum.org>2009-06-23 17:58:38 -0400
commit8ef942ed56236380cbc9acc445926bfa534cc58a (patch)
tree69ac42a0e9f5b8e33926dc98505cd2fedea91d08 /giscanner
parentfeee5b3fa9f79b3085388e181d5f6473749d84b8 (diff)
downloadgobject-introspection-8ef942ed56236380cbc9acc445926bfa534cc58a.tar.gz
Bug 579008 - Don't override element-type for arrays
Annotation parser patch from: Tim Horton <hortont424@gmail.com> If an explicit element type is specified, don't override it with guint8.
Diffstat (limited to 'giscanner')
-rw-r--r--giscanner/annotationparser.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py
index bb74cdc3..d79a46bb 100644
--- a/giscanner/annotationparser.py
+++ b/giscanner/annotationparser.py
@@ -601,7 +601,8 @@ class AnnotationApplier(object):
# is specified.
if (isinstance(node, Parameter) and
node.type.name == 'utf8' and
- self._guess_direction(node) == PARAM_DIRECTION_IN):
+ self._guess_direction(node) == PARAM_DIRECTION_IN and
+ element_type is None):
# FIXME: unsigned char/guchar should be uint8
container_type.element_type = Type('int8')
container_type.size = array_values.get(OPT_ARRAY_FIXED_SIZE)