[empathy: 3/3] Merge commit 'ka/empathy-tpl-20100225-ifdef'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 04a3f49597c3ffb367b48fe6c01f972bdd15ea11
Merge: e86aa10 28244a9
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Fri Feb 26 08:49:16 2010 +0000

    Merge commit 'ka/empathy-tpl-20100225-ifdef'

 configure.ac                           |   28 ++
 libempathy-gtk/Makefile.am             |    2 +
 libempathy-gtk/empathy-chat.c          |  183 ++++++++++--
 libempathy-gtk/empathy-contact-menu.c  |   18 +-
 libempathy-gtk/empathy-log-window.c    |  533 +++++++++++++++++++++++++++++++-
 libempathy/Makefile.am                 |   34 ++-
 libempathy/empathy-contact.c           |   30 ++
 libempathy/empathy-contact.h           |    7 +
 libempathy/empathy-log-manager.h       |    4 +
 libempathy/empathy-log-store-empathy.h |    4 +
 libempathy/empathy-log-store.h         |    4 +
 libempathy/empathy-message.c           |   78 +++++
 libempathy/empathy-message.h           |    6 +
 src/Makefile.am                        |    2 +
 src/empathy-chat-window.c              |    2 +
 src/empathy.c                          |   18 +-
 16 files changed, 909 insertions(+), 44 deletions(-)
---