1 files changed, 134 insertions, 615 deletions

diff --git a/libempathy-gtk/empathy-theme-boxes.c b/libempathy-gtk/empathy-theme-boxes.c
index f18736099..458543fa4 100644
--- a/libempathy-gtk/empathy-theme-boxes.c
+++ b/libempathy-gtk/empathy-theme-boxes.c
@@ -1,6 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2007 Imendio AB
+ * Copyright (C) 2008 Collabora Ltd.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -16,6 +17,8 @@
  * 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: Xavier Claessens <xclaesse@gmail.com>
  */
 
 #include <config.h>
@@ -26,9 +29,11 @@
 #include <gtk/gtk.h>
 
 #include <telepathy-glib/util.h>
+
 #include <libempathy/empathy-utils.h>
-#include "empathy-ui-utils.h"
 #include "empathy-theme-boxes.h"
+#include "empathy-ui-utils.h"
+#include "empathy-conf.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include <libempathy/empathy-debug.h>
@@ -38,485 +43,25 @@
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyThemeBoxes)
 typedef struct {
-	gchar *header_foreground;
-	gchar *header_background;
-	gchar *header_line_background;
-	gchar *text_foreground;
-	gchar *text_background;
-	gchar *action_foreground;
-	gchar *highlight_foreground;
-	gchar *time_foreground;
-	gchar *event_foreground;
-	gchar *invite_foreground;
-	gchar *link_foreground;
+	gboolean show_avatars;
+	guint    notify_show_avatars_id;
 } EmpathyThemeBoxesPriv;
 
