[empathy: 8/8] Merge branch 'request-chat-626630'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 95efa6ca70aa8cf1dc3283706c2254f45cad59c5
Merge: 9a48fa9 734ecf3
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed Aug 11 16:20:42 2010 +0200

    Merge branch 'request-chat-626630'

 libempathy-gtk/empathy-chat.c               |   28 ++---
 libempathy-gtk/empathy-contact-list-view.c  |    2 +-
 libempathy-gtk/empathy-contact-menu.c       |    3 +-
 libempathy-gtk/empathy-individual-menu.c    |    3 +-
 libempathy-gtk/empathy-individual-view.c    |    2 +-
 libempathy-gtk/empathy-new-message-dialog.c |   10 +-
 libempathy/empathy-call-factory.c           |    1 +
 libempathy/empathy-dispatcher.c             |  216 ++++++---------------------
 libempathy/empathy-dispatcher.h             |   13 +-
 src/empathy-chat-manager.c                  |   60 ++------
 src/empathy-chat-window.c                   |   10 +-
 src/empathy-main-window.c                   |    5 +-
 src/empathy-new-chatroom-dialog.c           |    6 +-
 src/empathy.c                               |    9 +-
 tests/interactive/empetit.c                 |   22 +---
 15 files changed, 90 insertions(+), 300 deletions(-)
---