Merge commit 'origin'

1 files changed, 5 insertions, 1 deletions

diff --git a/giscanner/transformer.py b/giscanner/transformer.py
index 6f9207a..58c2fbc 100644
--- a/giscanner/transformer.py
+++ b/giscanner/transformer.py
@@ -419,7 +419,7 @@ class Transformer(object):
 
     def _create_type(self, source_type, is_param, is_retval):
         ctype = self._create_source_type(source_type)
-        if ctype == 'va_list':
+        if ctype.startswith('va_list'):
             raise SkipError()
         # FIXME: FILE* should not be skipped, it should be handled
         #        properly instead
@@ -460,6 +460,10 @@ class Transformer(object):
         return return_
 
     def _create_const(self, symbol):
+        # Don't create constants for non-public things
+        # http://bugzilla.gnome.org/show_bug.cgi?id=572790
+        if not symbol.source_filename.endswith('.h'):
+            return None
         name = self.remove_prefix(symbol.ident)
         if symbol.const_string is None:
             type_name = 'int'