Merge branch 'gnome-3-4'

diff --combined configure.ac
index 4300cab06fb2cb32ec79e46dd9e11fd87c01b46f,29e16199605860ec82169987a2ad9f486f7ea670..33738e604bedd0ca7a6ac3414a53e86c88f36957
--- 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], [0])
  m4_define([empathy_nano_version], [0])
  
@@@ -59,7 -59,7 +59,7 @@@ LIBCANBERRA_GTK_REQUIRED=0.2
  LIBNOTIFY_REQUIRED=0.7.0
  TELEPATHY_FARSTREAM_REQUIRED=0.2.1
  TELEPATHY_GLIB_REQUIRED=0.17.5
- TELEPATHY_LOGGER=0.2.10
+ TELEPATHY_LOGGER=0.2.13
  WEBKIT_REQUIRED=1.3.13
  GOA_REQUIRED=3.3.0
  
@@@ -231,40 -231,6 +231,6 @@@ if test "x$enable_empathy_av" != "xno" 
  fi
  AM_CONDITIONAL(HAVE_EMPATHY_AV, test "x$have_empathy_av" = "xyes")
  
- # -----------------------------------------------------------
- # Call support in tp-logger
- # -----------------------------------------------------------
- AC_ARG_ENABLE(call-logs,
-             AS_HELP_STRING([--enable-call-logs=@<:@no/yes/auto@:>@],
-             [build with call logs support]),,
-             [enable_call_logs=auto])
- if test "x$enable_call_logs" != "xno" ; then
-    SAVE_CFLAGS=$CFLAGS
-    SAVE_CPPFLAGS=$CPPFLAGS
-    SAVE_LDFLAGS=$LDFLAGS
-    CFLAGS="$CFLAGS $EMPATHY_CFLAGS"
-    CPPFLAGS="$CPPFLAGS $EMPATHY_CFLAGS"
-    LDFLAGS="$LDFLAGS $EMPATHY_LDFLAGS"
- 
-    AC_CHECK_HEADER(telepathy-logger/call-event.h,
-       have_call_logs="yes", have_call_logs="no")
- 
-    CFLAGS=$SAVE_CFLAGS
-    CPPFLAGS=$SAVE_CPPFLAGS
-    LDFLAGS=$SAVE_LDFLAGS
- 
-    if test "x$have_call_logs" = "xyes"; then
-       AC_DEFINE(HAVE_CALL_LOGS, 1, [Define if you have call log support])
-    fi
- else
-   have_call_logs=no
- fi
- 
- if test "x$enable_call_logs" = "xyes" -a "x$have_call_logs" != "xyes"; then
-    AC_MSG_ERROR([Call logs support requested but telepathy-logger wasn't
-                  built with --enable-call])
- fi
- 
  # -----------------------------------------------------------
  # evolution-data-server (about-me)
  # -----------------------------------------------------------
@@@ -686,6 -652,5 +652,5 @@@ Configure summary
        Nautilus-sendto plugin......:  ${have_nst}
        GOA MC plugin...............:  ${have_goa}
        Salut E-D-S support.........:  ${with_eds}
-       Exp. Call log support.......:  ${have_call_logs}
        empathy-av (legacy).........:  ${enable_empathy_av}
  "