[gobject-introspection: 47/47] Merge remote-tracking branch 'origin/gir-docbook'

[Johan Dahlin <johan src gnome org>]

commit e6ff50d62ce10c9faec56f7401a5801015ed286b
Merge: 81abc2e c3a1333
Author: Johan Dahlin <johan gnome org>
Date:   Sat Aug 13 14:42:05 2011 -0300

    Merge remote-tracking branch 'origin/gir-docbook'
    
    Conflicts:
    	.gitignore
    	tests/scanner/Regress-1.0-expected.gir

 Makefile-giscanner.am                       |    2 +
 Makefile-tools.am                           |   14 +-
 common.mk                                   |    2 +
 configure.ac                                |    1 +
 giscanner/ast.py                            |    7 +
 giscanner/docbookwriter.py                  |  540 ++++++++
 giscanner/docmain.py                        |   63 +
 giscanner/transformer.py                    |   10 +
 tests/Makefile.am                           |    2 +-
 tests/doctool/GIRepository-2.0-expected.xml | 1781 +++++++++++++++++++++++++++
 tests/doctool/Makefile.am                   |   20 +
 tools/g-ir-doc-tool.in                      |   46 +
 12 files changed, 2484 insertions(+), 4 deletions(-)
---
diff --cc giscanner/ast.py
index d63fdb8,c84bfc7..1433422
--- a/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):