[empathy: 3/3] Merge remote branch 'vminko/fix-633481-v2'

[Guillaume Desmottes <gdesmott src gnome org>]

commit cb0e2e0239d2bdad3aa4afbd683684f9ca2d1815
Merge: bf03b8e 875bf69
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Nov 15 10:12:05 2010 +0100

    Merge remote branch 'vminko/fix-633481-v2'

 libempathy-gtk/empathy-account-chooser.c         |  107 +++++++++++++++++-----
 libempathy-gtk/empathy-account-chooser.h         |   26 +++++-
 libempathy-gtk/empathy-contact-dialogs.c         |   16 ++-
 libempathy-gtk/empathy-contact-selector-dialog.c |   12 ++-
 libempathy-gtk/empathy-contact-selector-dialog.h |    6 +-
 libempathy-gtk/empathy-individual-dialogs.c      |   11 ++-
 libempathy-gtk/empathy-new-call-dialog.c         |   86 ++++++++++++++----
 libempathy-gtk/empathy-new-message-dialog.c      |   62 +++++++++----
 src/empathy-new-chatroom-dialog.c                |   77 +++++++++++-----
 tests/interactive/test-empathy-account-chooser.c |    6 +-
 10 files changed, 307 insertions(+), 102 deletions(-)
---