[empathy: 8/10] Merge remote-tracking branch 'origin/call1' into master+call

[Guillaume Desmottes <gdesmott src gnome org>]

commit 894b1f315b62499a5d305aff6b937093a20df1a4
Merge: 58574c8 1af2b9b
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Feb 21 08:26:19 2012 +0100

    Merge remote-tracking branch 'origin/call1' into master+call
    
    Conflicts:
    	configure.ac
    	telepathy-yell

 .gitmodules                              |    3 -
 Makefile.am                              |    2 +-
 autogen.sh                               |   13 --
 configure.ac                             |   15 +--
 data/Empathy.Call.client                 |   16 +-
 libempathy-gtk/empathy-call-utils.c      |   89 ++++++++++++-
 libempathy-gtk/empathy-call-utils.h      |    5 +
 libempathy-gtk/empathy-log-window.c      |    8 +-
 libempathy-gtk/empathy-new-call-dialog.c |    2 -
 libempathy/Makefile.am                   |    2 -
 libempathy/empathy-client-factory.c      |   35 -----
 libempathy/empathy-contact.c             |   15 +--
 src/Makefile.am                          |    2 -
 src/empathy-call-factory.c               |  112 ++++-------------
 src/empathy-call-handler.c               |  206 +++++++++---------------------
 src/empathy-call-handler.h               |    4 +-
 src/empathy-call-observer.c              |   12 +-
 src/empathy-call-window.c                |  134 ++++++--------------
 src/empathy-call-window.h                |    2 +-
 src/empathy-call.c                       |    6 +-
 src/empathy-event-manager.c              |   45 +++----
 src/empathy-notifications-approver.c     |   11 +-
 src/empathy.c                            |    3 -
 telepathy-yell                           |    1 -
 24 files changed, 272 insertions(+), 471 deletions(-)
---
diff --cc configure.ac
index 32459f5,9392378..68e5044
--- a/configure.ac
+++ b/configure.ac
@@@ -71,18 -71,6 +71,9 @@@ CHAMPLAIN_REQUIRED=0.12.
  # those warnings later during the cycle (bgo #662662)
  AC_DEFINE(GLIB_DISABLE_DEPRECATION_WARNINGS, 1, [Build with GLib deprecated])
  
 +# FIXME: bgo #669673
 +AC_DEFINE(CLUTTER_DISABLE_DEPRECATION_WARNINGS, 1, [Build with Clutter deprecated])
 +
- # telepathy-yell
- prev_top_build_prefix=$ac_top_build_prefix
- prev_ac_configure_args=$ac_configure_args
- ac_configure_args="$ac_configure_args --disable-shared-library"
- AX_CONFIG_DIR([telepathy-yell])
- ac_top_build_prefix=$prev_top_build_prefix
- ac_configure_args=$prev_ac_configure_args
- export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"telepathy-yell/telepathy-yell
- 
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_HEADERS([config.h])
  AC_CONFIG_SRCDIR([configure.ac])
diff --cc src/empathy-call.c
index 71d9db7,21b751d..5f45d1e
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@@ -30,14 -30,8 +30,12 @@@
  #include <clutter-gtk/clutter-gtk.h>
  #include <clutter-gst/clutter-gst.h>
  
 +#ifdef CLUTTER_WINDOWING_X11
 +#include <X11/Xlib.h>
 +#endif
 +
  #include <telepathy-glib/debug-sender.h>
  
- #include <telepathy-yell/telepathy-yell.h>
- 
  #include <libempathy/empathy-client-factory.h>
  
  #include <libempathy-gtk/empathy-ui-utils.h>