[empathy: 14/14] Merge branch 'gtk3-621753'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 0637683a2f89087f49fa0d91e44b04ed26d72ba3
Merge: 526cac7 6b1d425
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Jul 8 14:35:53 2010 +0200

    Merge branch 'gtk3-621753'

 configure.ac                                     |  168 ++++++++++++----------
 extensions/Makefile.am                           |    2 +-
 libempathy-gtk/Makefile.am                       |    8 +-
 libempathy-gtk/empathy-notify-manager.h          |    2 +
 libempathy/Makefile.am                           |    4 +-
 nautilus-sendto-plugin/Makefile.am               |    3 +-
 nautilus-sendto-plugin/empathy-nautilus-sendto.c |   17 +++
 src/Makefile.am                                  |    6 +
 src/empathy-call-window.c                        |    4 +-
 tests/interactive/Makefile.am                    |    4 +-
 10 files changed, 131 insertions(+), 87 deletions(-)
---