[empathy: 8/8] Merge branch 'ft-misc'

[Jonny Lamb <jonnylamb src gnome org>]

commit 855b008f5171a7431f770b0a00ad04e162ac2d09
Merge: b747b97... eac81f0...
Author: Jonny Lamb <jonny lamb collabora co uk>
Date:   Sat Apr 25 11:20:24 2009 +0100

    Merge branch 'ft-misc'

 libempathy/empathy-tp-file.c          |  179 ++++++++++++++++++++++++++++-----
 libempathy/empathy-tp-file.h          |    2 +-
 python/pyempathy/pyempathy.defs       |   77 +++++++++++++--
 python/pyempathygtk/pyempathygtk.defs |   12 +-
 src/empathy-ft-manager.c              |    2 +-
 5 files changed, 231 insertions(+), 41 deletions(-)