]> git.0d.be Git - empathy.git/blobdiff - libempathy-gtk/empathy-chat-view.c
Move empathy-conf to libempathy-gtk. libempathy do not depend directly on gconf anymore.
[empathy.git] / libempathy-gtk / empathy-chat-view.c
index e0c75b1911d84a73a82bfb5a7135cc94c0464e50..f4ad7f316c4a3848f9fbe74cd2e9052478c5f22a 100644 (file)
 #include <gtk/gtksizegroup.h>
 #include <glade/glade.h>
 
+#include <telepathy-glib/util.h>
 #include <libmissioncontrol/mc-account.h>
 
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-conf.h>
 
 #include "empathy-chat-view.h"
 #include "empathy-chat.h"
+#include "empathy-conf.h"
 #include "empathy-preferences.h"
 #include "empathy-theme-manager.h"
 #include "empathy-ui-utils.h"
 
 #define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_CHAT_VIEW, EmpathyChatViewPriv))
 
-typedef enum {
-       BLOCK_TYPE_NONE,
-       BLOCK_TYPE_SELF,
-       BLOCK_TYPE_OTHER,
-       BLOCK_TYPE_EVENT,
-       BLOCK_TYPE_TIME,
-       BLOCK_TYPE_INVITE
-} BlockType;
-
 struct _EmpathyChatViewPriv {
-       EmpathySmileyManager *smiley_manager;
-
        GtkTextBuffer *buffer;
 
-       gboolean       irc_style;
+       EmpathyTheme   *theme;
+
        time_t         last_timestamp;
-       BlockType      last_block_type;
+       EmpathyChatViewBlock last_block_type;
 
        gboolean       allow_scrolling;
        guint          scroll_timeout;
@@ -135,32 +126,12 @@ static void     chat_view_copy_address_cb            (GtkMenuItem              *
                                                      const gchar              *url);
 static void     chat_view_clear_view_cb              (GtkMenuItem              *menuitem,
                                                      EmpathyChatView           *view);
-static void     chat_view_insert_text_with_emoticons (EmpathyChatView          *view,
-                                                     GtkTextIter              *iter,
-                                                     const gchar              *str);
 static gboolean chat_view_is_scrolled_down           (EmpathyChatView           *view);
 static void     chat_view_theme_changed_cb           (EmpathyThemeManager       *manager,
                                                      EmpathyChatView           *view);
-static void     chat_view_maybe_append_date_and_time (EmpathyChatView           *view,
-                                                     EmpathyMessage            *msg);
-static void     chat_view_append_spacing             (EmpathyChatView           *view);
-static void     chat_view_append_text                (EmpathyChatView           *view,
-                                                     const gchar              *body,
-                                                     const gchar              *tag);
-static void     chat_view_maybe_append_fancy_header  (EmpathyChatView           *view,
-                                                     EmpathyMessage            *msg);
-static void     chat_view_append_irc_action          (EmpathyChatView           *view,
-                                                     EmpathyMessage            *msg);
-static void     chat_view_append_fancy_action        (EmpathyChatView           *view,
-                                                     EmpathyMessage            *msg);
-static void     chat_view_append_irc_message         (EmpathyChatView           *view,
-                                                     EmpathyMessage            *msg);
-static void     chat_view_append_fancy_message       (EmpathyChatView           *view,
-                                                     EmpathyMessage            *msg);
-static GdkPixbuf *chat_view_pad_to_size              (GdkPixbuf                *pixbuf,
-                                                     gint                      width,
-                                                     gint                      height,
-                                                     gint                      extra_padding_right);
+static void     chat_view_theme_notify_cb            (EmpathyTheme              *theme,
+                                                     GParamSpec                *param,
+                                                     EmpathyChatView           *view);
 
 G_DEFINE_TYPE (EmpathyChatView, empathy_chat_view, GTK_TYPE_TEXT_VIEW);
 
@@ -185,10 +156,9 @@ empathy_chat_view_init (EmpathyChatView *view)
 
        priv = GET_PRIV (view);
 
-       priv->smiley_manager = empathy_smiley_manager_new ();
        priv->buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
-       priv->last_block_type = BLOCK_TYPE_NONE;
+       priv->last_block_type = EMPATHY_CHAT_VIEW_BLOCK_NONE;
        priv->last_timestamp = 0;
 
        priv->allow_scrolling = TRUE;
@@ -223,8 +193,7 @@ empathy_chat_view_init (EmpathyChatView *view)
                               EMPATHY_PREFS_UI_SHOW_AVATARS,
                               &show_avatars);
 
