New chat theme engine imported from Gossip (Daniel Gryniewicz, Xavier Claessens).

svn path=/trunk/; revision=494

1 files changed, 32 insertions, 766 deletions

diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c
index 268760a54..6feea2fc4 100644
--- a/libempathy-gtk/empathy-theme-manager.c
+++ b/libempathy-gtk/empathy-theme-manager.c
@@ -16,8 +16,6 @@
  * License along with this program; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
- * 
- * Authors: Richard Hult <richard@imendio.com>
  */
 
 #include "config.h"
@@ -27,24 +25,32 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <libempathy/empathy-conf.h>
 #include <libempathy/empathy-utils.h>
+#include <libempathy/empathy-conf.h>
 
 #include "empathy-chat-view.h"
 #include "empathy-preferences.h"
+#include "empathy-theme.h"
+#include "empathy-theme-boxes.h"
+#include "empathy-theme-irc.h"
 #include "empathy-theme-manager.h"
 
 #define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_THEME_MANAGER, EmpathyThemeManagerPriv))
 
 typedef struct {
-	gchar    *name;
-	guint     name_notify_id;
-	guint     room_notify_id;
+	gchar       *name;
+	guint        name_notify_id;
+	guint        room_notify_id;
+
+	gboolean     show_avatars;
+	guint        show_avatars_notify_id;
 
-	gboolean  show_avatars;
-	guint     show_avatars_notify_id;
+	EmpathyTheme *clean_theme;
+	EmpathyTheme *simple_theme;
+	EmpathyTheme *blue_theme;
+	EmpathyTheme *classic_theme;
 
-	gboolean  irc_style;
+	gboolean     irc_style;
 } EmpathyThemeManagerPriv;
 
 static void        theme_manager_finalize                 (GObject            *object);
@@ -57,21 +63,6 @@ static void        theme_manager_notify_room_cb           (EmpathyConf         *
 static void        theme_manager_notify_show_avatars_cb   (EmpathyConf         *conf,
 							   const gchar        *key,
 							   gpointer            user_data);
-static void        theme_manager_ensure_tag_by_name       (GtkTextBuffer      *buffer,
-							   const gchar        *name);
-static gboolean    theme_manager_ensure_theme_exists      (const gchar        *name);
-static GtkTextTag *theme_manager_init_tag_by_name         (GtkTextTagTable    *table,
-							   const gchar        *name);
-static void        theme_manager_add_tag                  (GtkTextTagTable    *table,
-							   GtkTextTag         *tag);
-static void        theme_manager_fixup_tag_table          (EmpathyThemeManager *theme_manager,
-							   EmpathyChatView     *view);
-static void        theme_manager_apply_theme_classic      (EmpathyThemeManager *manager,
-							   EmpathyChatView     *view);
-static void        theme_manager_apply_theme_clean        (EmpathyThemeManager *manager,
-							   EmpathyChatView     *view);
-static void        theme_manager_apply_theme_blue         (EmpathyThemeManager *manager,
-							   EmpathyChatView     *view);
 static void        theme_manager_apply_theme              (EmpathyThemeManager *manager,
 							   EmpathyChatView     *view,
 							   const gchar        *name);
@@ -146,6 +137,11 @@ empathy_theme_manager_init (EmpathyThemeManager *manager)
 	empathy_conf_get_bool (empathy_conf_get (),
 			      EMPATHY_PREFS_UI_SHOW_AVATARS,
 			      &priv->show_avatars);
+
+	priv->clean_theme   = empathy_theme_boxes_new ("clean");
+	priv->simple_theme  = empathy_theme_boxes_new ("simple");
+	priv->blue_theme    = empathy_theme_boxes_new ("blue");
+	priv->classic_theme = g_object_new (EMPATHY_TYPE_THEME_IRC, NULL);
 }
 
 static void
@@ -161,6 +157,11 @@ theme_manager_finalize (GObject *object)
 
 	g_free (priv->name);
 
+	g_object_unref (priv->clean_theme);
+	g_object_unref (priv->simple_theme);
+	g_object_unref (priv->blue_theme);
+	g_object_unref (priv->classic_theme);
+
 	G_OBJECT_CLASS (empathy_theme_manager_parent_class)->finalize (object);
 }
 
@@ -217,23 +218,6 @@ theme_manager_notify_show_avatars_cb (EmpathyConf  *conf,
 	}
 }
 
