[empathy: 98/99] Merge branch 'call'

[Emilio Pozuelo Monfort <epm src gnome org>]

commit 8944f13286ba5293781f2d57980da284cb2aa29d
Merge: 981a137 3f52e59
Author: Emilio Pozuelo Monfort <emilio pozuelo collabora co uk>
Date:   Thu Jun 9 10:28:44 2011 +0100

    Merge branch 'call'

 .gitmodules                                        |    3 +
 Makefile.am                                        |    2 +-
 autogen.sh                                         |   14 +-
 configure.ac                                       |   43 +-
 data/.gitignore                                    |    1 +
 data/Empathy.Call.client                           |   21 +
 data/Makefile.am                                   |    9 +-
 ...esktop.Telepathy.Client.Empathy.Call.service.in |    3 +
 libempathy-gtk/Makefile.am                         |    4 +
 libempathy-gtk/empathy-call-utils.c                |  194 ++
 libempathy-gtk/empathy-call-utils.h                |   43 +
 libempathy-gtk/empathy-contact-menu.c              |    9 +-
 libempathy-gtk/empathy-individual-menu.c           |    9 +-
 libempathy-gtk/empathy-new-call-dialog.c           |   52 +-
 libempathy/Makefile.am                             |   10 +-
 libempathy/empathy-channel-factory.c               |    9 +
 libempathy/empathy-contact.c                       |   24 +
 libempathy/empathy-request-util.h                  |    3 +
 libempathy/empathy-utils.c                         |   59 -
 libempathy/empathy-utils.h                         |    9 -
 m4/ax_config_dir.m4                                |  109 +
 po/POTFILES.in                                     |    3 +
 src/.gitignore                                     |    1 +
 src/Makefile.am                                    |   34 +
 src/empathy-audio-sink.c                           |  302 ++-
 src/empathy-audio-sink.h                           |    2 +
 src/empathy-call-factory.c                         |  322 ++
 src/empathy-call-factory.h                         |   69 +
 src/empathy-call-handler.c                         | 1087 +++++++
 src/empathy-call-handler.h                         |  109 +
 src/empathy-call-window-fullscreen.c               |  309 ++
 src/empathy-call-window-fullscreen.h               |   77 +
 src/empathy-call-window.c                          | 3278 ++++++++++++++++++++
 src/empathy-call-window.h                          |   67 +
 src/empathy-call-window.ui                         |    7 +
 src/empathy-call.c                                 |  177 ++
 src/empathy-event-manager.c                        |  165 +-
 src/empathy-event-manager.h                        |    2 +
 src/empathy-notifications-approver.c               |   38 +-
 src/empathy-streamed-media-handler.c               |    5 +-
 src/empathy-streamed-media-window.c                |  121 +-
 src/empathy-video-src.c                            |    5 +-
 src/empathy.c                                      |    4 +
 src/ev-sidebar.c                                   |   16 +
 telepathy-yell                                     |    1 +
 45 files changed, 6537 insertions(+), 294 deletions(-)
---
diff --cc configure.ac
index 3e998de,fbe4222..a8a272b
--- a/configure.ac
+++ b/configure.ac
@@@ -554,9 -563,8 +592,9 @@@ Configure summary
  	Spell checking (enchant)....:  ${have_enchant}
  	Display maps (libchamplain).:  ${have_libchamplain}
  	Location awareness (Geoclue):  ${have_geoclue}
 +	Geocode support (Geoclue):     ${have_geocode}
  	Adium themes (Webkit).......:  ${have_webkit}
- 	Meego widgets ..............:  ${have_meego}
+ 	Meego widgets...............:  ${have_meego}
  	Control center embedding....:  ${have_control_center_embedding}
  	Cheese webcam support ......:  ${have_cheese}
  
diff --cc libempathy/Makefile.am
index 41cec88,186f08a..4884631
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@@ -10,8 -10,8 +10,9 @@@ AM_CPPFLAGS 
  	-DG_LOG_DOMAIN=\"empathy\"			\
  	-DGCR_API_SUBJECT_TO_CHANGE			\
  	$(EMPATHY_CFLAGS)				\
+ 	$(YELL_CFLAGS)					\
  	$(GEOCLUE_CFLAGS)				\
 +	$(GEOCODE_CFLAGS)				\
  	$(NETWORK_MANAGER_CFLAGS)			\
  	$(CONNMAN_CFLAGS)				\
  	$(WARN_CFLAGS)					\