-static void     theme_boxes_finalize          (GObject            *object);
-static void     theme_boxes_get_property      (GObject            *object,
-					       guint               param_id,
-					       GValue             *value,
-					       GParamSpec         *pspec);
-static void     theme_boxes_set_property      (GObject            *object,
-					       guint               param_id,
-					       const GValue       *value,
-					       GParamSpec         *pspec);
-static void     theme_boxes_define_theme_tags (EmpathyTheme        *theme,
-					       EmpathyChatView     *view);
-static void     theme_boxes_update_view       (EmpathyTheme        *theme,
-					       EmpathyChatView     *view);
-static void     theme_boxes_append_message    (EmpathyTheme        *theme,
-					       EmpathyChatView     *view,
-					       EmpathyMessage      *message);
-static void     theme_boxes_append_event      (EmpathyTheme        *theme,
-					       EmpathyChatView     *view,
-					       const gchar        *str);
-static void     theme_boxes_append_timestamp  (EmpathyTheme        *theme,
-					       EmpathyChatView     *view,
-					       EmpathyMessage      *message,
-					       gboolean            show_date,
-					       gboolean            show_time);
-static void     theme_boxes_append_spacing    (EmpathyTheme        *theme,
-					       EmpathyChatView     *view);
-
-enum {
-	PROP_0,
-	PROP_HEADER_FOREGROUND,
-	PROP_HEADER_BACKGROUND,
-	PROP_HEADER_LINE_BACKGROUND,
-	PROP_TEXT_FOREGROUND,
-	PROP_TEXT_BACKGROUND,
-	PROP_ACTION_FOREGROUND,
-	PROP_HIGHLIGHT_FOREGROUND,
-	PROP_TIME_FOREGROUND,
-	PROP_EVENT_FOREGROUND,
-	PROP_INVITE_FOREGROUND,
-	PROP_LINK_FOREGROUND
-};
-
-enum {
-	PROP_FLOP,
-	PROP_MY_PROP
-};
-
-G_DEFINE_TYPE (EmpathyThemeBoxes, empathy_theme_boxes, EMPATHY_TYPE_THEME);
-
-static void
-empathy_theme_boxes_class_init (EmpathyThemeBoxesClass *class)
-{
-	GObjectClass     *object_class;
-	EmpathyThemeClass *theme_class;
-
-	object_class = G_OBJECT_CLASS (class);
-	theme_class  = EMPATHY_THEME_CLASS (class);
-
-	object_class->finalize       = theme_boxes_finalize;
-	object_class->get_property   = theme_boxes_get_property;
-	object_class->set_property   = theme_boxes_set_property;
-
-	theme_class->update_view      = theme_boxes_update_view;
-	theme_class->append_message   = theme_boxes_append_message;
-	theme_class->append_event     = theme_boxes_append_event;
-	theme_class->append_timestamp = theme_boxes_append_timestamp;
-	theme_class->append_spacing   = theme_boxes_append_spacing;
-
-	g_object_class_install_property (object_class,
-					 PROP_HEADER_FOREGROUND,
-					 g_param_spec_string ("header-foreground",
-							      "",
-							      "",
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class,
-					 PROP_HEADER_BACKGROUND,
-					 g_param_spec_string ("header-background",
-							      "",
-							      "",
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class,
-					 PROP_HEADER_LINE_BACKGROUND,
-					 g_param_spec_string ("header-line-background",
-							      "",
-							      "",
-							      NULL,
-							      G_PARAM_READWRITE));
-
-
-	g_object_class_install_property (object_class,
-					 PROP_TEXT_FOREGROUND,
-					 g_param_spec_string ("text-foreground",
-							      "",
-							      "",
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class,
-					 PROP_TEXT_BACKGROUND,
-					 g_param_spec_string ("text-background",
-							      "",
-							      "",
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class,
-					 PROP_ACTION_FOREGROUND,
-					 g_param_spec_string ("action-foreground",
-							      "",
-							      "",
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class,
-					 PROP_HIGHLIGHT_FOREGROUND,
-					 g_param_spec_string ("highlight-foreground",
-							      "",
-							      "",
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class,
-					 PROP_TIME_FOREGROUND,
-					 g_param_spec_string ("time-foreground",
-							      "",
-							      "",
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class,
-					 PROP_EVENT_FOREGROUND,
-					 g_param_spec_string ("event-foreground",
-							      "",
-							      "",
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class,
-					 PROP_INVITE_FOREGROUND,
-					 g_param_spec_string ("invite-foreground",
-							      "",
-							      "",
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class,
-					 PROP_LINK_FOREGROUND,
-					 g_param_spec_string ("link-foreground",
-							      "",
-							      "",
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_type_class_add_private (object_class, sizeof (EmpathyThemeBoxesPriv));
-}
-
-static void
-empathy_theme_boxes_init (EmpathyThemeBoxes *theme)
-{
-	EmpathyThemeBoxesPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (theme,
-		EMPATHY_TYPE_THEME_BOXES, EmpathyThemeBoxesPriv);
-
-	theme->priv = priv;
-}
-
-static void
-theme_boxes_finalize (GObject *object)
-{
-	EmpathyThemeBoxesPriv *priv;
-
-	priv = GET_PRIV (object);
-
-	g_free (priv->header_foreground);
-	g_free (priv->header_background);
-	g_free (priv->header_line_background);
-	g_free (priv->text_foreground);
-	g_free (priv->text_background);
-	g_free (priv->action_foreground);
-	g_free (priv->highlight_foreground);
-	g_free (priv->time_foreground);
-	g_free (priv->event_foreground);
-	g_free (priv->invite_foreground);
-	g_free (priv->link_foreground);
-	
-	(G_OBJECT_CLASS (empathy_theme_boxes_parent_class)->finalize) (object);
-}
+G_DEFINE_TYPE (EmpathyThemeBoxes, empathy_theme_boxes, EMPATHY_TYPE_CHAT_TEXT_VIEW);
 
 static void
-theme_boxes_get_property (GObject    *object,
-			  guint       param_id,
-			  GValue     *value,
-			  GParamSpec *pspec)
-{
-	EmpathyThemeBoxesPriv *priv;
-
-	priv = GET_PRIV (object);
-
-	switch (param_id) {
-	case PROP_HEADER_FOREGROUND:
-		g_value_set_string (value, priv->header_foreground);
-		break;
-	case PROP_HEADER_BACKGROUND:
-		g_value_set_string (value, priv->header_background);
-		break;
-	case PROP_HEADER_LINE_BACKGROUND:
-		g_value_set_string (value, priv->header_line_background);
-		break;
-	case PROP_TEXT_FOREGROUND:
-		g_value_set_string (value, priv->text_foreground);
-		break;
-	case PROP_TEXT_BACKGROUND:
-		g_value_set_string (value, priv->text_background);
-		break;
-	case PROP_ACTION_FOREGROUND:
-		g_value_set_string (value, priv->action_foreground);
-		break;
-	case PROP_HIGHLIGHT_FOREGROUND:
-		g_value_set_string (value, priv->highlight_foreground);
-		break;
-	case PROP_TIME_FOREGROUND:
-		g_value_set_string (value, priv->time_foreground);
-		break;
-	case PROP_EVENT_FOREGROUND:
-		g_value_set_string (value, priv->event_foreground);
-		break;
-	case PROP_INVITE_FOREGROUND:
-		g_value_set_string (value, priv->invite_foreground);
-		break;
-	case PROP_LINK_FOREGROUND:
-		g_value_set_string (value, priv->link_foreground);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-		break;
-	}
-}
-static void
-theme_boxes_set_property (GObject      *object,
-			  guint         param_id,
-			  const GValue *value,
-			  GParamSpec   *pspec)
+theme_boxes_create_tags (EmpathyThemeBoxes *theme)
 {
-	EmpathyThemeBoxesPriv *priv;
-
-	priv = GET_PRIV (object);
-
-	switch (param_id) {
-	case PROP_HEADER_FOREGROUND:
-		g_free (priv->header_foreground);
-		priv->header_foreground = g_value_dup_string (value);
-		g_object_notify (object, "header-foreground");
-		break;
-	case PROP_HEADER_BACKGROUND:
-		g_free (priv->header_background);
-		priv->header_background = g_value_dup_string (value);
-		g_object_notify (object, "header-background");
-		break;
-	case PROP_HEADER_LINE_BACKGROUND:
-		g_free (priv->header_line_background);
-		priv->header_line_background = g_value_dup_string (value);
-		g_object_notify (object, "header-line_background");
-		break;
-	case PROP_TEXT_FOREGROUND:
-		g_free (priv->text_foreground);
-		priv->text_foreground = g_value_dup_string (value);
-		g_object_notify (object, "text-foreground");
-		break;
-	case PROP_TEXT_BACKGROUND:
-		g_free (priv->text_background);
-		priv->text_background = g_value_dup_string (value);
-		g_object_notify (object, "text-background");
-		break;
-	case PROP_ACTION_FOREGROUND:
-		g_free (priv->action_foreground);
-		priv->action_foreground = g_value_dup_string (value);
-		g_object_notify (object, "action-foreground");
-		break;
-	case PROP_HIGHLIGHT_FOREGROUND:
-		g_free (priv->highlight_foreground);
-		priv->highlight_foreground = g_value_dup_string (value);
-		g_object_notify (object, "highlight-foreground");
-		break;
-	case PROP_TIME_FOREGROUND:
-		g_free (priv->time_foreground);
-		priv->time_foreground = g_value_dup_string (value);
-		g_object_notify (object, "time-foreground");
-		break;
-	case PROP_EVENT_FOREGROUND:
-		g_free (priv->event_foreground);
-		priv->event_foreground = g_value_dup_string (value);
-		g_object_notify (object, "event-foreground");
-		break;
-	case PROP_INVITE_FOREGROUND:
-		g_free (priv->invite_foreground);
-		priv->invite_foreground = g_value_dup_string (value);
-		g_object_notify (object, "invite-foreground");
-		break;
-	case PROP_LINK_FOREGROUND:
-		g_free (priv->link_foreground);
-		priv->link_foreground = g_value_dup_string (value);
-		g_object_notify (object, "link-foreground");
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-		break;
-	}
-}
-
-static void
-theme_boxes_define_theme_tags (EmpathyTheme *theme, EmpathyChatView *view)
-{
-	EmpathyThemeBoxesPriv *priv;
-	GtkTextBuffer         *buffer;
-	GtkTextTag            *tag;
-
-	priv = GET_PRIV (theme);
-
-	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-
-	empathy_text_buffer_tag_set (buffer, "fancy-spacing",
-				     "size", 3000,
-				     "pixels-above-lines", 8,
-				     NULL);
-
-	tag = empathy_text_buffer_tag_set (buffer, "fancy-header",
-					   "weight", PANGO_WEIGHT_BOLD,
-					   "pixels-above-lines", HEADER_PADDING,
-					   "pixels-below-lines", HEADER_PADDING,
-					   NULL);
-	if (priv->header_foreground) {
-		g_object_set (tag,
-			      "foreground", priv->header_foreground,
-			      "paragraph-background", priv->header_background,
-			      NULL);
-	}
-
-	tag = empathy_text_buffer_tag_set (buffer, "fancy-header-line",
-					   "size", 1,
-					   NULL);
-	if (priv->header_line_background) {
-		g_object_set (tag,
-			      "paragraph-background", priv->header_line_background,
-			      NULL);
-	}
-
-	tag = empathy_text_buffer_tag_set (buffer, "fancy-body",
-					   "pixels-above-lines", 4,
-					   NULL);
-	if (priv->text_background) {
-		g_object_set (tag,
-			      "paragraph-background", priv->text_background,
-			      NULL);
-	}
-
-	if (priv->text_foreground) {
-		g_object_set (tag,
-			      "foreground", priv->text_foreground,
-			      NULL);
-	}
-
-	tag = empathy_text_buffer_tag_set (buffer, "fancy-action",
-					   "style", PANGO_STYLE_ITALIC,
-					   "pixels-above-lines", 4,
-					   NULL);
-
-	if (priv->text_background) {
-		g_object_set (tag,
-			      "paragraph-background", priv->text_background,
-			      NULL);
-	}
-
-	if (priv->action_foreground) {
-		g_object_set (tag,
-			      "foreground", priv->action_foreground,
-			      NULL);
-	}
-
-	tag = empathy_text_buffer_tag_set (buffer, "fancy-highlight",
-					   "weight", PANGO_WEIGHT_BOLD,
-					   "pixels-above-lines", 4,
-					   NULL);
-	if (priv->text_background) {
-		g_object_set (tag,
-			      "paragraph-background", priv->text_background,
-			      NULL);
-	}
-
-
-	if (priv->highlight_foreground) {
-		g_object_set (tag,
-			      "foreground", priv->highlight_foreground,
-			      NULL);
-	}
-
-	tag = empathy_text_buffer_tag_set (buffer, "fancy-time",
-					   "justification", GTK_JUSTIFY_CENTER,
-					   NULL);
-	if (priv->time_foreground) {
-		g_object_set (tag,
-			      "foreground", priv->time_foreground,
-			      NULL);
-	}
-
-	tag = empathy_text_buffer_tag_set (buffer, "fancy-event",
-					   "justification", GTK_JUSTIFY_LEFT,
-					   NULL);
-	if (priv->event_foreground) {
-		g_object_set (tag,
-			      "foreground", priv->event_foreground,
-			      NULL);
-	}
-
-	tag = empathy_text_buffer_tag_set (buffer, "invite", NULL);
-	if (priv->invite_foreground) {
-		g_object_set (tag,
-			      "foreground", priv->invite_foreground,
-			      NULL);
-	}
-
-	tag = empathy_text_buffer_tag_set (buffer, "fancy-link",
-					   "underline", PANGO_UNDERLINE_SINGLE,
-					   NULL);
-	if (priv->link_foreground) {
-		g_object_set (tag,
-			      "foreground", priv->link_foreground,
-			      NULL);
-	} 
-}
-
-static void
-theme_boxes_update_view (EmpathyTheme *theme, EmpathyChatView *view)
-{
-	EmpathyThemeBoxesPriv *priv;
-
-	g_return_if_fail (EMPATHY_IS_THEME_BOXES (theme));
-	g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
-
-	priv = GET_PRIV (theme);
-
-	theme_boxes_define_theme_tags (theme, view);
-	
-	empathy_chat_view_set_margin (view, MARGIN);
-}
-
-static void
-table_size_allocate_cb (GtkWidget     *view,
-			GtkAllocation *allocation,
-			GtkWidget     *box)
-{
-	gint width, height;
+	GtkTextBuffer *buffer;
 
-        gtk_widget_get_size_request (box, NULL, &height);
+	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (theme));
 
-	width = allocation->width;
-	
-	width -= \
-		gtk_text_view_get_right_margin (GTK_TEXT_VIEW (view)) - \
-		gtk_text_view_get_left_margin (GTK_TEXT_VIEW (view));
-	width -= 2 * MARGIN;
-	width -= 2 * HEADER_PADDING;
+	gtk_text_buffer_create_tag (buffer, EMPATHY_THEME_BOXES_TAG_HEADER,
+				    "pixels-above-lines", HEADER_PADDING,
+				    "pixels-below-lines", HEADER_PADDING,
+				    NULL);
 
-        gtk_widget_set_size_request (box, width, height);
+	gtk_text_buffer_create_tag (buffer, EMPATHY_THEME_BOXES_TAG_HEADER_LINE, NULL);
 }
 
 /* Pads a pixbuf to the specified size, by centering it in a larger transparent
@@ -613,13 +158,33 @@ theme_boxes_get_avatar_pixbuf_with_cache (EmpathyContact *contact)
 }
 
 static void
-theme_boxes_maybe_append_header (EmpathyTheme        *theme,
-				 EmpathyChatView     *view,
-				 EmpathyMessage      *msg)
+table_size_allocate_cb (GtkWidget     *view,
+			GtkAllocation *allocation,
+			GtkWidget     *box)
+{
+	gint width, height;
+
+        gtk_widget_get_size_request (box, NULL, &height);
+
+	width = allocation->width;
+	
+	width -= \
+		gtk_text_view_get_right_margin (GTK_TEXT_VIEW (view)) - \
+		gtk_text_view_get_left_margin (GTK_TEXT_VIEW (view));
+	width -= 2 * MARGIN;
+	width -= 2 * HEADER_PADDING;
+
+        gtk_widget_set_size_request (box, width, height);
+}
+
+static void
+theme_boxes_maybe_append_header (EmpathyThemeBoxes *theme,
+				 EmpathyMessage    *msg)
 {
-	EmpathyThemeBoxesPriv *priv;
-	EmpathyContact        *contact;
-	EmpathyContact        *last_contact;
+	EmpathyChatTextView  *view = EMPATHY_CHAT_TEXT_VIEW (theme);
+	EmpathyThemeBoxesPriv*priv = GET_PRIV (theme);
+	EmpathyContact       *contact;
+	EmpathyContact       *last_contact;
 	GdkPixbuf            *avatar = NULL;
 	GtkTextBuffer        *buffer;
 	const gchar          *name;
@@ -631,15 +196,14 @@ theme_boxes_maybe_append_header (EmpathyTheme        *theme,
 	time_t                time;
 	gchar                *tmp;
 	GtkTextIter           start;
-	GdkColor              color;
-	gboolean              parse_success;
-
-	priv = GET_PRIV (theme);
+	gboolean              color_set;
+	GtkTextTagTable      *table;
+	GtkTextTag           *tag;
 
 	contact = empathy_message_get_sender (msg);
 	name = empathy_contact_get_name (contact);
-	last_contact = empathy_chat_view_get_last_contact (view);
-	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
+	last_contact = empathy_chat_text_view_get_last_contact (view);
+	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (theme));
 
 	DEBUG ("Maybe add fancy header");
 
@@ -650,23 +214,29 @@ theme_boxes_maybe_append_header (EmpathyTheme        *theme,
 		return;
 	}
 
-	empathy_theme_append_spacing (theme, view);
+	empathy_chat_text_view_append_spacing (view);
 
+	/* Insert header line */
 	gtk_text_buffer_get_end_iter (buffer, &iter);
 	gtk_text_buffer_insert_with_tags_by_name (buffer,
 						  &iter,
 						  "\n",
 						  -1,
-						  "fancy-header-line",
+						  EMPATHY_THEME_BOXES_TAG_HEADER_LINE,
 						  NULL);
 
 	gtk_text_buffer_get_end_iter (buffer, &iter);
 	anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
 
+	/* Create a hbox for the header and resize it when the view allocation
+	 * changes */
 	box = gtk_hbox_new (FALSE, 0);
+	g_signal_connect_object (view, "size-allocate",
+				 G_CALLBACK (table_size_allocate_cb),
+				 box, 0);
 
-
-	if (empathy_theme_get_show_avatars (theme)) {
+	/* Add avatar to the box if needed */
+	if (priv->show_avatars) {
 		avatar = theme_boxes_get_avatar_pixbuf_with_cache (contact);
 		if (avatar) {
 			GtkWidget *image;
@@ -678,218 +248,167 @@ theme_boxes_maybe_append_header (EmpathyTheme        *theme,
 		}
 	}
 
-	g_signal_connect_object (view, "size-allocate",
-				 G_CALLBACK (table_size_allocate_cb),
-				 box, 0);
-
+	/* Add contact alias */
 	str = g_markup_printf_escaped ("<b>%s</b>", name);
-
 	label1 = g_object_new (GTK_TYPE_LABEL,
 			       "label", str,
 			       "use-markup", TRUE,
 			       "xalign", 0.0,
 			       NULL);
-
-	parse_success = priv->header_foreground &&
-			gdk_color_parse (priv->header_foreground, &color);
-
-	if (parse_success) {
-		gtk_widget_modify_fg (label1, GTK_STATE_NORMAL, &color);
-	}
-
 	g_free (str);
 
+	/* Add the message receive time */
 	time = empathy_message_get_timestamp (msg);
-
 	tmp = empathy_time_to_string_local (time, 
 					   EMPATHY_TIME_FORMAT_DISPLAY_SHORT);
 	str = g_strdup_printf ("<i>%s</i>", tmp);
-	g_free (tmp);
-
 	label2 = g_object_new (GTK_TYPE_LABEL,
 			       "label", str,
 			       "use-markup", TRUE,
 			       "xalign", 1.0,
 			       NULL);
+	g_free (tmp);
+	g_free (str);
 	
-	if (parse_success) {
+	/* Set foreground color of labels to the same color than the header tag. */
+	table = gtk_text_buffer_get_tag_table (buffer);
+	tag = gtk_text_tag_table_lookup (table, EMPATHY_THEME_BOXES_TAG_HEADER);
+	g_object_get (tag, "foreground-set", &color_set, NULL);
+	if (color_set) {
+		GdkColor color;
+		g_object_get (tag, "foreground-gdk", &color, NULL);
+		gtk_widget_modify_fg (label1, GTK_STATE_NORMAL, &color);
 		gtk_widget_modify_fg (label2, GTK_STATE_NORMAL, &color);
 	}
 
-	g_free (str);
-
+	/* Pack labels into the box */
 	gtk_misc_set_alignment (GTK_MISC (label1), 0.0, 0.5);
 	gtk_misc_set_alignment (GTK_MISC (label2), 1.0, 0.5);
-
 	gtk_box_pack_start (GTK_BOX (box), label1, TRUE, TRUE, 0);
 	gtk_box_pack_start (GTK_BOX (box), label2, TRUE, TRUE, 0);
 
+	/* Add the header box to the text view */
 	gtk_text_view_add_child_at_anchor (GTK_TEXT_VIEW (view),
 					   box,
 					   anchor);
-
 	gtk_widget_show_all (box);
 
+	/* Insert a header line */
 	gtk_text_buffer_get_end_iter (buffer, &iter);
 	start = iter;
 	gtk_text_iter_backward_char (&start);
 	gtk_text_buffer_apply_tag_by_name (buffer,
-					   "fancy-header",
+					   EMPATHY_THEME_BOXES_TAG_HEADER,
 					   &start, &iter);
-
 	gtk_text_buffer_insert_with_tags_by_name (buffer,
 						  &iter,
 						  "\n",
 						  -1,
-						  "fancy-header",
+						  EMPATHY_THEME_BOXES_TAG_HEADER,
 						  NULL);
-
 	gtk_text_buffer_get_end_iter (buffer, &iter);
 	gtk_text_buffer_insert_with_tags_by_name (buffer,
 						  &iter,
 						  "\n",
 						  -1,
-						  "fancy-header-line",
+						  EMPATHY_THEME_BOXES_TAG_HEADER_LINE,
 						  NULL);
 }
 
 static void
-theme_boxes_append_message (EmpathyTheme        *theme,
-			    EmpathyChatView     *view,
+theme_boxes_append_message (EmpathyChatTextView *view,
 			    EmpathyMessage      *message)
 {
 	EmpathyContact *sender;
 
-	empathy_theme_maybe_append_date_and_time (theme, view, message);
-	theme_boxes_maybe_append_header (theme, view, message);
+	theme_boxes_maybe_append_header (EMPATHY_THEME_BOXES (view), message);
 
 	sender = empathy_message_get_sender (message);
-
-	if (empathy_message_get_tptype (message) == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION) {
+	if (empathy_message_get_tptype (message) ==
+	    TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION) {
 		gchar *body;
 
 		body = g_strdup_printf (" * %s %s", 
 					empathy_contact_get_name (sender),
 					empathy_message_get_body (message));
-		empathy_theme_append_text (theme, view, body,
-					   "fancy-action", "fancy-link");
+		empathy_chat_text_view_append_body (EMPATHY_CHAT_TEXT_VIEW (view),
+						    body,
+						    EMPATHY_CHAT_TEXT_VIEW_TAG_ACTION);
 	} else {
-		empathy_theme_append_text (theme, view,
-					   empathy_message_get_body (message),
-					   "fancy-body", "fancy-link");
+		empathy_chat_text_view_append_body (EMPATHY_CHAT_TEXT_VIEW (view),
+						    empathy_message_get_body (message),
+						    EMPATHY_CHAT_TEXT_VIEW_TAG_BODY);
 	}
 }
 
 static void
-theme_boxes_append_event (EmpathyTheme        *theme,
-			  EmpathyChatView     *view,
-			  const gchar        *str)
+theme_boxes_notify_show_avatars_cb (EmpathyConf *conf,
+				    const gchar *key,
+				    gpointer     user_data)
 {
-	GtkTextBuffer *buffer;
-	GtkTextIter    iter;
-	gchar         *msg;
-
-	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-
-	empathy_theme_maybe_append_date_and_time (theme, view, NULL);
-
-	gtk_text_buffer_get_end_iter (buffer, &iter);
-
-	msg = g_strdup_printf (" - %s\n", str);
-
-	gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-						  msg, -1,
-						  "fancy-event",
-						  NULL);
-	g_free (msg);
+	EmpathyThemeBoxesPriv *priv = GET_PRIV (user_data);
+	
+	empathy_conf_get_bool (conf, key, &priv->show_avatars);
 }
 
 static void
-theme_boxes_append_timestamp (EmpathyTheme        *theme,
-			      EmpathyChatView     *view,
-			      EmpathyMessage      *message,
-			      gboolean            show_date,
-			      gboolean            show_time)
+theme_boxes_finalize (GObject *object)
 {
-	GtkTextBuffer *buffer;
-	time_t         timestamp;
-	GDate         *date;
-	GtkTextIter    iter;
-	GString       *str;
-	
-	if (!show_date) {
-		return;
-	}
+	EmpathyThemeBoxesPriv *priv = GET_PRIV (object);
 
-	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
+	empathy_conf_notify_remove (empathy_conf_get (),
+				    priv->notify_show_avatars_id);
 
-	date = empathy_message_get_date_and_time (message, &timestamp);
-
-	str = g_string_new (NULL);
-
-	if (show_time || show_date) {
-		empathy_theme_append_spacing (theme, view);
-
-		g_string_append (str, "- ");
-	}
+	G_OBJECT_CLASS (empathy_theme_boxes_parent_class)->finalize (object);
+}
 
-	if (show_date) {
-		gchar buf[256];
+static void
+empathy_theme_boxes_class_init (EmpathyThemeBoxesClass *class)
+{
+	GObjectClass             *object_class;
+	EmpathyChatTextViewClass *chat_text_view_class;
 
-		g_date_strftime (buf, 256, _("%A %d %B %Y"), date);
-		g_string_append (str, buf);
+	object_class = G_OBJECT_CLASS (class);
+	chat_text_view_class  = EMPATHY_CHAT_TEXT_VIEW_CLASS (class);
 
-		if (show_time) {
-			g_string_append (str, ", ");
-		}
-	}
+	object_class->finalize = theme_boxes_finalize;
+	chat_text_view_class->append_message = theme_boxes_append_message;
 
-	g_date_free (date);
+	g_type_class_add_private (object_class, sizeof (EmpathyThemeBoxesPriv));
+}
 
-	if (show_time) {
-		gchar *tmp;
+static void
+empathy_theme_boxes_init (EmpathyThemeBoxes *theme)
+{
+	EmpathyThemeBoxesPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (theme,
+		EMPATHY_TYPE_THEME_BOXES, EmpathyThemeBoxesPriv);
 
-		tmp = empathy_time_to_string_local (timestamp, EMPATHY_TIME_FORMAT_DISPLAY_SHORT);
-		g_string_append (str, tmp);
-		g_free (tmp);
-	}
+	theme->priv = priv;
 
-	if (show_time || show_date) {
-		g_string_append (str, " -\n");
+	theme_boxes_create_tags (theme);
 
-		gtk_text_buffer_get_end_iter (buffer, &iter);
-		gtk_text_buffer_insert_with_tags_by_name (buffer,
-							  &iter,
-							  str->str, -1,
-							  "fancy-time",
-							  NULL);
+	priv->notify_show_avatars_id =
+		empathy_conf_notify_add (empathy_conf_get (),
+					 EMPATHY_PREFS_UI_SHOW_AVATARS,
+					 theme_boxes_notify_show_avatars_cb,
+					 theme);
 
-		empathy_chat_view_set_last_timestamp (view, timestamp);
-	}
+	empathy_conf_get_bool (empathy_conf_get (),
+			       EMPATHY_PREFS_UI_SHOW_AVATARS,
+			       &priv->show_avatars);
 
-	g_string_free (str, TRUE);
-	
+	/* Define margin */
+	g_object_set (theme,
+		      "left-margin", MARGIN,
+		      "right-margin", MARGIN,
+		      NULL);
 }
 
-static void
-theme_boxes_append_spacing (EmpathyTheme        *theme,
-			    EmpathyChatView     *view)
+EmpathyThemeBoxes *
+empathy_theme_boxes_new (void)
 {
-	GtkTextBuffer *buffer;
-	GtkTextIter    iter;
-
-	g_return_if_fail (EMPATHY_IS_THEME (theme));
-	g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
-
-	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-
-	gtk_text_buffer_get_end_iter (buffer, &iter);
-	gtk_text_buffer_insert_with_tags_by_name (buffer,
-						  &iter,
-						  "\n",
-						  -1,
-						  "cut",
-						  "fancy-spacing",
-						  NULL);
+	return g_object_new (EMPATHY_TYPE_THEME_BOXES,
+			     "only-if-date", TRUE,
+			     NULL);
 }