[empathy: 7/7] Merge branch 'kill-dispatcher-632550'

[Guillaume Desmottes <gdesmott src gnome org>]

commit d64a75e1138fb8f871589e7b3eb8285d4b92cdd5
Merge: 0b0bc2d ce75052
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed Oct 20 11:02:25 2010 +0200

    Merge branch 'kill-dispatcher-632550'

 libempathy/empathy-dispatcher.c |  124 ---------------------------------
 libempathy/empathy-dispatcher.h |    6 --
 libempathy/empathy-ft-handler.c |  146 +++++++++++++++++++++------------------
 libempathy/empathy-tp-chat.c    |   24 +++---
 src/empathy-chat-manager.c      |    8 ++-
 src/empathy-event-manager.c     |    4 +
 6 files changed, 101 insertions(+), 211 deletions(-)
---