[empathy: 16/16] Merge branch 'timestamp-615976'

[Guillaume Desmottes <gdesmott src gnome org>]

commit bb4750da5ff85a61e8e9d4643fc63fbefe34a1c0
Merge: 046792f 61de8fb
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue May 4 14:20:15 2010 +0200

    Merge branch 'timestamp-615976'

 libempathy-gtk/empathy-chat.c               |    6 ++-
 libempathy-gtk/empathy-contact-list-view.c  |    3 +-
 libempathy-gtk/empathy-contact-menu.c       |    3 +-
 libempathy-gtk/empathy-new-message-dialog.c |    3 +-
 libempathy-gtk/empathy-ui-utils.c           |   24 ++++---------
 libempathy-gtk/empathy-ui-utils.h           |    4 ++-
 libempathy/empathy-call-handler.c           |    5 ++-
 libempathy/empathy-call-handler.h           |    3 +-
 libempathy/empathy-dispatch-operation.c     |   46 ++++++++++++++++++++++++-
 libempathy/empathy-dispatch-operation.h     |   14 +++++++-
 libempathy/empathy-dispatcher.c             |   36 +++++++++++++-------
 libempathy/empathy-dispatcher.h             |   22 +++++++++---
 libempathy/empathy-ft-handler.c             |    3 +-
 libempathy/empathy-tp-chat.c                |    2 +-
 src/empathy-call-window.c                   |    3 +-
 src/empathy-chat-manager.c                  |    5 ++-
 src/empathy-chat-window.c                   |   48 ++++++++++++++++++++++++---
 src/empathy-chat-window.h                   |    3 +-
 src/empathy-event-manager.c                 |   19 ++++++++++
 src/empathy-main-window.c                   |    3 +-
 src/empathy-new-chatroom-dialog.c           |    3 +-
 src/empathy.c                               |    9 +++--
 tests/interactive/empetit.c                 |    3 +-
 23 files changed, 207 insertions(+), 63 deletions(-)
---