[empathy: 10/10] Merge branch 'ui-work-672043'

[Danielle Madeley <daniellem src gnome org>]

commit 9eceb4013b4c2d799c876f1efc043ab462538258
Merge: 43383be b7a0aba
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Wed May 30 10:52:10 2012 +1000

    Merge branch 'ui-work-672043'

 configure.ac                                       |    2 +-
 libempathy-gtk/empathy-account-widget-aim.ui       |   34 ++-
 libempathy-gtk/empathy-account-widget-generic.ui   |   74 ++++-
 libempathy-gtk/empathy-account-widget-groupwise.ui |   28 +-
 libempathy-gtk/empathy-account-widget-icq.ui       |   35 ++-
 libempathy-gtk/empathy-account-widget-irc.ui       |   61 ++-
 libempathy-gtk/empathy-account-widget-jabber.ui    |  407 +++++++++++---------
 .../empathy-account-widget-local-xmpp.ui           |   42 ++-
 libempathy-gtk/empathy-account-widget-msn.ui       |   28 +-
 libempathy-gtk/empathy-account-widget-sip.ui       |   38 +-
 libempathy-gtk/empathy-account-widget.c            |    6 +-
 libempathy-gtk/empathy-contact-widget.c            |  116 +++---
 libempathy-gtk/empathy-contact-widget.ui           |  313 ++++++++++------
 libempathy-gtk/empathy-contactinfo-utils.c         |    4 +-
 src/empathy-accounts-dialog.ui                     |   10 +-
 15 files changed, 748 insertions(+), 450 deletions(-)
---