[empathy: 13/13] Merge branch 'av-handler-622368'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 09df593e038c3f7bfed05294155dbffeabba6ea0
Merge: 603a228 89ca74a
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Jun 22 17:26:10 2010 +0200

    Merge branch 'av-handler-622368'

 libempathy-gtk/empathy-contact-menu.c    |    6 +-
 libempathy-gtk/empathy-new-call-dialog.c |   44 +++++----
 libempathy/empathy-call-factory.c        |  174 ++++++++++++++++++++++++------
 libempathy/empathy-call-factory.h        |   14 ++--
 libempathy/empathy-call-handler.c        |   79 +++-----------
 libempathy/empathy-call-handler.h        |    3 -
 libempathy/empathy-dispatch-operation.c  |   30 -----
 libempathy/empathy-tp-call.c             |   76 +++++---------
 libempathy/empathy-tp-call.h             |    3 -
 src/empathy.c                            |   36 +------
 10 files changed, 218 insertions(+), 247 deletions(-)
---