summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2012-08-29 06:07:14 -0300
committerJasper St. Pierre <jstpierre@mecheye.net>2012-08-29 15:00:32 -0300
commite1ab409a39a3418fd33c0a10905a616dd46d500c (patch)
tree6d5bc80f53741671a3cbd21ca8ff41ab6dfa4d1e
parent4f6f32dcb1942063508fa002fd0bc83a362c96b6 (diff)
downloadgobject-introspection-e1ab409a39a3418fd33c0a10905a616dd46d500c.tar.gz
mallardwriter: Fix formatting the function name
This is not what format_type is for.
-rw-r--r--giscanner/girwriter.py4
-rw-r--r--giscanner/mallardwriter.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py
index 0f5c7002..97f81616 100644
--- a/giscanner/girwriter.py
+++ b/giscanner/girwriter.py
@@ -473,8 +473,8 @@ and/or use gtk-doc annotations. ''')
def _write_callback(self, callback):
attrs = []
- if callback.namespace:
- attrs.append(('c:type', callback.ctype or callback.c_name))
+ if callback.ctype != callback.name:
+ attrs.append(('c:type', callback.ctype))
self._write_callable(callback, 'callback', attrs)
def _write_record(self, record, extra_attrs=[]):
diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py
index bb77ace7..1fab10dd 100644
--- a/giscanner/mallardwriter.py
+++ b/giscanner/mallardwriter.py
@@ -311,7 +311,7 @@ class MallardFormatterPython(MallardFormatter):
def format_function_name(self, func):
if func.parent is not None:
- return "%s.%s" % (self.format_type(func.parent), func.name)
+ return "%s.%s" % (func.parent.name, func.name)
else:
return func.name