[empathy: 12/12] Merge branch 'empathy-av-ocrete'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 2ba0e02b8c7a180b1785ef85baab66b0f16db964
Merge: fe6c1d0 c144943
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Fri Mar 2 11:34:47 2012 +0100

    Merge branch 'empathy-av-ocrete'

 configure.ac                                       |   20 +-
 data/Empathy.AudioVideo.client                     |   21 +
 data/Makefile.am                                   |   13 +
 ....Telepathy.Client.Empathy.AudioVideo.service.in |    3 +
 libempathy-gtk/empathy-call-utils.c                |   73 +-
 libempathy/Makefile.am                             |    2 +
 libempathy/empathy-request-util.h                  |    3 +
 libempathy/empathy-tp-streamed-media.c             |  856 ++++++
 libempathy/empathy-tp-streamed-media.h             |  113 +
 po/POTFILES.in                                     |    4 +
 src/Makefile.am                                    |   36 +-
 src/empathy-av.c                                   |  172 ++
 src/empathy-event-manager.c                        |   86 +-
 src/empathy-event-manager.h                        |    1 +
 src/empathy-notifications-approver.c               |    9 +
 src/empathy-streamed-media-factory.c               |  269 ++
 src/empathy-streamed-media-factory.h               |   69 +
 src/empathy-streamed-media-handler.c               |  920 ++++++
 src/empathy-streamed-media-handler.h               |  106 +
 src/empathy-streamed-media-window-fullscreen.c     |  309 ++
 src/empathy-streamed-media-window-fullscreen.h     |   77 +
 src/empathy-streamed-media-window.c                | 3199 ++++++++++++++++++++
 src/empathy-streamed-media-window.h                |   65 +
 src/empathy-streamed-media-window.ui               |  861 ++++++
 src/ev-sidebar.c                                   |  352 +++
 src/ev-sidebar.h                                   |   76 +
 26 files changed, 7707 insertions(+), 8 deletions(-)
---