[empathy: 11/11] Merge branch 'gtk-style-636654'

[Guillaume Desmottes <gdesmott src gnome org>]

commit 119cc5f2451bac0ef8eec82a8ea746846327be0b
Merge: d55a1e7 b10823a
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed Dec 15 17:01:37 2010 +0100

    Merge branch 'gtk-style-636654'

 configure.ac                                  |    2 +-
 libempathy-gtk/empathy-account-widget.c       |   25 +++++++++++++------------
 libempathy-gtk/empathy-chat-text-view.c       |    2 +-
 libempathy-gtk/empathy-contact-list-view.c    |   19 +++++++++----------
 libempathy-gtk/empathy-individual-view.c      |   21 ++++++++++-----------
 libempathy-gtk/empathy-persona-view.c         |   21 ++++++++++-----------
 libempathy-gtk/empathy-status-preset-dialog.c |    8 ++++----
 libempathy-gtk/empathy-ui-utils.c             |   10 ++++++++++
 libempathy-gtk/empathy-ui-utils.h             |    3 +++
 libempathy-gtk/empathy-video-widget.c         |   10 ++++------
 10 files changed, 65 insertions(+), 56 deletions(-)
---