Merge branch 'gnome-3-4'

Conflicts:
	configure.ac
	libempathy/empathy-tp-chat.c
	src/empathy-event-manager.c
	src/empathy-streamed-media-window.c
	src/empathy-video-widget.c

diff --combined configure.ac
index 1cce7ab16a3b19800cd3b4c1a513e5d80536ae35,1c45c90fa74529f3053b24eb8a07d27d61809ae6..3b04f6ed17cb497bd3b48c1066a63cabe77d41ae
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -2,7 -2,7 +2,7 @@@ dnl If not 1, append datestamp to the v
  m4_define(empathy_released, 0)
  
  m4_define([empathy_major_version], [3])
 -m4_define([empathy_minor_version], [4])
 +m4_define([empathy_minor_version], [5])
  m4_define([empathy_micro_version], [1])
  m4_define([empathy_nano_version], [0])
  
@@@ -37,9 -37,9 +37,9 @@@ AC_COPYRIGHT(
  FOLKS_REQUIRED=0.6.6
  GNUTLS_REQUIRED=2.8.5
  
 -GLIB_REQUIRED=2.30.0
 +GLIB_REQUIRED=2.32.0
  AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_30, [Ignore post 2.30 deprecations])
 -AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_30, [Prevent post 2.30 APIs])
 +AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_32, [Prevent post 2.32 APIs])
  
  GTK_REQUIRED=3.3.6
  AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_4, [Ignore post 3.4 deprecations])
@@@ -52,16 -52,19 +52,19 @@@ AC_DEFINE(CLUTTER_VERSION_MAX_ALLOWED, 
  CLUTTER_GTK_REQUIRED=0.90.3
  CLUTTER_GST_REQUIRED=1.5.2
  
+ TELEPATHY_GLIB_REQUIRED=0.18.0
+ AC_DEFINE(TP_VERSION_MIN_REQUIRED, TP_VERSION_0_18, [Ignore post 0.18 deprecations])
+ AC_DEFINE(TP_VERSION_MAX_ALLOWED, TP_VERSION_0_18, [Prevent post 0.18 APIs])
+ 
  GSTREAMER_REQUIRED=0.10.32
  KEYRING_REQUIRED=2.26.0
  GCR_REQUIRED=2.91.4
  LIBCANBERRA_GTK_REQUIRED=0.25
  LIBNOTIFY_REQUIRED=0.7.0
  TELEPATHY_FARSTREAM_REQUIRED=0.2.1
- TELEPATHY_GLIB_REQUIRED=0.17.6
  TELEPATHY_LOGGER=0.2.13
  WEBKIT_REQUIRED=1.3.13
 -GOA_REQUIRED=3.3.0
 +GOA_REQUIRED=3.5.1
  
  # Optional deps
  ENCHANT_REQUIRED=1.2.0
@@@ -213,6 -216,24 +216,6 @@@ PKG_CHECK_MODULES(EMPATHY_CALL
  AC_DEFINE(EMPATHY_GOA_PROVIDER, "org.gnome.OnlineAccounts",
     [Name of provider for accounts imported from GOA])
  
 -# -----------------------------------------------------------
 -# Build empathy-av?
 -# -----------------------------------------------------------
 -AC_ARG_ENABLE(empathy-av,
 -            AS_HELP_STRING([--enable-empathy-av=@<:@no/yes@:>@],
 -            [build empathy-av (legacy call UI)]),,
 -            [enable_empathy_av=no])
 -if test "x$enable_empathy_av" != "xno" ; then
 -   PKG_CHECK_MODULES(EMPATHY_AV,
 -   [
 -      farstream-0.1
 -      telepathy-farstream >= $TELEPATHY_FARSTREAM_REQUIRED
 -   ])
 -   AC_DEFINE(HAVE_EMPATHY_AV, 1, [Define if you have StreamedMedia channel support])
 -   have_empathy_av=yes
 -fi
 -AM_CONDITIONAL(HAVE_EMPATHY_AV, test "x$have_empathy_av" = "xyes")
 -
  # -----------------------------------------------------------
  # evolution-data-server (about-me)
  # -----------------------------------------------------------
@@@ -241,12 -262,64 +244,12 @@@ f
  # -----------------------------------------------------------
  # Language Support
  # -----------------------------------------------------------
 -IT_PROG_INTLTOOL([0.40.0])
 +IT_PROG_INTLTOOL([0.50.0])
  
  GETTEXT_PACKAGE=empathy
  AC_SUBST(GETTEXT_PACKAGE)
  AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name])
  
 -# -----------------------------------------------------------
 -# Connectivity integration
 -# -----------------------------------------------------------
 -AC_ARG_WITH(connectivity,
 -              AS_HELP_STRING([--with-connectivity=@<:@nm/connman/auto/no@:>@],
 -                             [build with connectivity support]), ,
 -                             with_connectivity=auto)
 -
 -if test "x$with_connectivity" = "xno"; then
 -   have_nm=no
 -   have_connman=no
 -
 -elif test "x$with_connectivity" = "xconnman"; then
 -   have_nm=no
 -
 -   PKG_CHECK_MODULES(CONNMAN,
 -   [
 -      dbus-glib-1
 -   ], have_connman="yes", have_connman="no")
 -
 -   if test "x$have_connman" = "xyes"; then
 -      AC_DEFINE(HAVE_CONNMAN, 1, [Define if you have connman dependencies])
 -   fi
 -
 -else
 -   have_connman=no
 -
 -   PKG_CHECK_MODULES(NETWORK_MANAGER,
 -   [
 -      libnm-glib >= $NETWORK_MANAGER_REQUIRED
 -   ], have_nm="yes", have_nm="no")
 -
 -   if test "x$have_nm" = "xyes"; then
 -      AC_DEFINE(HAVE_NM, 1, [Define if you have libnm-glib])
 -   fi
 -fi
 -
 -if test "x$with_connectivity" = "xconnman" -a "x$have_connman" != "xyes"; then
 -   AC_MSG_ERROR([Couldn't find connman dependencies:
 -
 -$CONNMAN_PKG_ERRORS])
 -fi
 -
 -if test "x$with_connectivity" = "xnm" -a "x$have_nm" != "xyes"; then
 -   AC_MSG_ERROR([Couldn't find Network Manager dependencies:
 -
 -$NETWORK_MANAGER_PKG_ERRORS])
 -fi
 -
 -AM_CONDITIONAL(HAVE_NM, test "x$have_nm" = "xyes")
 -AM_CONDITIONAL(HAVE_CONNMAN, test "x$have_connman" = "xyes")
 -
  # -----------------------------------------------------------
  # gudev
  # -----------------------------------------------------------
