[empathy: 4/10] Merge branch 'master' into tp-tube

[Guillaume Desmottes <gdesmott src gnome org>]

commit f02d96379cb7043611d093921755d699e48689bb
Merge: c8d2398... d696d6c...
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Fri Apr 24 16:28:22 2009 +0100

    Merge branch 'master' into tp-tube

 HACKING                                            |    2 +
 configure.ac                                       |    2 +-
 docs/libempathy-gtk/libempathy-gtk-docs.sgml       |    1 -
 docs/libempathy/libempathy-docs.sgml               |    2 -
 docs/libempathy/libempathy.types                   |    3 -
 empathy.doap                                       |    1 +
 help/es/es.po                                      |  390 +++---
 libempathy-gtk/Makefile.am                         |    7 +-
 libempathy-gtk/empathy-account-chooser.c           |  126 ++-
 libempathy-gtk/empathy-account-chooser.h           |    5 +-
 libempathy-gtk/empathy-account-widget-irc.c        |    8 +-
 libempathy-gtk/empathy-account-widget-irc.ui       |    5 +-
 libempathy-gtk/empathy-avatar-chooser.c            |  165 ++--
 libempathy-gtk/empathy-avatar-chooser.h            |    2 +
 libempathy-gtk/empathy-avatar-image.c              |   30 +
 libempathy-gtk/empathy-avatar-image.h              |    2 +
 libempathy-gtk/empathy-chat.c                      |  134 ++-
 libempathy-gtk/empathy-chat.h                      |    1 -
 libempathy-gtk/empathy-contact-dialogs.c           |  187 +++-
 libempathy-gtk/empathy-contact-dialogs.h           |   11 +-
 libempathy-gtk/empathy-contact-list-view.c         |  184 ++-
 libempathy-gtk/empathy-contact-list-view.h         |    2 +-
 libempathy-gtk/empathy-contact-menu.c              |    4 +-
 libempathy-gtk/empathy-contact-selector.c          |   68 +-
 libempathy-gtk/empathy-contact-selector.h          |    2 +
 libempathy-gtk/empathy-contact-widget.c            |  188 ++--
 libempathy-gtk/empathy-contact-widget.h            |   21 +
 libempathy-gtk/empathy-irc-network-dialog.c        |    1 +
 libempathy-gtk/empathy-log-window.c                |    2 +-
 libempathy-gtk/empathy-new-message-dialog.c        |  124 ++-
 libempathy-gtk/empathy-presence-chooser.c          |  271 +----
 libempathy-gtk/empathy-presence-chooser.h          |    2 +
 libempathy-gtk/empathy-presence-chooser.ui         |  140 ---
 libempathy-gtk/empathy-profile-chooser.c           |   36 +-
 libempathy-gtk/empathy-profile-chooser.h           |    2 +-
 libempathy-gtk/empathy-spell-dialog.c              |  264 ----
 libempathy-gtk/empathy-spell-dialog.ui             |  131 --
 libempathy-gtk/empathy-status-preset-dialog.c      |  549 ++++++++
 libempathy-gtk/empathy-status-preset-dialog.h      |   63 +
 libempathy-gtk/empathy-status-preset-dialog.ui     |  116 ++
 libempathy-gtk/empathy-theme-boxes.c               |    4 +-
 libempathy-gtk/empathy-ui-utils.c                  |    2 +-
 libempathy/Makefile.am                             |    8 +-
 libempathy/empathy-account-manager.c               |  191 +++-
 libempathy/empathy-account-manager.h               |   10 +
 libempathy/empathy-call-handler.c                  |   50 +-
 libempathy/empathy-chatroom-manager.c              |  747 ++++++------
 libempathy/empathy-chatroom.c                      |  123 ++-
 libempathy/empathy-chatroom.h                      |    5 +
 libempathy/empathy-contact-factory.c               |  187 ---
 libempathy/empathy-contact-factory.h               |   79 --
 libempathy/empathy-contact-manager.c               |  156 +--
 libempathy/empathy-contact-manager.h               |    6 +-
 libempathy/empathy-contact.c                       |  571 ++++------
 libempathy/empathy-contact.h                       |   57 +-
 libempathy/empathy-dispatch-operation.c            |   77 ++-
 libempathy/empathy-dispatcher.c                    |  315 ++----
 libempathy/empathy-dispatcher.h                    |   12 +-
 libempathy/empathy-log-store-empathy.c             |    5 +-
 libempathy/empathy-tp-call.c                       |   63 +-
 libempathy/empathy-tp-chat.c                       |  810 ++++++------
 libempathy/empathy-tp-chat.h                       |    3 +-
 libempathy/empathy-tp-contact-factory.c            | 1190 +++++++-----------
 libempathy/empathy-tp-contact-factory.h            |   64 +-
 libempathy/empathy-tp-contact-list.c               | 1309 ++++++++++----------
 libempathy/empathy-tp-contact-list.h               |    7 +-
 libempathy/empathy-tp-file.c                       |  180 ++-
 libempathy/empathy-tp-file.h                       |    1 +
 libempathy/empathy-tp-group.c                      |  981 ---------------
 libempathy/empathy-tp-group.h                      |   93 --
 libempathy/empathy-tp-tube.c                       |    9 +-
 libempathy/empathy-utils.c                         |   93 +--
 libempathy/empathy-utils.h                         |   10 -
 megaphone/src/megaphone-applet.c                   |  376 ++++---
 po/POTFILES.in                                     |    5 +-
 po/es.po                                           |   66 +-
 python/pyempathy/pyempathy.defs                    |  533 +++------
 python/pyempathy/pyempathy.override                |   24 -
 python/pyempathygtk/pyempathygtk.defs              |   46 +-
 python/pyempathygtk/pyempathygtk.override          |    2 -
 python/update-binding.sh                           |    3 -
 src/empathy-accounts-dialog.c                      |    5 +-
 src/empathy-call-window.c                          |   17 +
 src/empathy-call-window.ui                         |    1 +
 src/empathy-chat-window.c                          |   40 +-
 src/empathy-chatrooms-window.c                     |    4 +-
 src/empathy-event-manager.c                        |  152 +--
 src/empathy-main-window.c                          |   45 +-
 src/empathy-new-chatroom-dialog.c                  |   12 +-
 src/empathy.c                                      |    9 +-
 tests/.gitignore                                   |    1 +
 tests/Makefile.am                                  |    8 +-
 tests/check-empathy-helpers.c                      |    2 +-
 tests/contact-run-until-ready-2.c                  |   63 -
 tests/contact-run-until-ready.c                    |   53 -
 tests/test-empathy-presence-chooser.c              |    4 +
 .../test-empathy-status-preset-dialog.c            |   38 +-
 97 files changed, 5310 insertions(+), 6871 deletions(-)