[empathy: 14/14] Merge branch 'empathy-account'

[Sjoerd Simons <sjoerds src gnome org>]

commit 0a41b6b31705626c71047261b91afdac711dead7
Merge: a980a2b... 1a74f07...
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date:   Wed Jul 1 14:21:29 2009 +0100

    Merge branch 'empathy-account'

 libempathy-gtk/empathy-account-chooser.c    |   71 ++--
 libempathy-gtk/empathy-account-chooser.h    |   10 +-
 libempathy-gtk/empathy-account-widget-irc.c |   39 +-
 libempathy-gtk/empathy-account-widget-irc.h |    4 +-
 libempathy-gtk/empathy-account-widget-sip.c |    9 +-
 libempathy-gtk/empathy-account-widget-sip.h |    4 +-
 libempathy-gtk/empathy-account-widget.c     |   75 ++--
 libempathy-gtk/empathy-account-widget.h     |   22 +-
 libempathy-gtk/empathy-chat-text-view.c     |    2 +-
 libempathy-gtk/empathy-chat.c               |    8 +-
 libempathy-gtk/empathy-chat.h               |    2 +-
 libempathy-gtk/empathy-contact-dialogs.c    |   12 +-
 libempathy-gtk/empathy-contact-list-view.c  |   17 +-
 libempathy-gtk/empathy-contact-widget.c     |    6 +-
 libempathy-gtk/empathy-irc-network-dialog.c |    2 +-
 libempathy-gtk/empathy-log-window.c         |   45 +-
 libempathy-gtk/empathy-log-window.h         |    4 +-
 libempathy-gtk/empathy-new-message-dialog.c |    2 +-
 libempathy-gtk/empathy-theme-adium.c        |    4 +-
 libempathy-gtk/empathy-ui-utils.c           |    4 +-
 libempathy-gtk/empathy-ui-utils.h           |    4 +-
 libempathy/Makefile.am                      |    3 +
 libempathy/empathy-account-manager.c        |  579 +++++++++++----------------
 libempathy/empathy-account-manager.h        |   19 +-
 libempathy/empathy-account-priv.h           |   44 ++
 libempathy/empathy-account.c                |  575 ++++++++++++++++++++++++++
 libempathy/empathy-account.h                |   94 +++++
 libempathy/empathy-chatroom-manager.c       |   18 +-
 libempathy/empathy-chatroom-manager.h       |   11 +-
 libempathy/empathy-chatroom.c               |   20 +-
 libempathy/empathy-chatroom.h               |   11 +-
 libempathy/empathy-contact.c                |   13 +-
 libempathy/empathy-contact.h                |    6 +-
 libempathy/empathy-dispatch-operation.c     |    4 +-
 libempathy/empathy-dispatch-operation.h     |    2 +
 libempathy/empathy-log-manager.c            |   15 +-
 libempathy/empathy-log-manager.h            |   12 +-
 libempathy/empathy-log-store-empathy.c      |   34 +-
 libempathy/empathy-log-store.c              |   12 +-
 libempathy/empathy-log-store.h              |   26 +-
 libempathy/empathy-tp-roomlist.c            |   46 +--
 libempathy/empathy-tp-roomlist.h            |    4 +-
 libempathy/empathy-utils.c                  |   15 +-
 libempathy/empathy-utils.h                  |    1 -
 megaphone/src/megaphone-applet.c            |   28 +-
 python/pyempathy/pyempathy.defs             |  137 +++++--
 python/pyempathygtk/pyempathygtk.defs       |  101 ++---
 src/empathy-accounts-dialog.c               |  125 +++---
 src/empathy-accounts-dialog.h               |    4 +-
 src/empathy-chat-window.c                   |   26 +-
 src/empathy-chat-window.h                   |    4 +-
 src/empathy-chatrooms-window.c              |    4 +-
 src/empathy-event-manager.c                 |   11 +-
 src/empathy-import-dialog.c                 |   24 +-
 src/empathy-import-dialog.h                 |    1 +
 src/empathy-import-pidgin.c                 |    1 -
 src/empathy-main-window.c                   |   25 +-
 src/empathy-new-chatroom-dialog.c           |   16 +-
 src/empathy-status-icon.c                   |   16 +-
 src/empathy.c                               |   22 +-
 tests/check-empathy-chatroom-manager.c      |   45 ++-
 tests/check-empathy-chatroom.c              |    2 +-
 tests/check-empathy-helpers.c               |   25 +-
 tests/check-empathy-helpers.h               |    6 +-
 tests/check-helpers.h                       |    1 -
 65 files changed, 1573 insertions(+), 961 deletions(-)
---