mallardwriter: Fix formatting the function name

This is not what format_type is for.

diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py
index 0f5c7002d02b7b6e8b11529c38105903bada67b8..97f81616fcbafcaf852fd35c87136b7fc533eefb 100644 (file)
--- a/giscanner/girwriter.py
+++ b/giscanner/girwriter.py
@@ -473,8 +473,8 @@ and/or use gtk-doc annotations. ''')
 
     def _write_callback(self, callback):
         attrs = []
 
     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=[]):
         self._write_callable(callback, 'callback', attrs)
 
     def _write_record(self, record, extra_attrs=[]):

diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py
index bb77ace760b1eaf9f18f7777362caa1991d8deb6..1fab10ddacf4d8c9fc50a1ce5f75e30644cd616d 100644 (file)
--- 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:
 
     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
 
         else:
             return func.name