[empathy: 9/9] Merge branch 'approvers-redone-599158'

[Guillaume Desmottes <gdesmott src gnome org>]

commit bfb75bb92f7e1a4aa93a9e144b781faf03df93eb
Merge: 13699e0 247ea7a
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Fri Jun 18 18:11:58 2010 +0200

    Merge branch 'approvers-redone-599158'

 libempathy/empathy-dispatch-operation.c |   50 +----
 libempathy/empathy-dispatch-operation.h |    4 -
 libempathy/empathy-dispatcher.c         |   53 +----
 libempathy/empathy-tp-chat.c            |    5 +-
 libempathy/empathy-tp-chat.h            |    3 +-
 src/empathy-event-manager.c             |  383 +++++++++++++++++++++---------
 src/empathy.c                           |    2 +-
 7 files changed, 279 insertions(+), 221 deletions(-)
---