[empathy: 17/17] Merge branch 'pmuc'

[Danielle Madeley <davyd src gnome org>]

commit 10bb432035ea43ab4ea7af7479fa0bc416cf7a59
Merge: d8a2cee fa65881
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Tue Dec 22 21:56:31 2009 +1100

    Merge branch 'pmuc'

 configure.ac                                     |    2 +-
 extensions/Channel_Interface_Conference.xml      |  400 ++++++++++++++++++++++
 extensions/misc.xml                              |    1 +
 libempathy-gtk/empathy-contact-menu.c            |    9 +-
 libempathy-gtk/empathy-contact-selector-dialog.c |   63 +++-
 libempathy-gtk/empathy-contact-selector-dialog.h |    2 +
 libempathy/empathy-dispatcher.c                  |   13 +
 libempathy/empathy-tp-chat.c                     |  109 ++++++-
 libempathy/empathy-tp-chat.h                     |    1 +
 src/Makefile.am                                  |    1 +
 src/empathy-chat-window.c                        |   99 ++++++-
 src/empathy-chat-window.ui                       |    7 +
 src/empathy-invite-participant-dialog.c          |   65 ++++
 src/empathy-invite-participant-dialog.h          |   46 +++
 14 files changed, 784 insertions(+), 34 deletions(-)
---