[empathy/gnome-2-34: 7/7] Merge branch 'remove-liveadder' into gnome-2-34

[Sjoerd Simons <sjoerds src gnome org>]

commit 706bdd3ad6d9c788015a5e8733046e653dcbbd21
Merge: e28558f a340eee
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date:   Mon Mar 14 12:57:55 2011 +0000

    Merge branch 'remove-liveadder' into gnome-2-34

 src/empathy-audio-sink.c            |  302 +++++++++++++++++++++++++++++-----
 src/empathy-audio-sink.h            |    2 +
 src/empathy-call-handler.c          |   17 ++
 src/empathy-call-window.c           |  119 ++------------
 src/empathy-streamed-media-window.c |  119 ++------------
 5 files changed, 308 insertions(+), 251 deletions(-)
---