[empathy: 148/148] Merge branch 'ft_rework'

[Cosimo Cecchi <cosimoc src gnome org>]

commit 3623b886388ccb1a581177c096a1668b26fdadd1
Merge: b06c101... 17fec97...
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Jun 1 18:07:13 2009 +0200

    Merge branch 'ft_rework'

 CONTRIBUTORS                                 |    1 +
 data/empathy.schemas.in                      |    2 +-
 docs/libempathy-gtk/libempathy-gtk-docs.sgml |    3 +
 docs/libempathy-gtk/libempathy-gtk.types     |    1 +
 docs/libempathy/libempathy-docs.sgml         |    5 +
 docs/libempathy/libempathy.types             |    3 +
 libempathy-gtk/empathy-ui-utils.c            |  138 ++--
 libempathy-gtk/empathy-ui-utils.h            |    3 +-
 libempathy/Makefile.am                       |    4 +
 libempathy/empathy-call-handler.c            |   12 +-
 libempathy/empathy-dispatch-operation.c      |   28 +-
 libempathy/empathy-dispatcher.c              |  493 ++++++--
 libempathy/empathy-dispatcher.h              |   14 +-
 libempathy/empathy-ft-factory.c              |  242 ++++
 libempathy/empathy-ft-factory.h              |   77 ++
 libempathy/empathy-ft-handler.c              | 1642 ++++++++++++++++++++++++++
 libempathy/empathy-ft-handler.h              |  100 ++
 libempathy/empathy-tp-file.c                 | 1562 +++++++++----------------
 libempathy/empathy-tp-file.h                 |  112 ++-
 libempathy/empathy-utils.c                   |    7 +
 libempathy/empathy-utils.h                   |    2 +
 po/POTFILES.in                               |    2 +
 python/pyempathy/pyempathy.defs              |  302 ++++--
 python/pyempathy/pyempathy.override          |    2 +
 python/pyempathygtk/pyempathygtk.defs        |    8 +
 python/pyempathygtk/pyempathygtk.override    |    1 +
 python/update-binding.sh                     |    2 +
 src/empathy-about-dialog.c                   |    1 +
 src/empathy-event-manager.c                  |   51 +-
 src/empathy-ft-manager.c                     | 1390 ++++++++++++----------
 src/empathy-ft-manager.h                     |   42 +-
 src/empathy-main-window.c                    |    9 +-
 src/empathy.c                                |   65 +-
 33 files changed, 4289 insertions(+), 2037 deletions(-)