[empathy: 17/17] Merge commit 'shaunm/dndfiles2'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 740a34efd932ad1bf6d5cd1d4580fd3b6af0eacc
Merge: 8d21537... 9ec54fd...
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Nov 30 15:08:24 2009 +0000

    Merge commit 'shaunm/dndfiles2'

 libempathy-gtk/empathy-chat.c              |    6 +
 libempathy-gtk/empathy-contact-list-view.c |  267 +++++++++++++++++++++-------
 libempathy-gtk/empathy-ui-utils.c          |   66 ++++++--
 libempathy-gtk/empathy-ui-utils.h          |    4 +
 src/empathy-chat-window.c                  |  116 ++++++++++++-
 5 files changed, 381 insertions(+), 78 deletions(-)
---