[empathy: 24/24] Merge branch 'sasl-gui'

[Jonny Lamb <jonnylamb src gnome org>]

commit 2ec9b6e89141999f919f8a3bd4a44fd8abad86ff
Merge: 2e38a9c 225ca2e
Author: Jonny Lamb <jonnylamb gnome org>
Date:   Wed Dec 15 08:56:03 2010 +0000

    Merge branch 'sasl-gui'

 configure.ac                                       |    2 +-
 data/Empathy.Auth.client                           |    6 +-
 libempathy-gtk/empathy-account-widget-aim.ui       |   34 +++-
 libempathy-gtk/empathy-account-widget-groupwise.ui |   40 +++-
 libempathy-gtk/empathy-account-widget-icq.ui       |   34 +++-
 libempathy-gtk/empathy-account-widget-jabber.ui    |   70 +++++-
 libempathy-gtk/empathy-account-widget-msn.ui       |   40 +++-
 libempathy-gtk/empathy-account-widget-sip.ui       |   40 +++-
 libempathy-gtk/empathy-account-widget-yahoo.ui     |   34 +++-
 libempathy-gtk/empathy-account-widget.c            |  139 ++++++++++
 libempathy-gtk/empathy-password-dialog.c           |    7 -
 libempathy/empathy-account-settings.c              |  261 +++++++++++++++++--
 libempathy/empathy-account-settings.h              |    2 +
 libempathy/empathy-auth-factory.c                  |  280 ++++++++++++++++----
 libempathy/empathy-auth-factory.h                  |    6 +-
 src/empathy-event-manager.c                        |  127 ++++++++--
 src/empathy-event-manager.h                        |    2 +
 src/empathy-main-window.c                          |  149 +++++++++++
 src/empathy-main-window.ui                         |   14 +-
 src/empathy-notifications-approver.c               |   10 +
 src/empathy-status-icon.c                          |    2 +-
 21 files changed, 1161 insertions(+), 138 deletions(-)
---