[empathy: 26/26] Merge branch 'trivia'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 6843cf006192fecf2382b1dd87a2fb8531a34b5f
Merge: a6eb75f... a28c3a4...
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Oct 22 14:37:26 2009 +0100

    Merge branch 'trivia'

 libempathy-gtk/empathy-account-widget.c          |    2 +-
 libempathy-gtk/empathy-avatar-chooser.c          |   34 ++--
 libempathy-gtk/empathy-avatar-image.c            |    3 +-
 libempathy-gtk/empathy-chat-text-view.c          |   10 +-
 libempathy-gtk/empathy-contact-widget.c          |   22 +-
 libempathy-gtk/empathy-status-preset-dialog.c    |    4 +-
 libempathy-gtk/empathy-theme-adium.c             |    4 +-
 libempathy-gtk/empathy-theme-boxes.c             |    6 +-
 libempathy-gtk/empathy-theme-manager.c           |    8 +-
 libempathy-gtk/empathy-ui-utils.c                |    8 +-
 libempathy-gtk/totem-subtitle-encoding.c         |   26 ++--
 libempathy/empathy-account-settings.c            |    8 +-
 libempathy/empathy-chatroom-manager.c            |   20 +-
 libempathy/empathy-connection-managers.c         |   28 ++--
 libempathy/empathy-contact-groups.c              |   21 +-
 libempathy/empathy-dispatcher.c                  |  245 +++++++++++-----------
 libempathy/empathy-irc-network-manager.c         |   51 +++--
 libempathy/empathy-log-store-empathy.c           |   25 ++-
 libempathy/empathy-status-presets.c              |   20 +-
 libempathy/empathy-time.c                        |    8 +-
 libempathy/empathy-tp-contact-factory.c          |    2 +-
 libempathy/empathy-tp-contact-list.c             |   12 +-
 libempathy/empathy-utils.c                       |   14 +-
 nautilus-sendto-plugin/empathy-nautilus-sendto.c |    2 +-
 24 files changed, 300 insertions(+), 283 deletions(-)
---