[caribou: 9/9] Merge branch 'gtk3-introspection'

[Eitan Isaacson <eitani src gnome org>]

commit c0ffa1d98fe95824e36e827e6ec4361932b3c224
Merge: 0b5e10e 1bba04c
Author: Eitan Isaacson <eitan monotonous org>
Date:   Fri Jan 7 18:44:33 2011 -0800

    Merge branch 'gtk3-introspection'

 bin/caribou.in                     |   17 +-
 caribou/common/setting_types.py    |   38 ++-
 caribou/common/settings.py         |    2 +-
 caribou/common/settings_manager.py |   27 +-
 caribou/ui/Makefile.am             |    1 -
 caribou/ui/animation.py            |   61 ----
 caribou/ui/keyboard.py             |  359 ++++++++++++-----------
 caribou/ui/main.py                 |  115 +++-----
 caribou/ui/opacity.py              |   45 ++--
 caribou/ui/preferences_window.py   |   99 ++++---
 caribou/ui/scan.py                 |  551 +++++++++++-------------------------
 caribou/ui/window.py               |  189 +++++++++----
 configure.ac                       |    8 +-
 13 files changed, 681 insertions(+), 831 deletions(-)
---