[caribou: 22/23] Merge branch 'gtk-module'

[Eitan Isaacson <eitani src gnome org>]

commit f086cfca1750bc6d53ba80e152ce1d6c17b964be
Merge: 875abe2 aae4d8f
Author: Eitan Isaacson <eitan monotonous org>
Date:   Fri Aug 12 09:20:01 2011 +0200

    Merge branch 'gtk-module'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=655047

 .gitignore                           |    2 +-
 Makefile.am                          |    2 +-
 caribou/antler/main.py               |    4 +-
 configure.ac                         |   46 +++++------
 im/gtk2/Makefile.am                  |   33 --------
 im/gtk2/caribou-im.c                 |    1 -
 im/gtk2/caribou-imcontext.vala       |    1 -
 im/gtk3/Makefile.am                  |   32 --------
 im/gtk3/caribou-im.c                 |   53 -------------
 im/gtk3/caribou-imcontext.vala       |  129 -------------------------------
 im/gtk3/vapi-fixes.vapi              |   10 ---
 libcaribou/keyboard-service.vala     |    6 +-
 {im => modules}/Makefile.am          |    4 +-
 modules/gtk2/Makefile.am             |   34 ++++++++
 modules/gtk2/caribou-gtk-module.vala |    1 +
 modules/gtk2/caribou-module.c        |    1 +
 {im => modules}/gtk2/vapi-fixes.vapi |    0
 modules/gtk3/Makefile.am             |   33 ++++++++
 modules/gtk3/caribou-gtk-module.vala |  140 ++++++++++++++++++++++++++++++++++
 modules/gtk3/caribou-module.c        |   26 ++++++
 modules/gtk3/vapi-fixes.vapi         |   29 +++++++
 21 files changed, 295 insertions(+), 292 deletions(-)
---