[empathy: 5/5] Merge commit 'jtellier/bug-580771'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 072a3efa99f100d3d65e7d3cfa389cf332dbcb7d
Merge: ff5143d... 0493b4a...
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue May 12 18:21:17 2009 +0100

    Merge commit 'jtellier/bug-580771'

 src/Makefile.am                       |    2 +
 src/empathy-call-window-fullscreen.c  |  294 +++++++++++++++++++++++++++++++++
 src/empathy-call-window-fullscreen.h  |   77 +++++++++
 src/empathy-call-window-fullscreen.ui |   23 +++
 src/empathy-call-window.c             |  293 +++++++++++++++++++++++++++++++--
 src/empathy-call-window.h             |    3 +-
 src/empathy-call-window.ui            |   11 ++
 7 files changed, 688 insertions(+), 15 deletions(-)