Use the passed in prefix as a hint when creating a typecode.

* codegen/defsgen.py (typecode): Use the passed in prefix as a
hint when creating a typecode.
(split_prefix,write_enum_defs,_write_obj_helper): Add function to
use passed in prefix as a hint when splitting an object name into
module and name.

* codegen/h2def.py (DefsWriter.write_enum_defs): Make sure the
prefix ends with a _ i.e. really handle the GDK_FONT_FONT,
GDK_FONT_FONTSET case.


svn path=/trunk/; revision=972

1 files changed, 2 insertions, 1 deletions

diff --git a/codegen/h2def.py b/codegen/h2def.py
index 8cbe24e..0af30f5 100755
--- a/codegen/h2def.py
+++ b/codegen/h2def.py
@@ -326,7 +326,8 @@ class DefsWriter:
             for ent in entries:
                 # shorten prefix til we get a match ...
                 # and handle GDK_FONT_FONT, GDK_FONT_FONTSET case
-                while ent[:len(prefix)] != prefix or len(prefix) >= len(ent):
+                while (prefix[-1] != '_' or ent[:len(prefix)] != prefix
+                       or len(prefix) >= len(ent)):
                     prefix = prefix[:-1]
             prefix_len = len(prefix)
             fp.write('  (values\n')