Merge remote-tracking branch 'origin/call1' into master+call
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 21 Feb 2012 07:26:19 +0000 (08:26 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 21 Feb 2012 07:26:19 +0000 (08:26 +0100)
Conflicts:
configure.ac
telepathy-yell

1  2 
configure.ac
libempathy/Makefile.am
src/Makefile.am
src/empathy-call-window.c
src/empathy-call.c

diff --cc 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])
  
- # 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
 +# FIXME: bgo #669673
 +AC_DEFINE(CLUTTER_DISABLE_DEPRECATION_WARNINGS, 1, [Build with Clutter deprecated])
 +
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_HEADERS([config.h])
  AC_CONFIG_SRCDIR([configure.ac])
Simple merge
diff --cc src/Makefile.am
Simple merge
Simple merge
  #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>