[empathy: 5/5] Merge branch 'gseal'

[Danielle Madeley <daniellem src gnome org>]

commit 779239e5698e387aa19836b3079fbad5f271c559
Merge: 65117be 468edbc
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Tue Jun 15 21:43:33 2010 +1000

    Merge branch 'gseal'

 configure.ac                               |    8 ++--
 libempathy-gtk/empathy-avatar-chooser.c    |    8 +++--
 libempathy-gtk/empathy-chat-text-view.c    |   45 ++++++++-------------------
 libempathy-gtk/empathy-chat.c              |    4 +-
 libempathy-gtk/empathy-contact-list-view.c |    2 +-
 5 files changed, 26 insertions(+), 41 deletions(-)
---
diff --cc configure.ac
index 859c94a,b6539c1..8e09f4d
--- a/configure.ac
+++ b/configure.ac
@@@ -30,9 -30,9 +30,9 @@@ AC_COPYRIGHT(
  
  # Minimal version required
  GLIB_REQUIRED=2.22.0
- GTK_REQUIRED=2.20.0
+ GTK_REQUIRED=2.21.2
  GCONF_REQUIRED=1.2.0
 -TELEPATHY_GLIB_REQUIRED=0.11.6
 +TELEPATHY_GLIB_REQUIRED=0.11.7
  TELEPATHY_LOGGER=0.1.1
  ENCHANT_REQUIRED=1.2.0
  ISO_CODES_REQUIRED=0.35