 data/org.gnome.Empathy.gschema.xml.in  |    5 +
 libempathy-gtk/empathy-theme-adium.c   |  125 ++++++++++-----
 libempathy-gtk/empathy-theme-adium.h   |    5 +-
 libempathy-gtk/empathy-theme-manager.c |  270 +++++++++++++++++++-------------
 libempathy/empathy-gsettings.h         |    1 +
 src/empathy-preferences.c              |  177 +++++++++++++++++++++-
 src/empathy-preferences.ui             |   63 ++++----
 7 files changed, 464 insertions(+), 182 deletions(-)
