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 --cc configure.ac
index 1cce7ab16a3b19800cd3b4c1a513e5d80536ae35,1c45c90fa74529f3053b24eb8a07d27d61809ae6..3b04f6ed17cb497bd3b48c1066a63cabe77d41ae
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -58,10 -62,9 +62,9 @@@ GCR_REQUIRED=2.91.
  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