[empathy: 3/3] Merge remote-tracking branch 'wjt/652800-661731-notifications'

[Guillaume Desmottes <gdesmott src gnome org>]

commit ba3ffc72a2b424eaa79a94e6a2390b0b5858b867
Merge: 98724db ed85fe7
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed Mar 28 13:48:38 2012 +0200

    Merge remote-tracking branch 'wjt/652800-661731-notifications'

 libempathy-gtk/empathy-notify-manager.h |   15 +++++++++++++
 src/empathy-chat-window.c               |   11 +++++++--
 src/empathy-event-manager.h             |    1 +
 src/empathy-notifications-approver.c    |   35 ++++++++++++++----------------
 4 files changed, 40 insertions(+), 22 deletions(-)
---