-       empathy_theme_manager_update_show_avatars (empathy_theme_manager_get (),
-                                                 view, show_avatars);
+       empathy_theme_set_show_avatars (priv->theme, show_avatars);
 
        g_signal_connect (view,
                          "populate-popup",
@@ -252,9 +221,6 @@ chat_view_finalize (GObject *object)
        empathy_conf_notify_remove (empathy_conf_get (), priv->notify_system_fonts_id);
        empathy_conf_notify_remove (empathy_conf_get (), priv->notify_show_avatars_id);
 
-       if (priv->smiley_manager) {
-               g_object_unref (priv->smiley_manager);
-       }
        if (priv->last_contact) {
                g_object_unref (priv->last_contact);
        }
@@ -265,6 +231,13 @@ chat_view_finalize (GObject *object)
                g_source_remove (priv->scroll_timeout);
        }
 
+       if (priv->theme) {
+               g_signal_handlers_disconnect_by_func (priv->theme,
+                                                     chat_view_theme_notify_cb,
+                                                     view);
+               g_object_unref (priv->theme);
+       }
+
        G_OBJECT_CLASS (empathy_chat_view_parent_class)->finalize (object);
 }
 
@@ -363,9 +336,11 @@ chat_view_notify_system_font_cb (EmpathyConf  *conf,
                                 gpointer     user_data)
 {
        EmpathyChatView *view;
+       EmpathyChatViewPriv *priv;
        gboolean        show_avatars = FALSE;
 
        view = user_data;
+       priv = GET_PRIV (view);
 
        chat_view_system_font_update (view);
 
@@ -377,8 +352,7 @@ chat_view_notify_system_font_cb (EmpathyConf  *conf,
                               EMPATHY_PREFS_UI_SHOW_AVATARS,
                               &show_avatars);
 
-       empathy_theme_manager_update_show_avatars (empathy_theme_manager_get (),
-                                                 view, show_avatars);
+       empathy_theme_set_show_avatars (priv->theme, show_avatars);
 }
 
 static void
@@ -395,8 +369,7 @@ chat_view_notify_show_avatars_cb (EmpathyConf  *conf,
 
        empathy_conf_get_bool (conf, key, &show_avatars);
 
-       empathy_theme_manager_update_show_avatars (empathy_theme_manager_get (),
-                                                 view, show_avatars);
+       empathy_theme_set_show_avatars (priv->theme, show_avatars);
 }
 
 static void
@@ -592,40 +565,6 @@ chat_view_clear_view_cb (GtkMenuItem *menuitem, EmpathyChatView *view)
        empathy_chat_view_clear (view);
 }
 
-static void
-chat_view_insert_text_with_emoticons (EmpathyChatView *view,
-                                     GtkTextIter     *iter,
-                                     const gchar     *str)
-{
-       EmpathyChatViewPriv *priv = GET_PRIV (view);
-       GtkTextBuffer       *buf = priv->buffer;
-       gboolean             use_smileys = FALSE;
-       GSList              *smileys, *l;
-
-       empathy_conf_get_bool (empathy_conf_get (),
-                              EMPATHY_PREFS_CHAT_SHOW_SMILEYS,
-                              &use_smileys);
-
-       if (!use_smileys) {
-               gtk_text_buffer_insert (buf, iter, str, -1);
-               return;
-       }
-
-       smileys = empathy_smiley_manager_parse (priv->smiley_manager, str);
-       for (l = smileys; l; l = l->next) {
-               EmpathySmiley *smiley;
-
-               smiley = l->data;
-               if (smiley->pixbuf) {
-                       gtk_text_buffer_insert_pixbuf (buf, iter, smiley->pixbuf);
-               } else {
-                       gtk_text_buffer_insert (buf, iter, smiley->str, -1);
-               }
-               empathy_smiley_free (smiley);
-       }
-       g_slist_free (smileys);
-}
-
 static gboolean
 chat_view_is_scrolled_down (EmpathyChatView *view)
 {
@@ -689,520 +628,6 @@ chat_view_maybe_trim_buffer (EmpathyChatView *view)
        }
 }
 
