[empathy: 10/10] Merge branch 'clickable-link'

[Xavier Claessens <xclaesse src gnome org>]

commit 56872bd8f7c14cdb9a6cd303db3d21b008a6f07a
Merge: 3b09aca 7c9a7e0
Author: Xavier Claessens <xclaesse gmail com>
Date:   Thu Mar 4 16:37:48 2010 +0100

    Merge branch 'clickable-link'

 libempathy-gtk/Makefile.am              |    2 +
 libempathy-gtk/empathy-chat-text-view.c |    1 +
 libempathy-gtk/empathy-chat.c           |    8 +-
 libempathy-gtk/empathy-contact-widget.c |   11 ++-
 libempathy-gtk/empathy-string-parser.c  |  209 +++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-string-parser.h  |   92 ++++++++++++++
 libempathy-gtk/empathy-theme-adium.c    |   47 +------
 libempathy-gtk/empathy-ui-utils.c       |  140 ---------------------
 libempathy-gtk/empathy-ui-utils.h       |   61 +--------
 9 files changed, 332 insertions(+), 239 deletions(-)
---