[empathy: 4/4] Merge remote-tracking branch 'pochu/error-dialog'

[Danielle Madeley <daniellem src gnome org>]

commit fecbf935f2b9be2cd6229099334279028fc517f1
Merge: 7b6b8da 16e0d5a
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Fri Oct 14 15:31:16 2011 +1100

    Merge remote-tracking branch 'pochu/error-dialog'

 libempathy-gtk/empathy-chat.c               |    6 +-
 libempathy-gtk/empathy-individual-menu.c    |    3 +-
 libempathy-gtk/empathy-new-message-dialog.c |   84 ++++++++++++++++++++++++++-
 libempathy/empathy-auth-factory.c           |    4 +-
 libempathy/empathy-request-util.c           |   26 ++++++---
 libempathy/empathy-request-util.h           |   10 ++-
 src/empathy-chat-manager.c                  |    6 +-
 src/empathy-chat-window.c                   |    4 +-
 8 files changed, 121 insertions(+), 22 deletions(-)
---