[empathy: 5/5] Merge branch 'gnome-3-4'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 3e8ad073e4434f8dea27c29def12f1548d5d7b86
Merge: 085365f aa2c67b
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed May 9 14:02:13 2012 +0200

    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

 configure.ac |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc configure.ac
index 1cce7ab,1c45c90..3b04f6e
--- a/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