From e1ab409a39a3418fd33c0a10905a616dd46d500c Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 29 Aug 2012 06:07:14 -0300 Subject: mallardwriter: Fix formatting the function name This is not what format_type is for. --- giscanner/girwriter.py | 4 ++-- giscanner/mallardwriter.py | 2 +- 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 -- cgit v1.2.1