@@@ -408,6 -481,38 +411,6 @@@ AM_CONDITIONAL(HAVE_GEOCODE, test "x$ha
  AC_SUBST(GEOCODE_CFLAGS)
  AC_SUBST(GEOCODE_LIBS)
  
 -# -----------------------------------------------------------
 -# meego widgets support
 -# -----------------------------------------------------------
 -AC_ARG_ENABLE(meego,
 -              AS_HELP_STRING([--enable-meego=@<:@no/yes@:>@],
 -                             [Enable meego widgets]), ,
 -                             enable_meego=no)
 -
 -if test "x$enable_meego" != "xno"; then
 -    PKG_CHECK_MODULES(MEEGO,
 -    [
 -       mx-gtk-1.0
 -       gio-unix-2.0
 -    ], have_meego="yes", have_meego="no")
 -
 -    if test "x$have_meego" = "xyes"; then
 -       AC_DEFINE(HAVE_MEEGO, 1, [Define if you have meego])
 -    fi
 -else
 -   have_meego="no"
 -fi
 -
 -if test "x$enable_meego" = "xyes" -a "x$have_meego" != "xyes"; then
 -   AC_MSG_ERROR([Could not find meego dependencies:
 -
 -$MEEGO_PKG_ERRORS])
 -fi
 -
 -AM_CONDITIONAL(HAVE_MEEGO, test "x$have_meego" = "xyes")
 -AC_SUBST(MEEGO_CFLAGS)
 -AC_SUBST(MEEGO_LIBS)
 -
  # -----------------------------------------------------------
  # nautilus-sendto
  # -----------------------------------------------------------
@@@ -520,7 -625,6 +523,7 @@@ AC_CONFIG_FILES(
     tests/Makefile
     tests/interactive/Makefile
     tests/xml/Makefile
 +   tests/certificates/Makefile
     tools/Makefile
  ])
  AC_OUTPUT
@@@ -539,11 -643,17 +542,11 @@@ Configure summary
        Display maps (libchamplain).:  ${have_libchamplain}
        Location awareness (Geoclue):  ${have_geoclue}
        Geocode support (Geocode)...:  ${have_geocode}
 -      Meego widgets...............:  ${have_meego}
        Cheese webcam support ......:  ${have_cheese}
        Camera monitoring...........:  ${have_gudev}
  
 -    Connectivity:
 -      NetworkManager integration..:  ${have_nm}
 -      ConnMan integration.........:  ${have_connman}
 -
      Extras:
        Nautilus-sendto plugin......:  ${have_nst}
        GOA MC plugin...............:  ${have_goa}
        Salut E-D-S support.........:  ${with_eds}
 -      empathy-av (legacy).........:  ${enable_empathy_av}
  "