[empathy: 14/14] Merge branch 'sms-support-rebase'

[Danielle Madeley <daniellem src gnome org>]

commit 9a1a49ed9ddf5a3d1da99eabca27882705688545
Merge: 77fab8e 0fda594
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Thu May 5 17:37:40 2011 +1000

    Merge branch 'sms-support-rebase'

 libempathy-gtk/empathy-chat.c                    |   63 ++++++++++++--
 libempathy-gtk/empathy-chat.h                    |    4 +-
 libempathy-gtk/empathy-contact-selector-dialog.c |   25 +++++-
 libempathy-gtk/empathy-images.h                  |    1 +
 libempathy-gtk/empathy-individual-menu.c         |   65 ++++++++++++++
 libempathy-gtk/empathy-individual-menu.h         |    5 +-
 libempathy-gtk/empathy-new-message-dialog.c      |  104 +++++++++++++++++++++-
 libempathy/empathy-contact.c                     |   21 +++++
 libempathy/empathy-contact.h                     |    3 +
 libempathy/empathy-request-util.c                |   55 +++++++-----
 libempathy/empathy-request-util.h                |    5 +
 libempathy/empathy-tp-chat.c                     |   80 +++++++++++++++++
 libempathy/empathy-tp-chat.h                     |    2 +
 src/empathy-chat-manager.c                       |    3 +-
 src/empathy-chat-window.c                        |   60 +++++++++----
 src/empathy-chat-window.h                        |    3 +-
 16 files changed, 444 insertions(+), 55 deletions(-)
---