for enum in self._namespace.itervalues():
if not isinstance(enum, ast.Enum):
continue
- type_name = enum.ctype
- uscored = to_underscores(type_name).lower()
-
+ uscored = to_underscores_noprefix(enum.name).lower()
uscore_enums[uscored] = enum
-
- try:
- no_uscore_prefixed = self._transformer.strip_identifier(type_name)
- except TransformerException, e:
- message.warn(e)
- no_uscore_prefixed = None
-
- if no_uscore_prefixed not in uscore_enums:
- uscore_enums[no_uscore_prefixed] = enum
+ uscore_enums[enum.name] = enum
for node in self._namespace.itervalues():
if not isinstance(node, ast.ErrorQuarkFunction):
else:
enum = self._uscore_type_names.get(short)
if enum is None:
- enum = uscore_enums.get(full)
+ enum = uscore_enums.get(short)
if enum is not None:
enum.error_domain = node.error_domain
else:
shared-library="libsletter.so"
c:identifier-prefixes="S"
c:symbol-prefixes="s">
+ <enumeration name="DBusError"
+ c:type="SDBusError"
+ glib:error-domain="s-dbus-error">
+ <member name="code1" value="1" c:identifier="S_DBUS_ERROR_CODE1"/>
+ <member name="code2" value="2" c:identifier="S_DBUS_ERROR_CODE2"/>
+ <member name="code3" value="3" c:identifier="S_DBUS_ERROR_CODE3"/>
+ </enumeration>
<record name="Point" c:type="SPoint">
<field name="x" writable="1">
<type name="gdouble" c:type="double"/>
<member name="code2" value="2" c:identifier="S_SPAWN_ERROR_CODE2"/>
<member name="code3" value="3" c:identifier="S_SPAWN_ERROR_CODE3"/>
</enumeration>
+ <function name="dbus_error_quark" c:identifier="s_dbus_error_quark">
+ <return-value transfer-ownership="none">
+ <type name="GLib.Quark" c:type="GQuark"/>
+ </return-value>
+ </function>
<function name="hello" c:identifier="s_hello">
<return-value transfer-ownership="none">
<type name="none" c:type="void"/>
{
return g_quark_from_static_string ("s-spawn-error");
}
+
+GQuark
+s_dbus_error_quark (void)
+{
+ return g_quark_from_static_string ("s-dbus-error");
+}
} SSpawnError;
GQuark s_spawn_error_quark (void);
+/* Like GDBusError but not registered with GType */
+typedef enum
+{
+ S_DBUS_ERROR_CODE1 = 1,
+ S_DBUS_ERROR_CODE2 = 2,
+ S_DBUS_ERROR_CODE3 = 3
+} SDBusError;
+GQuark s_dbus_error_quark (void);
+
#endif