[empathy/gnome-2-34: 23/23] Merge branch 'contact-blocking-3' into gnome-2-34

[Danielle Madeley <daniellem src gnome org>]

commit 17e69195176edfa854e1d62cc3e6bd322128ce37
Merge: d23ec3d 49a44a4
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Fri Feb 11 20:31:32 2011 +1100

    Merge branch 'contact-blocking-3' into gnome-2-34

 libempathy-gtk/Makefile.am                         |    3 +
 libempathy-gtk/empathy-chat.c                      |    3 +-
 libempathy-gtk/empathy-contact-blocking-dialog.c   |  789 ++++++++++++++++++++
 libempathy-gtk/empathy-contact-blocking-dialog.h   |   60 ++
 libempathy-gtk/empathy-contact-blocking-dialog.ui  |  149 ++++
 libempathy-gtk/empathy-contact-dialogs.c           |  101 +++
 libempathy-gtk/empathy-contact-dialogs.h           |    3 +
 libempathy-gtk/empathy-contact-dialogs.ui          |   54 +-
 libempathy-gtk/empathy-contact-menu.c              |   93 +++
 libempathy-gtk/empathy-contact-menu.h              |    3 +-
 libempathy-gtk/empathy-individual-dialogs.c        |   96 +++
 libempathy-gtk/empathy-individual-dialogs.h        |    3 +
 libempathy-gtk/empathy-individual-view.c           |   46 +-
 libempathy/empathy-contact-list.c                  |   23 +
 libempathy/empathy-contact-list.h                  |   13 +
 libempathy/empathy-contact-manager.c               |   41 +
 libempathy/empathy-individual-manager.c            |   78 ++
 libempathy/empathy-individual-manager.h            |   10 +
 libempathy/empathy-tp-contact-list.c               |   64 ++-
 libempathy/empathy-tp-contact-list.h               |    1 +
 src/empathy-chat-window.c                          |    4 +
 src/empathy-main-window.c                          |   17 +-
 src/empathy-main-window.ui                         |    7 +
 tests/interactive/.gitignore                       |    1 +
 tests/interactive/Makefile.am                      |    2 +
 .../test-empathy-contact-blocking-dialog.c         |   55 ++
 26 files changed, 1686 insertions(+), 33 deletions(-)
---