[empathy: 5/5] Merge remote-tracking branch 'jonny/ft'

[Guillaume Desmottes <gdesmott src gnome org>]

commit b5764db7cf39aeaaabc261ece49c57776540a0be
Merge: 67869e5 82b0f40
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Nov 29 15:56:11 2011 +0100

    Merge remote-tracking branch 'jonny/ft'
    
    Conflicts:
    	libempathy/empathy-tp-file.c

 libempathy/Makefile.am                           |    2 -
 libempathy/empathy-client-factory.c              |    6 -
 libempathy/empathy-ft-factory.c                  |    4 +-
 libempathy/empathy-ft-handler.c                  |  244 ++++--
 libempathy/empathy-ft-handler.h                  |   17 +-
 libempathy/empathy-tp-file.c                     |  894 ----------------------
 libempathy/empathy-tp-file.h                     |  127 ---
 nautilus-sendto-plugin/empathy-nautilus-sendto.c |    3 +-
 po/POTFILES.in                                   |    1 -
 src/empathy-event-manager.c                      |    7 +-
 src/empathy-ft-manager.c                         |    5 +-
 11 files changed, 186 insertions(+), 1124 deletions(-)
---