[empathy: 19/19] Merge branch 'timestamp-648188'

[Guillaume Desmottes <gdesmott src gnome org>]

commit bdea54f59e52ebeaa0743674aa5998636f26a241
Merge: 9d9cfc0 eb6ab43
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed Apr 20 09:49:52 2011 +0200

    Merge branch 'timestamp-648188'

 libempathy-gtk/empathy-chat-text-view.c    |   41 ++--
 libempathy-gtk/empathy-chat-text-view.h    |    2 +-
 libempathy-gtk/empathy-chat.c              |   30 ++-
 libempathy-gtk/empathy-contact-widget.c    |    6 +-
 libempathy-gtk/empathy-individual-widget.c |    6 +-
 libempathy-gtk/empathy-location-manager.c  |   17 +-
 libempathy-gtk/empathy-theme-adium.c       |    6 +-
 libempathy-gtk/empathy-theme-boxes.c       |    2 +-
 libempathy/empathy-chatroom-manager.c      |    3 +
 libempathy/empathy-ft-handler.c            |    4 +-
 libempathy/empathy-message.c               |  207 ++++++----------
 libempathy/empathy-message.h               |   21 +--
 libempathy/empathy-time.c                  |  122 ++++------
 libempathy/empathy-time.h                  |   10 +-
 libempathy/empathy-tp-chat.c               |  353 ++++++++++++----------------
 libempathy/empathy-tp-chat.h               |    2 +-
 libempathy/empathy-tp-file.c               |    2 +-
 src/empathy-chat-manager.c                 |    7 +
 src/empathy-event-manager.c                |    2 +-
 src/empathy-map-view.c                     |   14 +-
 20 files changed, 365 insertions(+), 492 deletions(-)
---