-static void
-chat_view_maybe_append_date_and_time (EmpathyChatView *view,
-                                     EmpathyMessage  *msg)
-{
-       EmpathyChatViewPriv *priv;
-       const gchar        *tag;
-       time_t              timestamp;
-       GDate              *date, *last_date;
-       GtkTextIter         iter;
-       gboolean            append_date, append_time;
-       GString            *str;
-
-       priv = GET_PRIV (view);
-
-       if (priv->irc_style) {
-               tag = "irc-time";
-       } else {
-               tag = "fancy-time";
-       }
-
-       if (priv->last_block_type == BLOCK_TYPE_TIME) {
-               return;
-       }
-
-       str = g_string_new (NULL);
-
-       timestamp = 0;
-       if (msg) {
-               timestamp = empathy_message_get_timestamp (msg);
-       }
-
-       if (timestamp <= 0) {
-               timestamp = empathy_time_get_current ();
-       }
-
-       date = g_date_new ();
-       g_date_set_time_t (date, timestamp);
-
-       last_date = g_date_new ();
-       g_date_set_time_t (last_date, priv->last_timestamp);
-
-       append_date = FALSE;
-       append_time = FALSE;
-
-       if (g_date_compare (date, last_date) > 0) {
-               append_date = TRUE;
-               append_time = TRUE;
-       }
-
-       if (priv->last_timestamp + TIMESTAMP_INTERVAL < timestamp) {
-               append_time = TRUE;
-       }
-
-       if (append_time || append_date) {
-               chat_view_append_spacing (view);
-
-               g_string_append (str, "- ");
-       }
-
-       if (append_date) {
-               gchar buf[256];
-
-               g_date_strftime (buf, 256, _("%A %d %B %Y"), date);
-               g_string_append (str, buf);
-
-               if (append_time) {
-                       g_string_append (str, ", ");
-               }
-       }
-
-       g_date_free (date);
-       g_date_free (last_date);
-
-       if (append_time) {
-               gchar *tmp;
-
-               tmp = empathy_time_to_string_local (timestamp, EMPATHY_TIME_FORMAT_DISPLAY_SHORT);
-               g_string_append (str, tmp);
-               g_free (tmp);
-       }
-
-       if (append_time || append_date) {
-               g_string_append (str, " -\n");
-
-               gtk_text_buffer_get_end_iter (priv->buffer, &iter);
-               gtk_text_buffer_insert_with_tags_by_name (priv->buffer,
-                                                         &iter,
-                                                         str->str, -1,
-                                                         tag,
-                                                         NULL);
-
-               priv->last_block_type = BLOCK_TYPE_TIME;
-               priv->last_timestamp = timestamp;
-       }
-
-       g_string_free (str, TRUE);
-}
-
-static void
-chat_view_append_spacing (EmpathyChatView *view)
-{
-       EmpathyChatViewPriv *priv;
-       const gchar        *tag;
-       GtkTextIter         iter;
-
-       priv = GET_PRIV (view);
-
-       if (priv->irc_style) {
-               tag = "irc-spacing";
-       } else {
-               tag = "fancy-spacing";
-       }
-
-       gtk_text_buffer_get_end_iter (priv->buffer, &iter);
-       gtk_text_buffer_insert_with_tags_by_name (priv->buffer,
-                                                 &iter,
-                                                 "\n",
-                                                 -1,
-                                                 "cut",
-                                                 tag,
-                                                 NULL);
-}
-
-static void
-chat_view_append_text (EmpathyChatView *view,
-                      const gchar    *body,
-                      const gchar    *tag)
-{
-       EmpathyChatViewPriv *priv;
-       GtkTextIter         start_iter, end_iter;
-       GtkTextMark        *mark;
-       GtkTextIter         iter;
-       gint                num_matches, i;
-       GArray             *start, *end;
-       const gchar        *link_tag;
-
-       priv = GET_PRIV (view);
-
-       if (priv->irc_style) {
-               link_tag = "irc-link";
-       } else {
-               link_tag = "fancy-link";
-       }
-
-       gtk_text_buffer_get_end_iter (priv->buffer, &start_iter);
-       mark = gtk_text_buffer_create_mark (priv->buffer, NULL, &start_iter, TRUE);
-
-       start = g_array_new (FALSE, FALSE, sizeof (gint));
-       end = g_array_new (FALSE, FALSE, sizeof (gint));
-
-       num_matches = empathy_regex_match (EMPATHY_REGEX_ALL, body, start, end);
-
-       if (num_matches == 0) {
-               gtk_text_buffer_get_end_iter (priv->buffer, &iter);
-               chat_view_insert_text_with_emoticons (view, &iter, body);
-       } else {
-               gint   last = 0;
-               gint   s = 0, e = 0;
-               gchar *tmp;
-
-               for (i = 0; i < num_matches; i++) {
-                       s = g_array_index (start, gint, i);
-                       e = g_array_index (end, gint, i);
-
-                       if (s > last) {
-                               tmp = empathy_substring (body, last, s);
-
-                               gtk_text_buffer_get_end_iter (priv->buffer, &iter);
-                               chat_view_insert_text_with_emoticons (view,
-                                                                     &iter,
-                                                                     tmp);
-                               g_free (tmp);
-                       }
-
-                       tmp = empathy_substring (body, s, e);
-
-                       gtk_text_buffer_get_end_iter (priv->buffer, &iter);
-                       gtk_text_buffer_insert_with_tags_by_name (priv->buffer,
-                                                                 &iter,
-                                                                 tmp,
-                                                                 -1,
-                                                                 link_tag,
-                                                                 "link",
-                                                                 NULL);
-
-                       g_free (tmp);
-
-                       last = e;
-               }
-
-               if (e < strlen (body)) {
-                       tmp = empathy_substring (body, e, strlen (body));
-
-                       gtk_text_buffer_get_end_iter (priv->buffer, &iter);
-                       chat_view_insert_text_with_emoticons (view,
-                                                             &iter,
-                                                             tmp);
-                       g_free (tmp);
-               }
-       }
-
-       g_array_free (start, TRUE);
-       g_array_free (end, TRUE);
-
-       gtk_text_buffer_get_end_iter (priv->buffer, &iter);
-       gtk_text_buffer_insert (priv->buffer, &iter, "\n", 1);
-
-       /* Apply the style to the inserted text. */
-       gtk_text_buffer_get_iter_at_mark (priv->buffer, &start_iter, mark);
-       gtk_text_buffer_get_end_iter (priv->buffer, &end_iter);
-
-       gtk_text_buffer_apply_tag_by_name (priv->buffer,
-                                          tag,
-                                          &start_iter,
-                                          &end_iter);
-
-       gtk_text_buffer_delete_mark (priv->buffer, mark);
-}
-
-static void
-chat_view_maybe_append_fancy_header (EmpathyChatView *view,
-                                    EmpathyMessage  *msg)
-{
-       EmpathyChatViewPriv *priv;
-       EmpathyContact      *sender;
-       const gchar        *name;
-       gboolean            header;
-       GtkTextIter         iter;
-       gchar              *tmp;
-       const gchar        *tag;
-       const gchar        *avatar_tag;
-       const gchar        *line_top_tag;
-       const gchar        *line_bottom_tag;
-       gboolean            from_self;
-       GdkPixbuf          *pixbuf = NULL;
-       GdkPixbuf          *avatar = NULL;
-
-       priv = GET_PRIV (view);
-
-       sender = empathy_message_get_sender (msg);
-       name = empathy_contact_get_name (sender);
-       from_self = empathy_contact_is_user (sender);
-
-       empathy_debug (DEBUG_DOMAIN, "Maybe add fancy header");
-
-       if (from_self) {
-               tag = "fancy-header-self";
-               line_top_tag = "fancy-line-top-self";
-               line_bottom_tag = "fancy-line-bottom-self";
-       } else {
-               tag = "fancy-header-other";
-               line_top_tag = "fancy-line-top-other";
-               line_bottom_tag = "fancy-line-bottom-other";
-       }
-
-       header = FALSE;
-
-       /* Only insert a header if the previously inserted block is not the same
-        * as this one. This catches all the different cases:
-        */
-       if (priv->last_block_type != BLOCK_TYPE_SELF &&
-           priv->last_block_type != BLOCK_TYPE_OTHER) {
-               header = TRUE;
-       }
-       else if (from_self && priv->last_block_type == BLOCK_TYPE_OTHER) {
-               header = TRUE;
-       }
-       else if (!from_self && priv->last_block_type == BLOCK_TYPE_SELF) {
-               header = TRUE;
-       }
-       else if (!from_self &&
-                (!priv->last_contact ||
-                 !empathy_contact_equal (sender, priv->last_contact))) {
-               header = TRUE;
-       }
-
-       if (!header) {
-               return;
-       }
-
-       chat_view_append_spacing (view);
-
-       gtk_text_buffer_get_end_iter (priv->buffer, &iter);
-       gtk_text_buffer_insert_with_tags_by_name (priv->buffer,
-                                                 &iter,
-                                                 "\n",
-                                                 -1,
-                                                 line_top_tag,
-                                                 NULL);
-
-       /* FIXME: we should have a cash of avatar pixbufs */
-       pixbuf = empathy_pixbuf_avatar_from_contact_scaled (sender, 32, 32);
-       if (pixbuf) {
-               avatar = chat_view_pad_to_size (pixbuf, 32, 32, 6);
-               g_object_unref (pixbuf);
-       }
-
-       if (avatar) {
-               GtkTextIter start;
-
-               gtk_text_buffer_get_end_iter (priv->buffer, &iter);
-               gtk_text_buffer_insert_pixbuf (priv->buffer, &iter, avatar);
-
-               gtk_text_buffer_get_end_iter (priv->buffer, &iter);
-               start = iter;
-               gtk_text_iter_backward_char (&start);
-
-               if (from_self) {
-                       gtk_text_buffer_apply_tag_by_name (priv->buffer,
-                                                          "fancy-avatar-self",
-                                                          &start, &iter);
-                       avatar_tag = "fancy-header-self-avatar";
-               } else {
-                       gtk_text_buffer_apply_tag_by_name (priv->buffer,
-                                                          "fancy-avatar-other",
-                                                          &start, &iter);
-                       avatar_tag = "fancy-header-other-avatar";
-               }
-
-               g_object_unref (avatar);
-       } else {
-               avatar_tag = NULL;
-       }
-
-       tmp = g_strdup_printf ("%s\n", name);
-
-       gtk_text_buffer_get_end_iter (priv->buffer, &iter);
-       gtk_text_buffer_insert_with_tags_by_name (priv->buffer,
-                                                 &iter,
-                                                 tmp,
-                                                 -1,
-                                                 tag,
-                                                 avatar_tag,
-                                                 NULL);
-       g_free (tmp);
-
-       gtk_text_buffer_get_end_iter (priv->buffer, &iter);
-       gtk_text_buffer_insert_with_tags_by_name (priv->buffer,
-                                                 &iter,
-                                                 "\n",
-                                                 -1,
-                                                 line_bottom_tag,
-                                                 NULL);
-}
-
-static void
-chat_view_append_irc_action (EmpathyChatView *view,
-                            EmpathyMessage  *msg)
-{
-       EmpathyChatViewPriv *priv;
-       EmpathyContact      *sender;
-       const gchar        *name;
-       GtkTextIter         iter;
-       const gchar        *body;
-       gchar              *tmp;
-       const gchar        *tag;
-
-       priv = GET_PRIV (view);
-
-       empathy_debug (DEBUG_DOMAIN, "Add IRC action");
-
-       sender = empathy_message_get_sender (msg);
-       name = empathy_contact_get_name (sender);
-
-       if (empathy_contact_is_user (sender)) {
-               tag = "irc-action-self";
-       } else {
-               tag = "irc-action-other";
-       }
-
-       if (priv->last_block_type != BLOCK_TYPE_SELF &&
-           priv->last_block_type != BLOCK_TYPE_OTHER) {
-               chat_view_append_spacing (view);
-       }
-
-       gtk_text_buffer_get_end_iter (priv->buffer, &iter);
-
-       tmp = g_strdup_printf (" * %s ", name);
-       gtk_text_buffer_insert_with_tags_by_name (priv->buffer,
-                                                 &iter,
-                                                 tmp,
-                                                 -1,
-                                                 "cut",
-                                                 tag,
-                                                 NULL);
-       g_free (tmp);
-
-       body = empathy_message_get_body (msg);
-       chat_view_append_text (view, body, tag);
-}
-
-static void
-chat_view_append_fancy_action (EmpathyChatView *view,
-                              EmpathyMessage  *msg)
-{
-       EmpathyChatViewPriv *priv;
-       EmpathyContact      *sender;
-       const gchar        *name;
-       const gchar        *body;
-       GtkTextIter         iter;
-       gchar              *tmp;
-       const gchar        *tag;
-       const gchar        *line_tag;
-
-       priv = GET_PRIV (view);
-
-       empathy_debug (DEBUG_DOMAIN, "Add fancy action");
-
-       sender = empathy_message_get_sender (msg);
-       name = empathy_contact_get_name (sender);
-
-       if (empathy_contact_is_user (sender)) {
-               tag = "fancy-action-self";
-               line_tag = "fancy-line-self";
-       } else {
-               tag = "fancy-action-other";
-               line_tag = "fancy-line-other";
-       }
-
-       tmp = g_strdup_printf (" * %s ", name);
-       gtk_text_buffer_get_end_iter (priv->buffer, &iter);
-       gtk_text_buffer_insert_with_tags_by_name (priv->buffer,
-                                                 &iter,
-                                                 tmp,
-                                                 -1,
-                                                 tag,
-                                                 NULL);
-       g_free (tmp);
-
-       body = empathy_message_get_body (msg);
-       chat_view_append_text (view, body, tag);
-}
-
-static void
-chat_view_append_irc_message (EmpathyChatView *view,
-                             EmpathyMessage  *msg)
-{
-       EmpathyChatViewPriv *priv;
-       EmpathyContact      *sender;
-       const gchar        *name;
-       const gchar        *body;
-       const gchar        *nick_tag;
-       const gchar        *body_tag;
-       GtkTextIter         iter;
-       gchar              *tmp;
-
-       priv = GET_PRIV (view);
-
-       empathy_debug (DEBUG_DOMAIN, "Add IRC message");
-
-       body = empathy_message_get_body (msg);
-       sender = empathy_message_get_sender (msg);
-       name = empathy_contact_get_name (sender);
-
-       if (empathy_contact_is_user (sender)) {
-               nick_tag = "irc-nick-self";
-               body_tag = "irc-body-self";
-       } else {
-               if (empathy_chat_should_highlight_nick (msg)) {
-                       nick_tag = "irc-nick-highlight";
-               } else {
-                       nick_tag = "irc-nick-other";
-               }
-
-               body_tag = "irc-body-other";
-       }
-
-       if (priv->last_block_type != BLOCK_TYPE_SELF &&
-           priv->last_block_type != BLOCK_TYPE_OTHER) {
-               chat_view_append_spacing (view);
-       }
-
-       gtk_text_buffer_get_end_iter (priv->buffer, &iter);
-
-       /* The nickname. */
-       tmp = g_strdup_printf ("%s: ", name);
-       gtk_text_buffer_insert_with_tags_by_name (priv->buffer,
-                                                 &iter,
-                                                 tmp,
-                                                 -1,
-                                                 "cut",
-                                                 nick_tag,
-                                                 NULL);
-       g_free (tmp);
-
-       /* The text body. */
-       chat_view_append_text (view, body, body_tag);
-}
-
-static void
-chat_view_append_fancy_message (EmpathyChatView *view,
-                               EmpathyMessage  *msg)
-{
-       EmpathyChatViewPriv *priv;
-       EmpathyContact      *sender;
-       const gchar        *body;
-       const gchar        *tag;
-
-       priv = GET_PRIV (view);
-
-       sender = empathy_message_get_sender (msg);
-
-       if (empathy_contact_is_user (sender)) {
-               tag = "fancy-body-self";
-       } else {
-               tag = "fancy-body-other";
-
-               /* FIXME: Might want to support nick highlighting here... */
-       }
-
-       body = empathy_message_get_body (msg);
-       chat_view_append_text (view, body, tag);
-}
-
 static void
 chat_view_theme_changed_cb (EmpathyThemeManager *manager,
                            EmpathyChatView     *view)