-static void
-theme_manager_ensure_tag_by_name (GtkTextBuffer *buffer,
-				  const gchar   *name)
-{
-	GtkTextTagTable *table;
-	GtkTextTag      *tag;
-
-	table = gtk_text_buffer_get_tag_table (buffer);
-	tag = gtk_text_tag_table_lookup (table, name);
-
-	if (!tag) {
-		gtk_text_buffer_create_tag (buffer,
-					    name,
-					    NULL);
-	}
-}
-
 static gboolean
 theme_manager_ensure_theme_exists (const gchar *name)
 {
@@ -252,690 +236,36 @@ theme_manager_ensure_theme_exists (const gchar *name)
 	return FALSE;
 }
 
-static GtkTextTag *
-theme_manager_init_tag_by_name (GtkTextTagTable *table,
-				const gchar     *name)
-{
-	GtkTextTag *tag;
-
-	tag = gtk_text_tag_table_lookup (table, name);
-
-	if (!tag) {
-		return gtk_text_tag_new (name);
-	}
-
-	/* Clear the old values so that we don't affect the new theme. */
-	g_object_set (tag,
-		      "background-set", FALSE,
-		      "foreground-set", FALSE,
-		      "invisible-set", FALSE,
-		      "justification-set", FALSE,
-		      "paragraph-background-set", FALSE,
-		      "pixels-above-lines-set", FALSE,
-		      "pixels-below-lines-set", FALSE,
-		      "rise-set", FALSE,
-		      "scale-set", FALSE,
-		      "size-set", FALSE,
-		      "style-set", FALSE,
-		      "weight-set", FALSE,
-		      NULL);
-
-	return tag;
-}
-
-static void
-theme_manager_add_tag (GtkTextTagTable *table,
-		       GtkTextTag      *tag)
-{
-	gchar      *name;
-	GtkTextTag *check_tag;
-
-	g_object_get (tag, "name", &name, NULL);
-	check_tag = gtk_text_tag_table_lookup (table, name);
-	g_free (name);
-	if (check_tag) {
-		return;
-	}
-
-	gtk_text_tag_table_add (table, tag);
-
-	g_object_unref (tag);
-}
-
-static void
-theme_manager_fixup_tag_table (EmpathyThemeManager *theme_manager,
-			       EmpathyChatView     *view)
-{
-	GtkTextBuffer *buffer;
-
-	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-
-	/* "Fancy" style tags. */
-	theme_manager_ensure_tag_by_name (buffer, "fancy-header-self");
-	theme_manager_ensure_tag_by_name (buffer, "fancy-header-self-avatar");
-	theme_manager_ensure_tag_by_name (buffer, "fancy-avatar-self");
-	theme_manager_ensure_tag_by_name (buffer, "fancy-line-top-self");
-	theme_manager_ensure_tag_by_name (buffer, "fancy-line-bottom-self");
-	theme_manager_ensure_tag_by_name (buffer, "fancy-body-self");
-	theme_manager_ensure_tag_by_name (buffer, "fancy-action-self");
-	theme_manager_ensure_tag_by_name (buffer, "fancy-highlight-self");
-
-	theme_manager_ensure_tag_by_name (buffer, "fancy-header-other");
-	theme_manager_ensure_tag_by_name (buffer, "fancy-header-other-avatar");
-	theme_manager_ensure_tag_by_name (buffer, "fancy-avatar-other");
-	theme_manager_ensure_tag_by_name (buffer, "fancy-line-top-other");
-	theme_manager_ensure_tag_by_name (buffer, "fancy-line-bottom-other");
-	theme_manager_ensure_tag_by_name (buffer, "fancy-body-other");
-	theme_manager_ensure_tag_by_name (buffer, "fancy-action-other");
-	theme_manager_ensure_tag_by_name (buffer, "fancy-highlight-other");
-
-	theme_manager_ensure_tag_by_name (buffer, "fancy-spacing");
-	theme_manager_ensure_tag_by_name (buffer, "fancy-time");
-	theme_manager_ensure_tag_by_name (buffer, "fancy-event");
-	theme_manager_ensure_tag_by_name (buffer, "fancy-invite");
-	theme_manager_ensure_tag_by_name (buffer, "fancy-link");
-
-	/* IRC style tags. */
-	theme_manager_ensure_tag_by_name (buffer, "irc-nick-self");
-	theme_manager_ensure_tag_by_name (buffer, "irc-body-self");
-	theme_manager_ensure_tag_by_name (buffer, "irc-action-self");
-
-	theme_manager_ensure_tag_by_name (buffer, "irc-nick-other");
-	theme_manager_ensure_tag_by_name (buffer, "irc-body-other");
-	theme_manager_ensure_tag_by_name (buffer, "irc-action-other");
-
-	theme_manager_ensure_tag_by_name (buffer, "irc-nick-highlight");
-	theme_manager_ensure_tag_by_name (buffer, "irc-spacing");
-	theme_manager_ensure_tag_by_name (buffer, "irc-time");
-	theme_manager_ensure_tag_by_name (buffer, "irc-event");
-	theme_manager_ensure_tag_by_name (buffer, "irc-invite");
-	theme_manager_ensure_tag_by_name (buffer, "irc-link");
-}
-
-static void
-theme_manager_apply_theme_classic (EmpathyThemeManager *manager,
-				   EmpathyChatView     *view)
-{
-	EmpathyThemeManagerPriv *priv;
-	GtkTextBuffer          *buffer;
-	GtkTextTagTable        *table;
-	GtkTextTag             *tag;
-
-	priv = GET_PRIV (manager);
-
-	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-	table = gtk_text_buffer_get_tag_table (buffer);
-
-	priv->irc_style = TRUE;
-
-	tag = theme_manager_init_tag_by_name (table, "irc-spacing");
-	g_object_set (tag,
-		      "size", 2000,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "irc-nick-self");
-	g_object_set (tag,
-		      "foreground", "sea green",
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "irc-body-self");
-	g_object_set (tag,
-		      /* To get the default theme color: */
-		      "foreground-set", FALSE,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "irc-action-self");
-	g_object_set (tag,
-		      "foreground", "brown4",
-		      "style", PANGO_STYLE_ITALIC,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "irc-nick-highlight");
-	g_object_set (tag,
-		      "foreground", "indian red",
-		      "weight", PANGO_WEIGHT_BOLD,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "irc-nick-other");
-	g_object_set (tag,
-		      "foreground", "skyblue4",
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "irc-body-other");
-	g_object_set (tag,
-		      /* To get the default theme color: */
-		      "foreground-set", FALSE,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "irc-action-other");
-	g_object_set (tag,
-		      "foreground", "brown4",
-		      "style", PANGO_STYLE_ITALIC,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "irc-time");
-	g_object_set (tag,
-		      "foreground", "darkgrey",
-		      "justification", GTK_JUSTIFY_CENTER,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "irc-event");
-	g_object_set (tag,
-		      "foreground", "PeachPuff4",
-		      "justification", GTK_JUSTIFY_LEFT,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "irc-invite");
-	g_object_set (tag,
-		      "foreground", "sienna",
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "irc-link");
-	g_object_set (tag,
-		      "foreground", "steelblue",
-		      "underline", PANGO_UNDERLINE_SINGLE,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-}
-
-static void
-theme_manager_apply_theme_simple (EmpathyThemeManager *manager,
-				  EmpathyChatView     *view)
-{
-	EmpathyThemeManagerPriv *priv;
-	GtkTextBuffer          *buffer;
-	GtkTextTagTable        *table;
-	GtkTextTag             *tag;
-	GtkWidget              *widget;
-	GtkStyle               *style;
-
-	priv = GET_PRIV (manager);
-
-	widget = gtk_entry_new ();
-	style = gtk_widget_get_style (widget);
-	gtk_widget_destroy (widget);
-
-	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-	table = gtk_text_buffer_get_tag_table (buffer);
-
-	priv->irc_style = FALSE;
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-spacing");
-	g_object_set (tag,
-		      "size", 3000,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-header-self");
-	g_object_set (tag,
-		      "weight", PANGO_WEIGHT_BOLD,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-header-self-avatar");
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-avatar-self");
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-line-top-self");
-	g_object_set (tag,
-		      "size", 6 * PANGO_SCALE,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-line-bottom-self");
-	g_object_set (tag,
-		      "size", 1,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-body-self");
-	g_object_set (tag,
-		      "pixels-above-lines", 2,
-		      "pixels-below-lines", 2,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-action-self");
-	g_object_set (tag,
-		      "foreground-gdk", &style->base[GTK_STATE_SELECTED],
-		      "style", PANGO_STYLE_ITALIC,
-		      "pixels-above-lines", 2,
-		      "pixels-below-lines", 2,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-highlight-self");
-	g_object_set (tag,
-		      "weight", PANGO_WEIGHT_BOLD,
-		      "pixels-above-lines", 2,
-		      "pixels-below-lines", 2,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-header-other");
-	g_object_set (tag,
-		      "weight", PANGO_WEIGHT_BOLD,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-header-other-avatar");
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-avatar-other");
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-line-top-other");
-	g_object_set (tag,
-		      "size", 6 * PANGO_SCALE,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-line-bottom-other");
-	g_object_set (tag,
-		      "size", 1,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-body-other");
-	g_object_set (tag,
-		      "pixels-above-lines", 2,
-		      "pixels-below-lines", 2,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-action-other");
-	g_object_set (tag,
-		      "foreground-gdk", &style->base[GTK_STATE_SELECTED],
-		      "style", PANGO_STYLE_ITALIC,
-		      "pixels-above-lines", 2,
-		      "pixels-below-lines", 2,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-highlight-other");
-	g_object_set (tag,
-		      "weight", PANGO_WEIGHT_BOLD,
-		      "pixels-above-lines", 2,
-		      "pixels-below-lines", 2,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-time");
-	g_object_set (tag,
-		      "foreground", "darkgrey",
-		      "justification", GTK_JUSTIFY_CENTER,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-event");
-	g_object_set (tag,
-		      "foreground", "darkgrey",
-		      "justification", GTK_JUSTIFY_LEFT,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-invite");
-	g_object_set (tag,
-		      "foreground", "darkgrey",
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-link");
-	g_object_set (tag,
-		      "foreground-gdk", &style->base[GTK_STATE_SELECTED],
-		      "underline", PANGO_UNDERLINE_SINGLE,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-}
-
-static void
-theme_manager_apply_theme_clean (EmpathyThemeManager *manager,
-				 EmpathyChatView     *view)
-{
-	EmpathyThemeManagerPriv *priv;
-	GtkTextBuffer          *buffer;
-	GtkTextTagTable        *table;
-	GtkTextTag             *tag;
-
-	priv = GET_PRIV (manager);
-
-	/* Inherit the simple theme. */
-	theme_manager_apply_theme_simple (manager, view);
-
-#define ELEGANT_HEAD "#efefdf"
-#define ELEGANT_LINE "#e3e3d3"
-
-	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-	table = gtk_text_buffer_get_tag_table (buffer);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-spacing");
-	g_object_set (tag,
-		      "size", PANGO_SCALE * 10,
-		      NULL);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-header-self");
-	g_object_set (tag,
-		      "foreground", "black",
-		      "weight", PANGO_WEIGHT_BOLD,
-		      "paragraph-background", ELEGANT_HEAD,
-		      "pixels-above-lines", 2,
-		      "pixels-below-lines", 2,
-		      NULL);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-avatar-self");
-	g_object_set (tag,
-		      "paragraph-background", ELEGANT_HEAD,
-		      "pixels-above-lines", 2,
-		      "pixels-below-lines", 2,
-		      NULL);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-line-top-self");
-	g_object_set (tag,
-		      "size", 1 * PANGO_SCALE,
-		      "paragraph-background", ELEGANT_LINE,
-		      NULL);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-line-bottom-self");
-	g_object_set (tag,
-		      "size", 1 * PANGO_SCALE,
-		      NULL);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-action-self");
-	g_object_set (tag,
-		      "foreground", "brown4",
-		      "style", PANGO_STYLE_ITALIC,
-		      NULL);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-highlight-self");
-	g_object_set (tag,
-		      "foreground", "black",
-		      "weight", PANGO_WEIGHT_BOLD,
-		      NULL);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-header-other");
-	g_object_set (tag,
-		      "foreground", "black",
-		      "weight", PANGO_WEIGHT_BOLD,
-		      "paragraph-background", ELEGANT_HEAD,
-		      "pixels-above-lines", 2,
-		      "pixels-below-lines", 2,
-		      NULL);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-avatar-other");
-	g_object_set (tag,
-		      "paragraph-background", ELEGANT_HEAD,
-		      "pixels-above-lines", 2,
-		      "pixels-below-lines", 2,
-		      NULL);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-line-top-other");
-	g_object_set (tag,
-		      "size", 1 * PANGO_SCALE,
-		      "paragraph-background", ELEGANT_LINE,
-		      NULL);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-line-bottom-other");
-	g_object_set (tag,
-		      "size", 1 * PANGO_SCALE,
-		      NULL);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-action-other");
-	g_object_set (tag,
-		      "foreground", "brown4",
-		      "style", PANGO_STYLE_ITALIC,
-		      NULL);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-time");
-	g_object_set (tag,
-		      "foreground", "darkgrey",
-		      "justification", GTK_JUSTIFY_CENTER,
-		      NULL);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-event");
-	g_object_set (tag,
-		      "foreground", "darkgrey",
-		      "justification", GTK_JUSTIFY_LEFT,
-		      NULL);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-invite");
-	g_object_set (tag,
-		      "foreground", "sienna",
-		      NULL);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-link");
-	g_object_set (tag,
-		      "foreground", "#49789e",
-		      "underline", PANGO_UNDERLINE_SINGLE,
-		      NULL);
-}
-
-static void
-theme_manager_apply_theme_blue (EmpathyThemeManager *manager,
-				EmpathyChatView     *view)
-{
-	EmpathyThemeManagerPriv *priv;
-	GtkTextBuffer          *buffer;
-	GtkTextTagTable        *table;
-	GtkTextTag             *tag;
-
-	priv = GET_PRIV (manager);
-
-	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-	table = gtk_text_buffer_get_tag_table (buffer);
-
-	priv->irc_style = FALSE;
-
-#define BLUE_BODY_SELF "#dcdcdc"
-#define BLUE_HEAD_SELF "#b9b9b9"
-#define BLUE_LINE_SELF "#aeaeae"
-
-#define BLUE_BODY_OTHER "#adbdc8"
-#define BLUE_HEAD_OTHER "#88a2b4"
-#define BLUE_LINE_OTHER "#7f96a4"
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-spacing");
-	g_object_set (tag,
-		      "size", 3000,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-header-self");
-	g_object_set (tag,
-		      "foreground", "black",
-		      "paragraph-background", BLUE_HEAD_SELF,
-		      "weight", PANGO_WEIGHT_BOLD,
-		      "pixels-above-lines", 2,
-		      "pixels-below-lines", 2,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-header-self-avatar");
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-avatar-self");
-	g_object_set (tag,
-		      "paragraph-background", BLUE_HEAD_SELF,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-line-top-self");
-	g_object_set (tag,
-		      "size", 1,
-		      "paragraph-background", BLUE_LINE_SELF,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-line-bottom-self");
-	g_object_set (tag,
-		      "size", 1,
-		      "paragraph-background", BLUE_LINE_SELF,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-body-self");
-	g_object_set (tag,
-		      "foreground", "black",
-		      "paragraph-background", BLUE_BODY_SELF,
-		      "pixels-above-lines", 4,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-action-self");
-	g_object_set (tag,
-		      "foreground", "brown4",
-		      "style", PANGO_STYLE_ITALIC,
-		      "paragraph-background", BLUE_BODY_SELF,
-		      "pixels-above-lines", 4,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-highlight-self");
-	g_object_set (tag,
-		      "foreground", "black",
-		      "weight", PANGO_WEIGHT_BOLD,
-		      "paragraph-background", BLUE_BODY_SELF,
-		      "pixels-above-lines", 4,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-header-other");
-	g_object_set (tag,
-		      "foreground", "black",
-		      "paragraph-background", BLUE_HEAD_OTHER,
-		      "weight", PANGO_WEIGHT_BOLD,
-		      "pixels-above-lines", 2,
-		      "pixels-below-lines", 2,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-header-other-avatar");
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-avatar-other");
-	g_object_set (tag,
-		      "paragraph-background", BLUE_HEAD_OTHER,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-line-top-other");
-	g_object_set (tag,
-		      "size", 1,
-		      "paragraph-background", BLUE_LINE_OTHER,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-line-bottom-other");
-	g_object_set (tag,
-		      "size", 1,
-		      "paragraph-background", BLUE_LINE_OTHER,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-body-other");
-	g_object_set (tag,
-		      "foreground", "black",
-		      "paragraph-background", BLUE_BODY_OTHER,
-		      "pixels-above-lines", 4,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-action-other");
-	g_object_set (tag,
-		      "foreground", "brown4",
-		      "style", PANGO_STYLE_ITALIC,
-		      "paragraph-background", BLUE_BODY_OTHER,
-		      "pixels-above-lines", 4,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-highlight-other");
-	g_object_set (tag,
-		      "foreground", "black",
-		      "weight", PANGO_WEIGHT_BOLD,
-		      "paragraph-background", BLUE_BODY_OTHER,
-		      "pixels-above-lines", 4,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-time");
-	g_object_set (tag,
-		      "foreground", "darkgrey",
-		      "justification", GTK_JUSTIFY_CENTER,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-event");
-	g_object_set (tag,
-		      "foreground", BLUE_LINE_OTHER,
-		      "justification", GTK_JUSTIFY_LEFT,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-invite");
-	g_object_set (tag,
-		      "foreground", "sienna",
-		      NULL);
-	theme_manager_add_tag (table, tag);
-
-	tag = theme_manager_init_tag_by_name (table, "fancy-link");
-	g_object_set (tag,
-		      "foreground", "#49789e",
-		      "underline", PANGO_UNDERLINE_SINGLE,
-		      NULL);
-	theme_manager_add_tag (table, tag);
-}
-
 static void
 theme_manager_apply_theme (EmpathyThemeManager *manager,
 			   EmpathyChatView     *view,
 			   const gchar        *name)
 {
 	EmpathyThemeManagerPriv *priv;
-	gint                    margin;
+	EmpathyTheme            *theme;
 
 	priv = GET_PRIV (manager);
 
 	/* Make sure all tags are present. Note: not useful now but when we have
 	 * user defined theme it will be.
 	 */
-	theme_manager_fixup_tag_table (manager, view);
-
 	if (theme_manager_ensure_theme_exists (name)) {
 		if (strcmp (name, "clean") == 0) {
-			theme_manager_apply_theme_clean (manager, view);
-			margin = 3;
+			theme = priv->clean_theme;
 		}
 		else if (strcmp (name, "simple") == 0) {
-			theme_manager_apply_theme_simple (manager, view);
-			margin = 3;
+			theme = priv->simple_theme;
 		}
 		else if (strcmp (name, "blue") == 0) {
-			theme_manager_apply_theme_blue (manager, view);
-			margin = 0;
+			theme = priv->blue_theme;
 		} else {
-			theme_manager_apply_theme_classic (manager, view);
-			margin = 3;
+			theme = priv->classic_theme;
 		}
 	} else {
-		theme_manager_apply_theme_classic (manager, view);
-		margin = 3;
+		theme = priv->classic_theme;
 	}
 
-	empathy_chat_view_set_margin (view, margin);
-	empathy_chat_view_set_irc_style (view, priv->irc_style);
+	empathy_chat_view_set_theme (view, theme);
 }
 
 EmpathyThemeManager *
@@ -979,67 +309,3 @@ empathy_theme_manager_apply_saved (EmpathyThemeManager *manager,
 	theme_manager_apply_theme (manager, view, priv->name);
 }
 
-/* FIXME: A bit ugly. We should probably change the scheme so that instead of
- * the manager signalling, views are registered and applied to automatically.
- */
-void
-empathy_theme_manager_update_show_avatars (EmpathyThemeManager *manager,
-					  EmpathyChatView     *view,
-					  gboolean            show)
-{
-	EmpathyThemeManagerPriv *priv;
-	GtkTextBuffer          *buffer;
-	GtkTextTagTable        *table;
-	GtkTextTag             *tag_text_self, *tag_text_other;
-	GtkTextTag             *tag_image_self, *tag_image_other;
-
-	priv = GET_PRIV (manager);
-
-	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-	table = gtk_text_buffer_get_tag_table (buffer);
-
-	tag_text_self = gtk_text_tag_table_lookup (table, "fancy-header-self-avatar");
-	tag_text_other = gtk_text_tag_table_lookup (table, "fancy-header-other-avatar");
-
-	tag_image_self = gtk_text_tag_table_lookup (table, "fancy-avatar-self");
-	tag_image_other = gtk_text_tag_table_lookup (table, "fancy-avatar-other");
-
-	if (!show) {
-		g_object_set (tag_text_self,
-			      "rise", 0,
-			      NULL);
-		g_object_set (tag_text_other,
-			      "rise", 0,
-			      NULL);
-		g_object_set (tag_image_self,
-			      "invisible", TRUE,
-			      NULL);
-		g_object_set (tag_image_other,
-			      "invisible", TRUE,
-			      NULL);
-	} else {
-		GtkTextAttributes *attrs;
-		gint               size;
-		gint               rise;
-
-		attrs = gtk_text_view_get_default_attributes (GTK_TEXT_VIEW (view));
-		size = pango_font_description_get_size (attrs->font);
-		rise = MAX (0, (32 * PANGO_SCALE - size) / 2.0);
-
-		g_object_set (tag_text_self,
-			      "rise", rise,
-			      NULL);
-		g_object_set (tag_text_other,
-			      "rise", rise,
-			      NULL);
-		g_object_set (tag_image_self,
-			      "invisible", FALSE,
-			      NULL);
-		g_object_set (tag_image_other,
-			      "invisible", FALSE,
-			      NULL);
-
-		gtk_text_attributes_unref (attrs);
-	}
-}
-