[pyatspi2: 17/17] Merge branch 'gi'

[Mike Gorse <mgorse src gnome org>]

commit ca2af3b6bee3111ca1986bbdbe3966d337d5f52e
Merge: 71430ff 6912d30
Author: Mike Gorse <mgorse novell com>
Date:   Mon Nov 29 19:13:45 2010 -0500

    Merge branch 'gi'
    
    Conflicts:
    	NEWS
    	configure.ac
    	tests/data/accessible-test.xml
    	tests/pyatspi/accessibletest.py

 NEWS                               |    6 +
 configure.ac                       |    5 +-
 pyatspi/Accessibility.py           |  312 ++++++++++++++++++--
 pyatspi/Makefile.am                |   14 +-
 pyatspi/__init__.py                |   14 +-
 pyatspi/action.py                  |  107 -------
 pyatspi/busutils/bus.py            |   37 ++-
 pyatspi/component.py               |  186 ------------
 pyatspi/constants.py               |    2 -
 pyatspi/document.py                |   70 -----
 pyatspi/editabletext.py            |  120 --------
 pyatspi/hyperlink.py               |  107 -------
 pyatspi/hypertext.py               |   69 -----
 pyatspi/image.py                   |  105 -------
 pyatspi/registry.py                |  336 +++++++++------------
 pyatspi/selection.py               |  135 ---------
 pyatspi/state.py                   |  126 +--------
 pyatspi/table.py                   |  380 ------------------------
 pyatspi/text.py                    |  575 ------------------------------------
 pyatspi/utils.py                   |    6 +-
 pyatspi/value.py                   |   70 -----
 tests/apps/atk-object-xml-loader.c |    9 +-
 tests/apps/component-app.c         |    2 +-
 tests/data/accessible-test.xml     |    2 +-
 tests/dummyatk/Makefile.am         |    2 +
 tests/dummyatk/my-atk-document.c   |  137 +++++++++
 tests/dummyatk/my-atk-document.h   |   40 +++
 tests/dummyatk/my-atk-text.c       |    2 +-
 tests/dummyatk/my-atk.h            |    1 +
 tests/pyatspi/accessibletest.py    |    7 +-
 tests/pyatspi/collectiontest.py    |    1 +
 tests/pyatspi/componenttest.py     |    4 +-
 tests/pyatspi/relationtest.py      |    2 +-
 tests/pyatspi/runtests.sh          |    3 +-
 34 files changed, 683 insertions(+), 2311 deletions(-)
---