[empathy: 2/2] Merge commit 'jtellier/video-call-button-sensitivity'

[Davyd Madeley <davyd src gnome org>]

commit aedb2729fa86eafc2891bc522cad68285d41b8a5
Merge: 2a6048e... 9fe1942...
Author: Davyd Madeley <davyd madeley id au>
Date:   Wed Jul 15 16:45:12 2009 +0100

    Merge commit 'jtellier/video-call-button-sensitivity'

 libempathy-gtk/empathy-contact-menu.c |    4 ++--
 libempathy/empathy-contact.c          |   24 ++++++++++++++++++++++++
 libempathy/empathy-contact.h          |    2 ++
 src/empathy-call-window.c             |   12 +++++++-----
 4 files changed, 35 insertions(+), 7 deletions(-)
---