[empathy: 59/59] Merge branch 'accountz'

[Jonny Lamb <jonnylamb src gnome org>]

commit 8c4fe70aad3622138957c49732fa612b1e2e9eb7
Merge: 1b4acf8... b6bb173...
Author: Jonny Lamb <jonnylamb gnome org>
Date:   Mon Nov 2 10:41:20 2009 +0000

    Merge branch 'accountz'

 configure.ac                                |    2 +-
 libempathy-gtk/empathy-account-chooser.c    |  177 +++--
 libempathy-gtk/empathy-account-chooser.h    |   10 +-
 libempathy-gtk/empathy-account-widget.c     |   28 +-
 libempathy-gtk/empathy-chat-text-view.c     |    1 -
 libempathy-gtk/empathy-chat.c               |   68 +-
 libempathy-gtk/empathy-chat.h               |    2 +-
 libempathy-gtk/empathy-contact-dialogs.c    |    7 +-
 libempathy-gtk/empathy-contact-list-view.c  |   18 +-
 libempathy-gtk/empathy-contact-widget.c     |    6 +-
 libempathy-gtk/empathy-irc-network-dialog.c |    1 -
 libempathy-gtk/empathy-location-manager.c   |  104 ++-
 libempathy-gtk/empathy-log-window.c         |   79 +-
 libempathy-gtk/empathy-log-window.h         |    4 +-
 libempathy-gtk/empathy-new-message-dialog.c |    1 -
 libempathy-gtk/empathy-presence-chooser.c   |   59 +-
 libempathy-gtk/empathy-theme-adium.c        |    6 +-
 libempathy-gtk/empathy-ui-utils.h           |    1 -
 libempathy/Makefile.am                      |    4 -
 libempathy/empathy-account-manager.c        | 1060 ----------------------
 libempathy/empathy-account-manager.h        |  111 ---
 libempathy/empathy-account-settings.c       |  154 ++--
 libempathy/empathy-account-settings.h       |    8 +-
 libempathy/empathy-account.c                | 1305 ---------------------------
 libempathy/empathy-account.h                |  124 ---
 libempathy/empathy-chatroom-manager.c       |   62 +-
 libempathy/empathy-chatroom-manager.h       |   11 +-
 libempathy/empathy-chatroom.c               |   16 +-
 libempathy/empathy-chatroom.h               |   11 +-
 libempathy/empathy-contact-manager.c        |   71 +-
 libempathy/empathy-contact.c                |   24 +-
 libempathy/empathy-contact.h                |    6 +-
 libempathy/empathy-dispatcher.c             |   80 ++-
 libempathy/empathy-idle.c                   |  171 +++-
 libempathy/empathy-idle.h                   |    7 +
 libempathy/empathy-log-manager.c            |   10 +-
 libempathy/empathy-log-manager.h            |   12 +-
 libempathy/empathy-log-store-empathy.c      |   36 +-
 libempathy/empathy-log-store.c              |   12 +-
 libempathy/empathy-log-store.h              |   26 +-
 libempathy/empathy-tp-roomlist.c            |   10 +-
 libempathy/empathy-tp-roomlist.h            |    4 +-
 libempathy/empathy-utils.c                  |   67 ++-
 libempathy/empathy-utils.h                  |    4 +
 po/POTFILES.in                              |    1 -
 src/empathy-account-assistant.c             |    6 +-
 src/empathy-accounts-dialog.c               |  218 ++---
 src/empathy-accounts-dialog.h               |    4 +-
 src/empathy-chat-window.c                   |   27 +-
 src/empathy-chat-window.h                   |    5 +-
 src/empathy-chatrooms-window.c              |    4 +-
 src/empathy-event-manager.c                 |   15 +-
 src/empathy-import-mc4-accounts.c           |   10 +-
 src/empathy-import-widget.c                 |   62 +-
 src/empathy-main-window.c                   |  138 ++-
 src/empathy-new-chatroom-dialog.c           |    6 +-
 src/empathy-status-icon.c                   |   60 +-
 src/empathy.c                               |  223 +++--
 tests/check-empathy-chatroom-manager.c      |    2 +-
 tests/check-empathy-helpers.c               |    2 +-
 tests/check-empathy-helpers.h               |    7 +-
 61 files changed, 1308 insertions(+), 3462 deletions(-)
---