Merge remote-tracking branch 'origin/gir-docbook'

Conflicts:
	.gitignore
	tests/scanner/Regress-1.0-expected.gir

diff --cc giscanner/ast.py
index d63fdb8,c84bfc7..1433422
--- 1/giscanner/ast.py
--- 2/giscanner/ast.py
+++ b/giscanner/ast.py
@@@ -575,23 -573,15 +575,30 @@@ class Function(Callable)
          self.is_constructor = False
          self.shadowed_by = None # C symbol string
          self.shadows = None # C symbol string
 +        self.moved_to = None # namespaced function name string
 +
 +    def clone(self):
 +        clone = copy.copy(self)
 +        # copy the parameters array so a change to self.parameters does not
 +        # influence clone.parameters.
 +        clone.parameters = self.parameters[:]
 +        return clone
 +
 +
 +class ErrorQuarkFunction(Function):
 +
 +    def __init__(self, name, retval, parameters, throws, symbol, error_domain):
 +        Function.__init__(self, name, retval, parameters, throws, symbol)
 +        self.error_domain = error_domain
  
  
+ class ErrorQuarkFunction(Function):
+ 
+     def __init__(self, name, retval, parameters, throws, symbol, error_domain):
+         Function.__init__(self, name, retval, parameters, throws, symbol)
+         self.error_domain = error_domain
+ 
+ 
  class VFunction(Callable):
  
      def __init__(self, name, retval, parameters, throws):