[empathy: 8/8] Merge commit 'jtellier/call-window-video-preview'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 909f3e3d892afc61e42143bf9182d6dec9f3ccb9
Merge: 3624ff9... e5989d0...
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Jun 15 10:47:06 2009 +0100

    Merge commit 'jtellier/call-window-video-preview'

 libempathy-gtk/empathy-video-widget.c |    3 +
 libempathy/empathy-call-handler.c     |   17 ++
 libempathy/empathy-call-handler.h     |    2 +
 libempathy/empathy-tp-call.c          |   35 ++++
 libempathy/empathy-tp-call.h          |    2 +
 src/empathy-call-window.c             |  325 ++++++++++++++++++++++++---------
 src/empathy-call-window.ui            |    1 +
 7 files changed, 302 insertions(+), 83 deletions(-)
---