[empathy: 7/7] Merge branch 'presence-manager-640532'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 71e8203ac15682c88cd2313c16a2e793d90312ce
Merge: 1570d9b 08d9529
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed Jan 26 09:30:07 2011 +0100

    Merge branch 'presence-manager-640532'

 libempathy-gtk/empathy-presence-chooser.c |   22 +-
 libempathy-gtk/empathy-ui-utils.c         |    1 -
 libempathy/Makefile.am                    |    4 +-
 libempathy/empathy-account-settings.c     |   11 +-
 libempathy/empathy-idle.c                 |  732 -----------------------------
 libempathy/empathy-idle.h                 |   74 ---
 libempathy/empathy-presence-manager.c     |  687 +++++++++++++++++++++++++++
 libempathy/empathy-presence-manager.h     |   85 ++++
 libempathy/empathy-utils.c                |   10 +-
 src/empathy-chat.c                        |    8 +-
 src/empathy-event-manager.c               |   10 +-
 src/empathy-main-window.c                 |    1 -
 src/empathy.c                             |   26 +-
 13 files changed, 819 insertions(+), 852 deletions(-)
---