[empathy: 35/35] Merge branch 'glassrose-contact-blocking-rebase'

[Danielle Madeley <daniellem src gnome org>]

commit 8e6a977d36aea1eb4b429ddee84cb9b4bc4142cd
Merge: 2e3e5e8 c0eca04
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Mon Mar 14 12:58:00 2011 +1100

    Merge branch 'glassrose-contact-blocking-rebase'

 .../Connection_Interface_Contact_Blocking.xml      |  172 +++++
 extensions/Makefile.am                             |    1 +
 extensions/misc.xml                                |    1 +
 libempathy-gtk/Makefile.am                         |    3 +
 libempathy-gtk/empathy-chat.c                      |    3 +-
 libempathy-gtk/empathy-contact-blocking-dialog.c   |  791 ++++++++++++++++++++
 libempathy-gtk/empathy-contact-blocking-dialog.h   |   60 ++
 libempathy-gtk/empathy-contact-blocking-dialog.ui  |  149 ++++
 libempathy-gtk/empathy-contact-dialogs.c           |  103 +++
 libempathy-gtk/empathy-contact-dialogs.h           |    3 +
 libempathy-gtk/empathy-contact-dialogs.ui          |   53 +-
 libempathy-gtk/empathy-contact-menu.c              |   94 +++
 libempathy-gtk/empathy-contact-menu.h              |    3 +-
 libempathy-gtk/empathy-individual-dialogs.c        |  139 ++++
 libempathy-gtk/empathy-individual-dialogs.h        |    3 +
 libempathy-gtk/empathy-individual-view.c           |   45 +-
 libempathy/empathy-contact-list.c                  |   24 +
 libempathy/empathy-contact-list.h                  |   15 +
 libempathy/empathy-contact-manager.c               |   43 ++
 libempathy/empathy-individual-manager.c            |   85 +++
 libempathy/empathy-individual-manager.h            |    9 +
 libempathy/empathy-tp-contact-list.c               |  110 +++-
 libempathy/empathy-tp-contact-list.h               |    1 +
 src/empathy-chat-window.c                          |    7 +-
 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 ++
 29 files changed, 1967 insertions(+), 32 deletions(-)
---