@@ -1213,7 +638,7 @@ chat_view_theme_changed_cb (EmpathyThemeManager *manager,
 
        priv = GET_PRIV (view);
 
-       priv->last_block_type = BLOCK_TYPE_NONE;
+       priv->last_block_type = EMPATHY_CHAT_VIEW_BLOCK_NONE;
 
        empathy_conf_get_bool (empathy_conf_get (),
                              EMPATHY_PREFS_CHAT_THEME_CHAT_ROOM,
@@ -1230,7 +655,7 @@ chat_view_theme_changed_cb (EmpathyThemeManager *manager,
        empathy_conf_get_bool (empathy_conf_get (),
                               EMPATHY_PREFS_UI_SHOW_AVATARS,
                               &show_avatars);
-       empathy_theme_manager_update_show_avatars (manager, view, show_avatars);
+       empathy_theme_set_show_avatars (priv->theme, show_avatars);
 }
 
 /* Pads a pixbuf to the specified size, by centering it in a larger transparent
@@ -1272,71 +697,104 @@ chat_view_pad_to_size (GdkPixbuf *pixbuf,
        return padded;
 }
 
+typedef struct {
+       GdkPixbuf *pixbuf;
+       gchar     *token;
+} AvatarData;
+
+static void
+chat_view_avatar_cache_data_free (gpointer ptr)
+{
+       AvatarData *data = ptr;
+
+       g_object_unref (data->pixbuf);
+       g_free (data->token);
+       g_slice_free (AvatarData, data);
+}
+
+GdkPixbuf *
+empathy_chat_view_get_avatar_pixbuf_with_cache (EmpathyContact *contact)
+{
+       static GHashTable *avatar_cache = NULL;
+       AvatarData        *data;
+       EmpathyAvatar     *avatar;
+       GdkPixbuf         *tmp_pixbuf;
+       GdkPixbuf         *pixbuf = NULL;
+
+       /* Init avatar cache */
+       if (!avatar_cache) {
+               avatar_cache = g_hash_table_new_full (empathy_contact_hash,
+                                                     empathy_contact_equal,
+                                                     g_object_unref,
+                                                     chat_view_avatar_cache_data_free);
+       }
+
+       /* Check if avatar is in cache and if it's up to date */
+       avatar = empathy_contact_get_avatar (contact);
+       data = g_hash_table_lookup (avatar_cache, contact);
+       if (data) {
+               if (avatar && !tp_strdiff (avatar->token, data->token)) {
+                       /* We have the avatar in cache */
+                       return data->pixbuf;
+               }
+
+               /* The cache is outdate */
+               g_hash_table_remove (avatar_cache, contact);
+       }
+
+       /* Avatar not in cache, create pixbuf */
+       tmp_pixbuf = empathy_pixbuf_avatar_from_contact_scaled (contact, 32, 32);
+       if (tmp_pixbuf) {
+               pixbuf = chat_view_pad_to_size (tmp_pixbuf, 32, 32, 6);
+               g_object_unref (tmp_pixbuf);
+       }
+       if (!pixbuf) {
+               return NULL;
+       }
+
+       /* Insert new pixbuf in cache */
+       data = g_slice_new0 (AvatarData);
+       data->token = g_strdup (avatar->token);
+       data->pixbuf = pixbuf;
+
+       g_hash_table_insert (avatar_cache,
+                            g_object_ref (contact),
+                            data);
+
+       return data->pixbuf;
+}
+
 EmpathyChatView *
 empathy_chat_view_new (void)
 {
        return g_object_new (EMPATHY_TYPE_CHAT_VIEW, NULL);
 }
 
-/* The name is optional, if NULL, the sender for msg is used. */
 void
 empathy_chat_view_append_message (EmpathyChatView *view,
-                                EmpathyMessage  *msg)
+                                 EmpathyMessage  *msg)
 {
-       EmpathyChatViewPriv *priv;
+       EmpathyChatViewPriv *priv = GET_PRIV (view);
        EmpathyContact      *sender;
-       const gchar        *body;
-       gboolean            scroll_down;
+       gboolean             bottom;
+       gboolean             from_self;
 
        g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
        g_return_if_fail (EMPATHY_IS_MESSAGE (msg));
 
-       priv = GET_PRIV (view);
-
-       body = empathy_message_get_body (msg);
-       if (!body) {
+       if (!empathy_message_get_body (msg)) {
                return;
        }
 
-       scroll_down = chat_view_is_scrolled_down (view);
-
-       chat_view_maybe_trim_buffer (view);
-       chat_view_maybe_append_date_and_time (view, msg);
-
+       bottom = chat_view_is_scrolled_down (view);
        sender = empathy_message_get_sender (msg);
+       from_self = empathy_contact_is_user (sender);
+       
+       chat_view_maybe_trim_buffer (view);
 
-       if (!priv->irc_style) {
-               chat_view_maybe_append_fancy_header (view, msg);
-       }
-
-       if (empathy_message_get_type (msg) == EMPATHY_MESSAGE_TYPE_ACTION) {
-               if (priv->irc_style) {
-                       chat_view_append_irc_action (view, msg);
-               } else {
-                       chat_view_append_fancy_action (view, msg);
-               }
-       } else {
-               if (priv->irc_style) {
-                       chat_view_append_irc_message (view, msg);
-               } else {
-                       chat_view_append_fancy_message (view, msg);
-               }
-       }
-
-       /* Reset the last inserted contact. */
-       if (priv->last_contact) {
-               g_object_unref (priv->last_contact);
-       }
-
-       if (empathy_contact_is_user (sender)) {
-               priv->last_block_type = BLOCK_TYPE_SELF;
-               priv->last_contact = NULL;
-       } else {
-               priv->last_block_type = BLOCK_TYPE_OTHER;
-               priv->last_contact = g_object_ref (sender);
-       }
+       empathy_theme_append_message (priv->theme, view, msg);
 
-       if (scroll_down) {
+       if (bottom) {
                empathy_chat_view_scroll_down (view);
        }
 }
@@ -1347,9 +805,6 @@ empathy_chat_view_append_event (EmpathyChatView *view,
 {
        EmpathyChatViewPriv *priv;
        gboolean            bottom;
-       GtkTextIter         iter;
-       gchar              *msg;
-       const gchar        *tag;
 
        g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
        g_return_if_fail (!G_STR_EMPTY (str));
@@ -1360,34 +815,13 @@ empathy_chat_view_append_event (EmpathyChatView *view,
 
        chat_view_maybe_trim_buffer (view);
 
-       if (priv->irc_style) {
-               tag = "irc-event";
-               msg = g_strdup_printf (" - %s\n", str);
-       } else {
-               tag = "fancy-event";
-               msg = g_strdup_printf (" - %s\n", str);
-       }
-
-       if (priv->last_block_type != BLOCK_TYPE_EVENT) {
-               /* Comment out for now. */
-               /*chat_view_append_spacing (view);*/
-       }
-
-       chat_view_maybe_append_date_and_time (view, NULL);
-
-       gtk_text_buffer_get_end_iter (priv->buffer, &iter);
-
-       gtk_text_buffer_insert_with_tags_by_name (priv->buffer, &iter,
-                                                 msg, -1,
-                                                 tag,
-                                                 NULL);
-       g_free (msg);
+       empathy_theme_append_event (priv->theme, view, str);
 
        if (bottom) {
                empathy_chat_view_scroll_down (view);
        }
 
-       priv->last_block_type = BLOCK_TYPE_EVENT;
+       priv->last_block_type = EMPATHY_CHAT_VIEW_BLOCK_EVENT;
 }
 
 void
@@ -1407,18 +841,14 @@ empathy_chat_view_append_button (EmpathyChatView *view,
 
        priv = GET_PRIV (view);
 
-       if (priv->irc_style) {
-               tag = "irc-invite";
-       } else {
-               tag = "fancy-invite";
-       }
+       tag = "invite";
 
        bottom = chat_view_is_scrolled_down (view);
 
-       chat_view_maybe_append_date_and_time (view, NULL);
+       empathy_theme_append_timestamp (priv->theme, view, NULL, TRUE, TRUE);
 
        if (message) {
-               chat_view_append_text (view, message, tag);
+               empathy_theme_append_text (priv->theme, view, message, tag, NULL);
        }
 
        gtk_text_buffer_get_end_iter (priv->buffer, &iter);
@@ -1461,7 +891,7 @@ empathy_chat_view_append_button (EmpathyChatView *view,
                empathy_chat_view_scroll_down (view);
        }
 
-       priv->last_block_type = BLOCK_TYPE_INVITE;
+       priv->last_block_type = EMPATHY_CHAT_VIEW_BLOCK_INVITE;
 }
 
 void
@@ -1566,7 +996,7 @@ empathy_chat_view_clear (EmpathyChatView *view)
         */
        priv = GET_PRIV (view);
 
-       priv->last_block_type = BLOCK_TYPE_NONE;
+       priv->last_block_type = EMPATHY_CHAT_VIEW_BLOCK_NONE;
        priv->last_timestamp = 0;
 }
 
@@ -1915,29 +1345,51 @@ empathy_chat_view_copy_clipboard (EmpathyChatView *view)
        gtk_text_buffer_copy_clipboard (buffer, clipboard);
 }
 
-gboolean
-empathy_chat_view_get_irc_style (EmpathyChatView *view)
+EmpathyTheme *
+empathy_chat_view_get_theme (EmpathyChatView *view)
 {
        EmpathyChatViewPriv *priv;
 
-       g_return_val_if_fail (EMPATHY_IS_CHAT_VIEW (view), FALSE);
+       g_return_val_if_fail (EMPATHY_IS_CHAT_VIEW (view), NULL);
 
        priv = GET_PRIV (view);
 
-       return priv->irc_style;
+       return priv->theme;
+}
+
+static void
+chat_view_theme_notify_cb (EmpathyTheme    *theme,
+                          GParamSpec      *param,
+                          EmpathyChatView *view)
+{
+       empathy_theme_update_view (theme, view);
 }
 
 void
-empathy_chat_view_set_irc_style (EmpathyChatView *view,
-                               gboolean        irc_style)
+empathy_chat_view_set_theme (EmpathyChatView *view, EmpathyTheme *theme)
 {
        EmpathyChatViewPriv *priv;
 
        g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
+       g_return_if_fail (EMPATHY_IS_THEME (theme));
 
        priv = GET_PRIV (view);
 
-       priv->irc_style = irc_style;
+       if (priv->theme) {
+               g_signal_handlers_disconnect_by_func (priv->theme,
+                                                     chat_view_theme_notify_cb,
+                                                     view);
+               g_object_unref (priv->theme);
+       }
+
+       priv->theme = g_object_ref (theme);
+
+       empathy_theme_update_view (theme, view);
+       g_signal_connect (priv->theme, "notify",
+                         G_CALLBACK (chat_view_theme_notify_cb),
+                         view);
+
+       /* FIXME: Redraw all messages using the new theme */
 }
 
 void
@@ -2034,3 +1486,85 @@ empathy_chat_view_set_is_group_chat (EmpathyChatView *view,
                                                  view);
        }
 }
