gobject-introspection r578 - trunk/giscanner

[walters svn gnome org]

Author: walters
Date: Sun Sep  7 01:45:29 2008
New Revision: 578
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=578&view=rev

Log:
Strip namespace GnomeKeyring -> gnome_keyring_

	* giscanner/transformer.py: If a namespace contains
	multiple caps, try stripping both gnomekeyring_ and
	gnome_keyring_.


Modified:
   trunk/giscanner/transformer.py

Modified: trunk/giscanner/transformer.py
==============================================================================
--- trunk/giscanner/transformer.py	(original)
+++ trunk/giscanner/transformer.py	Sun Sep  7 01:45:29 2008
@@ -34,7 +34,7 @@
     CSYMBOL_TYPE_ENUM, CSYMBOL_TYPE_UNION, CSYMBOL_TYPE_OBJECT,
     CSYMBOL_TYPE_MEMBER)
 from .odict import odict
-from .utils import strip_common_prefix
+from .utils import strip_common_prefix, to_underscores
 
 _xdg_data_dirs = [x for x in os.environ.get('XDG_DATA_DIRS', '').split(':') \
                       + [DATADIR, '/usr/share'] if x]
@@ -150,6 +150,10 @@
         prefix = self._namespace.name.lower() + '_'
         if name.lower().startswith(prefix):
             name = name[len(prefix):]
+        else:
+            prefix = to_underscores(self._namespace.name).lower() + '_'
+            if name.lower().startswith(prefix):
+                name = name[len(prefix):]
         return self._remove_prefix(name)
 
     def _remove_prefix(self, name):