[empathy: 6/6] Merge branch 'desktop-schema-626810'

[Guillaume Desmottes <gdesmott src gnome org>]

commit d041967019edda596ad98bd6d27e928dc2b7fd53
Merge: 7e37089 700d6bc
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Nov 16 14:11:05 2010 +0100

    Merge branch 'desktop-schema-626810'

 configure.ac                            |    3 +-
 libempathy-gtk/empathy-chat-text-view.c |   38 ++++++++++--------------------
 libempathy-gtk/empathy-theme-adium.c    |   30 +++++++++--------------
 libempathy/empathy-gsettings.h          |    3 ++
 src/cc-empathy-accounts-panel.c         |    9 -------
 5 files changed, 29 insertions(+), 54 deletions(-)
---