+
+time_t
+empathy_chat_view_get_last_timestamp (EmpathyChatView *view)
+{
+       EmpathyChatViewPriv *priv;
+
+       g_return_val_if_fail (EMPATHY_IS_CHAT_VIEW (view), 0);
+
+       priv = GET_PRIV (view);
+
+       return priv->last_timestamp;
+}
+
+void
+empathy_chat_view_set_last_timestamp (EmpathyChatView *view,
+                                    time_t          timestamp)
+{
+       EmpathyChatViewPriv *priv;
+
+       g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
+
+       priv = GET_PRIV (view);
+
+       priv->last_timestamp = timestamp;
+}
+
+EmpathyChatViewBlock
+empathy_chat_view_get_last_block_type (EmpathyChatView *view)
+{
+       EmpathyChatViewPriv *priv;
+
+       g_return_val_if_fail (EMPATHY_IS_CHAT_VIEW (view), 0);
+
+       priv = GET_PRIV (view);
+
+       return priv->last_block_type;
+}
+
+void
+empathy_chat_view_set_last_block_type (EmpathyChatView      *view, 
+                                      EmpathyChatViewBlock  block_type)
+{
+       EmpathyChatViewPriv *priv;
+
+       g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
+
+       priv = GET_PRIV (view);
+
+       priv->last_block_type = block_type;
+}
+
+EmpathyContact *
+empathy_chat_view_get_last_contact (EmpathyChatView *view)
+{
+       EmpathyChatViewPriv *priv;
+
+       g_return_val_if_fail (EMPATHY_IS_CHAT_VIEW (view), NULL);
+
+       priv = GET_PRIV (view);
+
+       return priv->last_contact;
+}
+
+void
+empathy_chat_view_set_last_contact (EmpathyChatView *view, EmpathyContact *contact)
+{
+       EmpathyChatViewPriv *priv;
+
+       g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
+
+       priv = GET_PRIV (view);
+
+       if (priv->last_contact) {
+               g_object_unref (priv->last_contact);
+               priv->last_contact = NULL;
+       }
+
+       if (contact) {
+               priv->last_contact = g_object_ref (contact);
+       }
+}
+