[empathy: 80/80] Merge branch 'new-log-window'

[Emilio Pozuelo Monfort <epm src gnome org>]

commit 585b25ad427f22c33b8e7344acc051a1c07e1fb9
Merge: f680565 3fe402f
Author: Emilio Pozuelo Monfort <emilio pozuelo collabora co uk>
Date:   Fri Jun 10 09:32:28 2011 +0100

    Merge branch 'new-log-window'

 configure.ac                             |   37 +-
 libempathy-gtk/empathy-account-chooser.c |   67 +-
 libempathy-gtk/empathy-account-chooser.h |    5 +-
 libempathy-gtk/empathy-images.h          |    4 +
 libempathy-gtk/empathy-log-window.c      | 3792 +++++++++++++++++++++---------
 libempathy-gtk/empathy-log-window.h      |   12 +-
 libempathy-gtk/empathy-log-window.ui     |  514 ++---
 libempathy/Makefile.am                   |    2 +
 libempathy/action-chain-internal.h       |   51 +
 libempathy/action-chain.c                |  192 ++
 libempathy/empathy-contact.c             |   96 +-
 libempathy/empathy-message.c             |   42 +-
 po/POTFILES.in                           |    1 +
 13 files changed, 3403 insertions(+), 1412 deletions(-)
---