]> git.0d.be Git - empathy.git/blobdiff - libempathy-gtk/empathy-chat.c
Always set urgency hint on p2p chat windows when receiving a message.
[empathy.git] / libempathy-gtk / empathy-chat.c
index 082f33c92723f1b3022df350f7772e00f6eb168d..3810e209b19354575c807a140b67cf74d1a45e04 100644 (file)
@@ -25,7 +25,7 @@
  *          Xavier Claessens <xclaesse@gmail.com>
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <string.h>
 #include <stdlib.h>
 #include <gtk/gtk.h>
 
 #include <libmissioncontrol/mission-control.h>
-
 #include <telepathy-glib/util.h>
 
-#include <libempathy/empathy-contact-manager.h>
 #include <libempathy/empathy-log-manager.h>
+#include <libempathy/empathy-contact-list.h>
 #include <libempathy/empathy-debug.h>
 #include <libempathy/empathy-utils.h>
 
 #include "empathy-chat.h"
-#include "empathy-geometry.h"
 #include "empathy-conf.h"
 #include "empathy-spell.h"
 #include "empathy-spell-dialog.h"
+#include "empathy-contact-list-store.h"
+#include "empathy-contact-list-view.h"
 #include "empathy-ui-utils.h"
-#include "empathy-gtk-marshal.h"
 
 #define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_CHAT, EmpathyChatPriv))
 
 
 #define CHAT_DIR_CREATE_MODE  (S_IRUSR | S_IWUSR | S_IXUSR)
 #define CHAT_FILE_CREATE_MODE (S_IRUSR | S_IWUSR)
-
 #define IS_ENTER(v) (v == GDK_Return || v == GDK_ISO_Enter || v == GDK_KP_Enter)
-
 #define MAX_INPUT_HEIGHT 150
-
 #define COMPOSING_STOP_TIMEOUT 5
 
 struct _EmpathyChatPriv {
-       EmpathyLogManager     *log_manager;
-       EmpathyTpChat         *tp_chat;
-       McAccount             *account;
-       MissionControl        *mc;
-       GtkWidget             *widget;
-       guint                  composing_stop_timeout_id;
-       gboolean               sensitive;
-       gchar                 *id;
-       GSList                *sent_messages;
-       gint                   sent_messages_index;
-       GList                 *compositors;
-       guint                  scroll_idle_id;
-       gboolean               first_tp_chat;
-       GList                 *backlog_messages;
-       gboolean               is_first_char;
-       guint                  block_events_timeout_id;
-       TpHandleType           handle_type;
-       gchar                 *name;
-       gchar                 *tooltip;
-       const gchar           *icon_name;
+       EmpathyTpChat     *tp_chat;
+       McAccount         *account;
+       gchar             *id;
+       gchar             *name;
+       gchar             *subject;
+       EmpathyContact    *remote_contact;
+
+       EmpathyLogManager *log_manager;
+       MissionControl    *mc;
+       GSList            *sent_messages;
+       gint               sent_messages_index;
+       GList             *compositors;
+       GList             *backlog_messages;
+       GCompletion       *completion;
+       guint              composing_stop_timeout_id;
+       guint              block_events_timeout_id;
+       TpHandleType       handle_type;
+       gpointer           token;
+       gint               contacts_width;
+
+       GtkWidget         *widget;
+       GtkWidget         *hpaned;
+       GtkWidget         *vbox_left;
+       GtkWidget         *scrolled_window_chat;
+       GtkWidget         *scrolled_window_input;
+       GtkWidget         *scrolled_window_contacts;
+       GtkWidget         *hbox_topic;
+       GtkWidget         *label_topic;
+       EmpathyContactListView *view;
+       EmpathyContactListStore *store;
+
        /* Used to automatically shrink a window that has temporarily
         * grown due to long input. 
         */
-       gint                   padding_height;
-       gint                   default_window_height;
-       gint                   last_input_height;
-       gboolean               vscroll_visible;
+       gint               padding_height;
+       gint               default_window_height;
+       gint               last_input_height;
+       gboolean           vscroll_visible;
+       gboolean           is_first_char;
 };
 
 static void empathy_chat_class_init (EmpathyChatClass *klass);
@@ -106,15 +114,16 @@ enum {
 enum {
        PROP_0,
        PROP_TP_CHAT,
+       PROP_ACCOUNT,
+       PROP_ID,
        PROP_NAME,
-       PROP_TOOLTIP,
-       PROP_ICON_NAME,
-       PROP_WIDGET
+       PROP_SUBJECT,
+       PROP_REMOTE_CONTACT,
 };
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE (EmpathyChat, empathy_chat, G_TYPE_OBJECT);
+G_DEFINE_TYPE (EmpathyChat, empathy_chat, GTK_TYPE_BIN);
 
 static void
 chat_get_property (GObject    *object,
@@ -128,17 +137,20 @@ chat_get_property (GObject    *object,
        case PROP_TP_CHAT:
                g_value_set_object (value, priv->tp_chat);
                break;
+       case PROP_ACCOUNT:
+               g_value_set_object (value, priv->account);
+               break;
        case PROP_NAME:
                g_value_set_string (value, priv->name);
                break;
-       case PROP_TOOLTIP:
-               g_value_set_string (value, priv->tooltip);
+       case PROP_ID:
+               g_value_set_string (value, priv->id);
                break;
-       case PROP_ICON_NAME:
-               g_value_set_string (value, priv->icon_name);
+       case PROP_SUBJECT:
+               g_value_set_string (value, priv->subject);
                break;
-       case PROP_WIDGET:
-               g_value_set_object (value, priv->widget);
+       case PROP_REMOTE_CONTACT:
+               g_value_set_object (value, priv->remote_contact);
                break;
        default:
                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -156,8 +168,7 @@ chat_set_property (GObject      *object,
 
        switch (param_id) {
        case PROP_TP_CHAT:
-               empathy_chat_set_tp_chat (chat,
-                                         EMPATHY_TP_CHAT (g_value_get_object (value)));
+               empathy_chat_set_tp_chat (chat, EMPATHY_TP_CHAT (g_value_get_object (value)));
                break;
        default:
                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -254,55 +265,6 @@ chat_composing_stop (EmpathyChat *chat)
                                   TP_CHANNEL_CHAT_STATE_ACTIVE);
 }
 
-static void
-chat_finalize (GObject *object)
-{
-       EmpathyChat     *chat;
-       EmpathyChatPriv *priv;
-
-       chat = EMPATHY_CHAT (object);
-       priv = GET_PRIV (chat);
-
-       empathy_debug (DEBUG_DOMAIN, "Finalized: %p", object);
-
-       g_slist_foreach (priv->sent_messages, (GFunc) g_free, NULL);
-       g_slist_free (priv->sent_messages);
-
-       g_list_foreach (priv->compositors, (GFunc) g_object_unref, NULL);
-       g_list_free (priv->compositors);
-
-       chat_composing_remove_timeout (chat);
-       g_object_unref (priv->log_manager);
-
-       dbus_g_proxy_disconnect_signal (DBUS_G_PROXY (priv->mc), "AccountStatusChanged",
-                                       G_CALLBACK (chat_status_changed_cb),
-                                       chat);
-       g_object_unref (priv->mc);
-
-
-       if (priv->tp_chat) {
-               g_object_unref (priv->tp_chat);
-       }
-
-       if (priv->account) {
-               g_object_unref (priv->account);
-       }
-
-       if (priv->scroll_idle_id) {
-               g_source_remove (priv->scroll_idle_id);
-       }
-
-       if (priv->block_events_timeout_id) {
-               g_source_remove (priv->block_events_timeout_id);
-       }
-
-       g_free (priv->id);
-       g_free (priv->name);
-       g_free (priv->tooltip);
-
-       G_OBJECT_CLASS (empathy_chat_parent_class)->finalize (object);
-}
-
 static void
 chat_destroy_cb (EmpathyTpChat *tp_chat,
                 EmpathyChat    *chat)
@@ -314,15 +276,11 @@ chat_destroy_cb (EmpathyTpChat *tp_chat,
        if (priv->tp_chat) {
                g_object_unref (priv->tp_chat);
                priv->tp_chat = NULL;
+               g_object_notify (G_OBJECT (chat), "tp-chat");
        }
-       priv->sensitive = FALSE;
 
        empathy_chat_view_append_event (chat->view, _("Disconnected"));
        gtk_widget_set_sensitive (chat->input_text_view, FALSE);
-
-       if (priv->block_events_timeout_id != 0) {
-               g_source_remove (priv->block_events_timeout_id);
-       }
 }
 
 static void 
@@ -462,7 +420,6 @@ chat_input_text_view_send (EmpathyChat *chat)
        gtk_text_buffer_set_text (buffer, "", -1);
 
        chat_send (chat, msg);
-
        g_free (msg);
 
        priv->is_first_char = TRUE;
@@ -579,16 +536,12 @@ chat_message_received_cb (EmpathyTpChat  *tp_chat,
 
        empathy_chat_view_append_message (chat->view, message);
 
-       if (empathy_chat_should_play_sound (chat)) {
-               // FIXME: empathy_sound_play (EMPATHY_SOUND_CHAT);
-       }
-
        /* We received a message so the contact is no more composing */
        chat_state_changed_cb (tp_chat, sender,
                               TP_CHANNEL_CHAT_STATE_ACTIVE,
                               chat);
 
-       g_signal_emit (chat, signals[NEW_MESSAGE], 0, message, FALSE);
+       g_signal_emit (chat, signals[NEW_MESSAGE], 0, message);
 }
 
 static void
@@ -628,6 +581,66 @@ chat_send_error_cb (EmpathyTpChat          *tp_chat,
        g_free (str);
 }
 
+static void
+chat_property_changed_cb (EmpathyTpChat *tp_chat,
+                         const gchar   *name,
+                         GValue        *value,
+                         EmpathyChat   *chat)
+{
+       EmpathyChatPriv *priv = GET_PRIV (chat);
+
+       if (!tp_strdiff (name, "subject")) {
+               g_free (priv->subject);
+               priv->subject = g_value_dup_string (value);
+               g_object_notify (G_OBJECT (chat), "subject");
+
+               if (G_STR_EMPTY (priv->subject)) {
+                       gtk_widget_hide (priv->hbox_topic);
+               } else {
+                       gtk_label_set_text (GTK_LABEL (priv->label_topic), priv->subject);
+                       gtk_widget_show (priv->hbox_topic);
+               }
+               if (priv->block_events_timeout_id == 0) {
+                       gchar *str;
+
+                       if (!G_STR_EMPTY (priv->subject)) {
+                               str = g_strdup_printf (_("Topic set to: %s"), priv->subject);
+                       } else {
+                               str = g_strdup (_("No topic defined"));
+                       }
+                       empathy_chat_view_append_event (EMPATHY_CHAT (chat)->view, str);
+                       g_free (str);
+               }
+       }
+       else if (!tp_strdiff (name, "name")) {
+               g_free (priv->name);
+               priv->name = g_value_dup_string (value);
+               g_object_notify (G_OBJECT (chat), "name");
+       }
+}
+
+static gboolean
+chat_get_is_command (const gchar *str)
+{
+       g_return_val_if_fail (str != NULL, FALSE);
+
+       if (str[0] != '/') {
+               return FALSE;
+       }
+
+       if (g_str_has_prefix (str, "/me")) {
+               return TRUE;
+       }
+       else if (g_str_has_prefix (str, "/nick")) {
+               return TRUE;
+       }
+       else if (g_str_has_prefix (str, "/topic")) {
+               return TRUE;
+       }
+
+       return FALSE;
+}
+
 static void
 chat_input_text_buffer_changed_cb (GtkTextBuffer *buffer,
                                   EmpathyChat    *chat)
@@ -656,7 +669,7 @@ chat_input_text_buffer_changed_cb (GtkTextBuffer *buffer,
                GtkAllocation  *allocation;
 
                /* Save the window's size */
-               dialog = empathy_get_toplevel_window (priv->widget);
+               dialog = empathy_get_toplevel_window (GTK_WIDGET (chat));
                if (dialog) {
                        gtk_window_get_size (GTK_WINDOW (dialog), NULL, &window_height);
                        gtk_widget_size_request (chat->input_text_view, &req);
@@ -709,7 +722,7 @@ chat_input_text_buffer_changed_cb (GtkTextBuffer *buffer,
                str = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
 
                /* spell check string */
-               if (!empathy_chat_get_is_command (str)) {
+               if (!chat_get_is_command (str)) {
                        correct = empathy_spell_check (str);
                } else {
                        correct = TRUE;
@@ -794,18 +807,87 @@ chat_input_key_press_event_cb (GtkWidget   *widget,
                /* Newline for shift/control-enter. */
                return FALSE;
        }
-       else if (!(event->state & GDK_CONTROL_MASK) &&
-                event->keyval == GDK_Page_Up) {
+       if (!(event->state & GDK_CONTROL_MASK) &&
+           event->keyval == GDK_Page_Up) {
                adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (text_view_sw));
                gtk_adjustment_set_value (adj, adj->value - adj->page_size);
-
                return TRUE;
        }
-       else if ((event->state & GDK_CONTROL_MASK) != GDK_CONTROL_MASK &&
-                event->keyval == GDK_Page_Down) {
+       if ((event->state & GDK_CONTROL_MASK) != GDK_CONTROL_MASK &&
+           event->keyval == GDK_Page_Down) {
                adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (text_view_sw));
                val = MIN (adj->value + adj->page_size, adj->upper - adj->page_size);
                gtk_adjustment_set_value (adj, val);
+               return TRUE;
+       }
+       if (!(event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) &&
+           event->keyval == GDK_Tab) {
+               GtkTextBuffer *buffer;
+               GtkTextIter    start, current;
+               gchar         *nick, *completed;
+               GList         *list, *completed_list;
+               gboolean       is_start_of_buffer;
+
+               buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (EMPATHY_CHAT (chat)->input_text_view));
+               gtk_text_buffer_get_iter_at_mark (buffer, &current, gtk_text_buffer_get_insert (buffer));
+
+               /* Get the start of the nick to complete. */
+               gtk_text_buffer_get_iter_at_mark (buffer, &start, gtk_text_buffer_get_insert (buffer));
+               gtk_text_iter_backward_word_start (&start);
+               is_start_of_buffer = gtk_text_iter_is_start (&start);
+
+               list = empathy_contact_list_get_members (EMPATHY_CONTACT_LIST (priv->tp_chat));
+               g_completion_add_items (priv->completion, list);
+
+               nick = gtk_text_buffer_get_text (buffer, &start, &current, FALSE);
+               completed_list = g_completion_complete (priv->completion,
+                                                       nick,
+                                                       &completed);
+
+               g_free (nick);
+
+               if (completed) {
+                       guint        len;
+                       const gchar *text;
+                       gchar       *complete_char = NULL;
+
+                       gtk_text_buffer_delete (buffer, &start, &current);
+
+                       len = g_list_length (completed_list);
+
+                       if (len == 1) {
+                               /* If we only have one hit, use that text
+                                * instead of the text in completed since the
+                                * completed text will use the typed string
+                                * which might be cased all wrong.
+                                * Fixes #120876
+                                * */
+                               text = empathy_contact_get_name (completed_list->data);
+                       } else {
+                               text = completed;
+                       }
+
+                       gtk_text_buffer_insert_at_cursor (buffer, text, strlen (text));
+
+                       if (len == 1 && is_start_of_buffer &&
+                           empathy_conf_get_string (empathy_conf_get (),
+                                                    EMPATHY_PREFS_CHAT_NICK_COMPLETION_CHAR,
+                                                    &complete_char) &&
+                           complete_char != NULL) {
+                               gtk_text_buffer_insert_at_cursor (buffer,
+                                                                 complete_char,
+                                                                 strlen (complete_char));
+                               gtk_text_buffer_insert_at_cursor (buffer, " ", 1);
+                               g_free (complete_char);
+                       }
+
+                       g_free (completed);
+               }
+
+               g_completion_clear_items (priv->completion);
+
+               g_list_foreach (list, (GFunc) g_object_unref, NULL);
+               g_list_free (list);
 
                return TRUE;
        }
@@ -847,7 +929,9 @@ chat_text_view_scroll_hide_cb (GtkWidget  *widget,
        priv = GET_PRIV (chat);
 
        priv->vscroll_visible = FALSE;
-       g_signal_handlers_disconnect_by_func (widget, chat_text_view_scroll_hide_cb, chat);
+       g_signal_handlers_disconnect_by_func (widget,
+                                             chat_text_view_scroll_hide_cb,
+                                             chat);
 
        sw = gtk_widget_get_parent (chat->input_text_view);
        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
@@ -903,7 +987,7 @@ chat_text_view_size_allocate_cb (GtkWidget     *widget,
 
        view_allocation = &GTK_WIDGET (chat->view)->allocation;
 
-       dialog = empathy_get_toplevel_window (priv->widget);
+       dialog = empathy_get_toplevel_window (GTK_WIDGET (widget));
        gtk_window_get_size (dialog, NULL, &current_height);
 
        new_height = view_allocation->height + priv->padding_height + allocation->height - diff;
@@ -1081,21 +1165,6 @@ chat_text_populate_popup_cb (GtkTextView *view,
        gtk_widget_show (item);
 }
 
-static gboolean
-chat_scroll_down_idle_func (EmpathyChat *chat)
-{
-       EmpathyChatPriv *priv;
-
-       priv = GET_PRIV (chat);
-
-       empathy_chat_scroll_down (chat);
-       g_object_unref (chat);
-
-       priv->scroll_idle_id = 0;
-
-       return FALSE;
-}
-
 static void
 chat_add_logs (EmpathyChat *chat)
 {
@@ -1132,300 +1201,443 @@ chat_add_logs (EmpathyChat *chat)
 
        /* Turn back on scrolling */
        empathy_chat_view_scroll (chat->view, TRUE);
+}
 
-       /* Scroll to the most recent messages, we reference the chat
-        * for the duration of the scroll func.
-        */
-       priv->scroll_idle_id = g_idle_add ((GSourceFunc) chat_scroll_down_idle_func, 
-                                          g_object_ref (chat));
+static gint
+chat_contacts_completion_func (const gchar *s1,
+                              const gchar *s2,
+                              gsize        n)
+{
+       gchar *tmp, *nick1, *nick2;
+       gint   ret;
+
+       if (s1 == s2) {
+               return 0;
+       }
+       if (!s1 || !s2) {
+               return s1 ? -1 : +1;
+       }
+
+       tmp = g_utf8_normalize (s1, -1, G_NORMALIZE_DEFAULT);
+       nick1 = g_utf8_casefold (tmp, -1);
+       g_free (tmp);
+
+       tmp = g_utf8_normalize (s2, -1, G_NORMALIZE_DEFAULT);
+       nick2 = g_utf8_casefold (tmp, -1);
+       g_free (tmp);
+
+       ret = strncmp (nick1, nick2, n);
+
+       g_free (nick1);
+       g_free (nick2);
+
+       return ret;
 }
 
 static void
-empathy_chat_class_init (EmpathyChatClass *klass)
+chat_members_changed_cb (EmpathyTpChat  *tp_chat,
+                        EmpathyContact *contact,
+                        EmpathyContact *actor,
+                        guint           reason,
+                        gchar          *message,
+                        gboolean        is_member,
+                        EmpathyChat    *chat)
 {
-       GObjectClass *object_class;
+       EmpathyChatPriv *priv = GET_PRIV (chat);
 
-       object_class = G_OBJECT_CLASS (klass);
+       if (priv->block_events_timeout_id == 0) {
+               gchar *str;
 
-       object_class->finalize = chat_finalize;
-       object_class->get_property = chat_get_property;
-       object_class->set_property = chat_set_property;
+               empathy_contact_run_until_ready (contact,
+                                                EMPATHY_CONTACT_READY_NAME,
+                                                NULL);
 
-       g_object_class_install_property (object_class,
-                                        PROP_TP_CHAT,
-                                        g_param_spec_object ("tp-chat",
-                                                             "Empathy tp chat",
-                                                             "The tp chat object",
-                                                             EMPATHY_TYPE_TP_CHAT,
-                                                             G_PARAM_CONSTRUCT |
-                                                             G_PARAM_READWRITE));
-       g_object_class_install_property (object_class,
-                                        PROP_NAME,
-                                        g_param_spec_string ("name",
-                                                             "Chat's name",
-                                                             "The name of the chat",
-                                                             NULL,
-                                                             G_PARAM_READABLE));
-       g_object_class_install_property (object_class,
-                                        PROP_TOOLTIP,
-                                        g_param_spec_string ("tooltip",
-                                                             "Chat's tooltip",
-                                                             "The tooltip of the chat",
-                                                             NULL,
-                                                             G_PARAM_READABLE));
-       g_object_class_install_property (object_class,
-                                        PROP_ICON_NAME,
-                                        g_param_spec_string ("icon-name",
-                                                             "Chat's icon name",
-                                                             "The icon name of the chat",
-                                                             NULL,
-                                                             G_PARAM_READABLE));
-       g_object_class_install_property (object_class,
-                                        PROP_WIDGET,
-                                        g_param_spec_object ("widget",
-                                                             "Chat's widget",
-                                                             "The widget of the chat",
-                                                             GTK_TYPE_WIDGET,
-                                                             G_PARAM_READABLE));
+               if (is_member) {
+                       str = g_strdup_printf (_("%s has joined the room"),
+                                              empathy_contact_get_name (contact));
+               } else {
+                       str = g_strdup_printf (_("%s has left the room"),
+                                              empathy_contact_get_name (contact));
+               }
+               empathy_chat_view_append_event (chat->view, str);
+               g_free (str);
+       }
+}
 
-       signals[COMPOSING] =
-               g_signal_new ("composing",
-                             G_OBJECT_CLASS_TYPE (object_class),
-                             G_SIGNAL_RUN_LAST,
-                             0,
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__BOOLEAN,
-                             G_TYPE_NONE,
-                             1, G_TYPE_BOOLEAN);
+static void
+chat_set_show_contacts (EmpathyChat *chat, gboolean show)
+{
+       EmpathyChatPriv *priv = GET_PRIV (chat);
 
-       signals[NEW_MESSAGE] =
-               g_signal_new ("new-message",
-                             G_OBJECT_CLASS_TYPE (object_class),
-                             G_SIGNAL_RUN_LAST,
-                             0,
-                             NULL, NULL,
-                             _empathy_gtk_marshal_VOID__OBJECT_BOOLEAN,
-                             G_TYPE_NONE,
-                             2, EMPATHY_TYPE_MESSAGE, G_TYPE_BOOLEAN);
+       if (!priv->scrolled_window_contacts ||
+           GTK_WIDGET_VISIBLE (priv->scrolled_window_contacts) == show) {
+               return;
+       }
 
-       g_type_class_add_private (object_class, sizeof (EmpathyChatPriv));
+       if (show) {
+               gtk_widget_show (priv->scrolled_window_contacts);
+               gtk_paned_set_position (GTK_PANED (priv->hpaned),
+                                       priv->contacts_width);
+       } else {
+               priv->contacts_width = gtk_paned_get_position (GTK_PANED (priv->hpaned));
+               gtk_widget_hide (priv->scrolled_window_contacts);
+       }
 }
 
 static void
-empathy_chat_init (EmpathyChat *chat)
+chat_remote_contact_changed_cb (EmpathyChat *chat)
 {
        EmpathyChatPriv *priv = GET_PRIV (chat);
-       GtkTextBuffer  *buffer;
-
-       chat->view = empathy_chat_view_new ();
-       chat->input_text_view = gtk_text_view_new ();
 
-       priv->is_first_char = TRUE;
+       if (priv->remote_contact) {
+               g_object_unref (priv->remote_contact);
+               priv->remote_contact = NULL;
+       }
 
-       g_object_set (chat->input_text_view,
-                     "pixels-above-lines", 2,
-                     "pixels-below-lines", 2,
-                     "pixels-inside-wrap", 1,
-                     "right-margin", 2,
-                     "left-margin", 2,
-                     "wrap-mode", GTK_WRAP_WORD_CHAR,
-                     NULL);
+       priv->remote_contact = empathy_tp_chat_get_remote_contact (priv->tp_chat);
+       if (priv->remote_contact) {
+               g_object_ref (priv->remote_contact);
+       }
 
-       priv->log_manager = empathy_log_manager_new ();
-       priv->default_window_height = -1;
-       priv->vscroll_visible = FALSE;
-       priv->sensitive = TRUE;
-       priv->sent_messages = NULL;
-       priv->sent_messages_index = -1;
-       priv->first_tp_chat = TRUE;
-       priv->mc = empathy_mission_control_new ();
+       chat_set_show_contacts (chat, priv->remote_contact == NULL);
 
-       dbus_g_proxy_connect_signal (DBUS_G_PROXY (priv->mc), "AccountStatusChanged",
-                                    G_CALLBACK (chat_status_changed_cb),
-                                    chat, NULL);
+       g_object_notify (G_OBJECT (chat), "remote-contact");
+}
 
-       g_signal_connect (chat->input_text_view,
-                         "key_press_event",
-                         G_CALLBACK (chat_input_key_press_event_cb),
-                         chat);
+static void
+chat_create_ui (EmpathyChat *chat)
+{
+       EmpathyChatPriv *priv = GET_PRIV (chat);
+       GladeXML        *glade;
+       GList           *list = NULL; 
+       gchar           *filename;
+       GtkTextBuffer   *buffer;
 
-       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (chat->input_text_view));
-       g_signal_connect (buffer,
-                         "changed",
-                         G_CALLBACK (chat_input_text_buffer_changed_cb),
-                         chat);
-       g_signal_connect (chat->view,
-                         "focus_in_event",
+       filename = empathy_file_lookup ("empathy-chat.glade",
+                                       "libempathy-gtk");
+       glade = empathy_glade_get_file (filename,
+                                       "chat_widget",
+                                       NULL,
+                                       "chat_widget", &priv->widget,
+                                       "hpaned", &priv->hpaned,
+                                       "vbox_left", &priv->vbox_left,
+                                       "scrolled_window_chat", &priv->scrolled_window_chat,
+                                       "scrolled_window_input", &priv->scrolled_window_input,
+                                       "hbox_topic", &priv->hbox_topic,
+                                       "label_topic", &priv->label_topic,
+                                       "scrolled_window_contacts", &priv->scrolled_window_contacts,
+                                       NULL);
+       g_free (filename);
+       g_object_unref (glade);
+
+       /* Add message GtkTextView. */
+       chat->view = empathy_chat_view_new ();
+       g_signal_connect (chat->view, "focus_in_event",
                          G_CALLBACK (chat_text_view_focus_in_event_cb),
                          chat);
-
-       g_signal_connect (chat->input_text_view,
-                         "size_allocate",
+       gtk_container_add (GTK_CONTAINER (priv->scrolled_window_chat),
+                          GTK_WIDGET (chat->view));
+       gtk_widget_show (GTK_WIDGET (chat->view));
+
+       /* Add input GtkTextView */
+       chat->input_text_view = g_object_new (GTK_TYPE_TEXT_VIEW,
+                                             "pixels-above-lines", 2,
+                                             "pixels-below-lines", 2,
+                                             "pixels-inside-wrap", 1,
+                                             "right-margin", 2,
+                                             "left-margin", 2,
+                                             "wrap-mode", GTK_WRAP_WORD_CHAR,
+                                             NULL);
+       g_signal_connect (chat->input_text_view, "key_press_event",
+                         G_CALLBACK (chat_input_key_press_event_cb),
+                         chat);
+       g_signal_connect (chat->input_text_view, "size_allocate",
                          G_CALLBACK (chat_text_view_size_allocate_cb),
                          chat);
-
-       g_signal_connect (chat->input_text_view,
-                         "realize",
+       g_signal_connect (chat->input_text_view, "realize",
                          G_CALLBACK (chat_text_view_realize_cb),
                          chat);
-
-       g_signal_connect (GTK_TEXT_VIEW (chat->input_text_view),
-                         "populate_popup",
+       g_signal_connect (chat->input_text_view, "populate_popup",
                          G_CALLBACK (chat_text_populate_popup_cb),
                          chat);
-
-       /* create misspelt words identification tag */
-       gtk_text_buffer_create_tag (buffer,
-                                   "misspelled",
+       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (chat->input_text_view));
+       g_signal_connect (buffer, "changed",
+                         G_CALLBACK (chat_input_text_buffer_changed_cb),
+                         chat);
+       gtk_text_buffer_create_tag (buffer, "misspelled",
                                    "underline", PANGO_UNDERLINE_ERROR,
                                    NULL);
+       gtk_container_add (GTK_CONTAINER (priv->scrolled_window_input),
+                          chat->input_text_view);
+       gtk_widget_show (chat->input_text_view);
+
+       /* Create contact list */
+       priv->store = empathy_contact_list_store_new (EMPATHY_CONTACT_LIST (priv->tp_chat));
+       priv->view = empathy_contact_list_view_new (priv->store,
+                                                   EMPATHY_CONTACT_LIST_FEATURE_CONTACT_CHAT |
+                                                   EMPATHY_CONTACT_LIST_FEATURE_CONTACT_CALL |
+                                                   EMPATHY_CONTACT_LIST_FEATURE_CONTACT_LOG |
+                                                   EMPATHY_CONTACT_LIST_FEATURE_CONTACT_FT |
+                                                   EMPATHY_CONTACT_LIST_FEATURE_CONTACT_INVITE |
+                                                   EMPATHY_CONTACT_LIST_FEATURE_CONTACT_INFO);
+       gtk_container_add (GTK_CONTAINER (priv->scrolled_window_contacts),
+                          GTK_WIDGET (priv->view));
+       gtk_widget_show (GTK_WIDGET (priv->view));
+
+       /* Initialy hide the topic, will be shown if not empty */
+       gtk_widget_hide (priv->hbox_topic);
+
+       /* Show/Hide contact list */
+       chat_set_show_contacts (chat, priv->remote_contact == NULL);
+
+       /* Set widget focus order */
+       list = g_list_append (NULL, priv->scrolled_window_input);
+       gtk_container_set_focus_chain (GTK_CONTAINER (priv->vbox_left), list);
+       g_list_free (list);
+
+       list = g_list_append (NULL, priv->vbox_left);
+       list = g_list_append (list, priv->scrolled_window_contacts);
+       gtk_container_set_focus_chain (GTK_CONTAINER (priv->hpaned), list);
+       g_list_free (list);
+
+       list = g_list_append (NULL, priv->hpaned);
+       list = g_list_append (list, priv->hbox_topic);
+       gtk_container_set_focus_chain (GTK_CONTAINER (priv->widget), list);
+       g_list_free (list);
+
+       /* Add the main widget in the chat widget */
+       gtk_container_add (GTK_CONTAINER (chat), priv->widget);
 }
 
-EmpathyChat *
-empathy_chat_new (EmpathyTpChat *tp_chat)
+static void
+chat_size_request (GtkWidget      *widget,
+                  GtkRequisition *requisition)
 {
-       return g_object_new (EMPATHY_TYPE_CHAT, "tp-chat", tp_chat, NULL);
-}
+  GtkBin *bin = GTK_BIN (widget);
 
-gboolean
-empathy_chat_get_is_command (const gchar *str)
-{
-       g_return_val_if_fail (str != NULL, FALSE);
+  requisition->width = GTK_CONTAINER (widget)->border_width * 2;
+  requisition->height = GTK_CONTAINER (widget)->border_width * 2;
 
-       if (str[0] != '/') {
-               return FALSE;
-       }
+  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+    {
+      GtkRequisition child_requisition;
+      
+      gtk_widget_size_request (bin->child, &child_requisition);
 
-       if (g_str_has_prefix (str, "/me")) {
-               return TRUE;
-       }
-       else if (g_str_has_prefix (str, "/nick")) {
-               return TRUE;
-       }
-       else if (g_str_has_prefix (str, "/topic")) {
-               return TRUE;
-       }
+      requisition->width += child_requisition.width;
+      requisition->height += child_requisition.height;
+    }
+}
 
-       return FALSE;
+static void
+chat_size_allocate (GtkWidget     *widget,
+                   GtkAllocation *allocation)
+{
+  GtkBin *bin = GTK_BIN (widget);
+  GtkAllocation child_allocation;
+  
+  widget->allocation = *allocation;
+
+  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+    {
+      child_allocation.x = allocation->x + GTK_CONTAINER (widget)->border_width;
+      child_allocation.y = allocation->y + GTK_CONTAINER (widget)->border_width;
+      child_allocation.width = MAX (allocation->width - GTK_CONTAINER (widget)->border_width * 2, 0);
+      child_allocation.height = MAX (allocation->height - GTK_CONTAINER (widget)->border_width * 2, 0);
+
+      gtk_widget_size_allocate (bin->child, &child_allocation);
+    }
 }
 
-void
-empathy_chat_correct_word (EmpathyChat  *chat,
-                         GtkTextIter  start,
-                         GtkTextIter  end,
-                         const gchar *new_word)
+static void
+chat_finalize (GObject *object)
 {
-       GtkTextBuffer *buffer;
+       EmpathyChat     *chat;
+       EmpathyChatPriv *priv;
 
-       g_return_if_fail (chat != NULL);
-       g_return_if_fail (new_word != NULL);
+       chat = EMPATHY_CHAT (object);
+       priv = GET_PRIV (chat);
 
-       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (chat->input_text_view));
+       empathy_debug (DEBUG_DOMAIN, "Finalized: %p", object);
 
-       gtk_text_buffer_delete (buffer, &start, &end);
-       gtk_text_buffer_insert (buffer, &start,
-                               new_word,
-                               -1);
-}
+       g_slist_foreach (priv->sent_messages, (GFunc) g_free, NULL);
+       g_slist_free (priv->sent_messages);
 
-const gchar *
-empathy_chat_get_name (EmpathyChat *chat)
-{
-       EmpathyChatPriv *priv = GET_PRIV (chat);
+       g_list_foreach (priv->compositors, (GFunc) g_object_unref, NULL);
+       g_list_free (priv->compositors);
 
-       g_return_val_if_fail (EMPATHY_IS_CHAT (chat), NULL);
+       g_list_foreach (priv->backlog_messages, (GFunc) g_object_unref, NULL);
+       g_list_free (priv->backlog_messages);
 
-       return priv->name;
-}
+       chat_composing_remove_timeout (chat);
 
-const gchar *
-empathy_chat_get_tooltip (EmpathyChat *chat)
-{
-       EmpathyChatPriv *priv = GET_PRIV (chat);
+       empathy_disconnect_account_status_changed (priv->token);
+       g_object_unref (priv->mc);
+       g_object_unref (priv->log_manager);
+       g_object_unref (priv->store);
 
-       g_return_val_if_fail (EMPATHY_IS_CHAT (chat), NULL);
+       if (priv->tp_chat) {
+               g_object_unref (priv->tp_chat);
+       }
+       if (priv->account) {
+               g_object_unref (priv->account);
+       }
+       if (priv->remote_contact) {
+               g_object_unref (priv->remote_contact);
+       }
 
-       return priv->tooltip;
+       if (priv->block_events_timeout_id) {
+               g_source_remove (priv->block_events_timeout_id);
+       }
+
+       g_free (priv->id);
+       g_free (priv->name);
+       g_free (priv->subject);
+
+       G_OBJECT_CLASS (empathy_chat_parent_class)->finalize (object);
 }
 
-const gchar *
-empathy_chat_get_status_icon_name (EmpathyChat *chat)
+static void
+chat_constructed (GObject *object)
 {
-       EmpathyChatPriv *priv = GET_PRIV (chat);
-
-       g_return_val_if_fail (EMPATHY_IS_CHAT (chat), NULL);
+       EmpathyChat *chat = EMPATHY_CHAT (object);
 
-       return priv->icon_name;
+       chat_create_ui (chat);
+       chat_add_logs (chat);
 }
 
-GtkWidget *
-empathy_chat_get_widget (EmpathyChat *chat)
+static void
+empathy_chat_class_init (EmpathyChatClass *klass)
 {
-       EmpathyChatPriv *priv = GET_PRIV (chat);
+       GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+       GObjectClass   *object_class = G_OBJECT_CLASS (klass);
 
-       g_return_val_if_fail (EMPATHY_IS_CHAT (chat), NULL);
+       object_class->finalize = chat_finalize;
+       object_class->get_property = chat_get_property;
+       object_class->set_property = chat_set_property;
+       object_class->constructed = chat_constructed;
 
-       return priv->widget;
-}
+       widget_class->size_request = chat_size_request;
+       widget_class->size_allocate = chat_size_allocate;
 
-gboolean 
-empathy_chat_is_connected (EmpathyChat *chat)
-{
-       EmpathyChatPriv *priv;
+       g_object_class_install_property (object_class,
+                                        PROP_TP_CHAT,
+                                        g_param_spec_object ("tp-chat",
+                                                             "Empathy tp chat",
+                                                             "The tp chat object",
+                                                             EMPATHY_TYPE_TP_CHAT,
+                                                             G_PARAM_CONSTRUCT |
+                                                             G_PARAM_READWRITE));
+       g_object_class_install_property (object_class,
+                                        PROP_ACCOUNT,
+                                        g_param_spec_object ("account",
+                                                             "Account of the chat",
+                                                             "The account of the chat",
+                                                             MC_TYPE_ACCOUNT,
+                                                             G_PARAM_READABLE));
+       g_object_class_install_property (object_class,
+                                        PROP_ID,
+                                        g_param_spec_string ("id",
+                                                             "Chat's id",
+                                                             "The id of the chat",
+                                                             NULL,
+                                                             G_PARAM_READABLE));
+       g_object_class_install_property (object_class,
+                                        PROP_NAME,
+                                        g_param_spec_string ("name",
+                                                             "Chat's name",
+                                                             "The name of the chat",
+                                                             NULL,
+                                                             G_PARAM_READABLE));
+       g_object_class_install_property (object_class,
+                                        PROP_SUBJECT,
+                                        g_param_spec_string ("subject",
+                                                             "Chat's subject",
+                                                             "The subject or topic of the chat",
+                                                             NULL,
+                                                             G_PARAM_READABLE));
+       g_object_class_install_property (object_class,
+                                        PROP_REMOTE_CONTACT,
+                                        g_param_spec_object ("remote-contact",
+                                                             "The remote contact",
+                                                             "The remote contact is any",
+                                                             EMPATHY_TYPE_CONTACT,
+                                                             G_PARAM_READABLE));
 
-       g_return_val_if_fail (EMPATHY_IS_CHAT (chat), FALSE);
+       signals[COMPOSING] =
+               g_signal_new ("composing",
+                             G_OBJECT_CLASS_TYPE (object_class),
+                             G_SIGNAL_RUN_LAST,
+                             0,
+                             NULL, NULL,
+                             g_cclosure_marshal_VOID__BOOLEAN,
+                             G_TYPE_NONE,
+                             1, G_TYPE_BOOLEAN);
 
-       priv = GET_PRIV (chat);
+       signals[NEW_MESSAGE] =
+               g_signal_new ("new-message",
+                             G_OBJECT_CLASS_TYPE (object_class),
+                             G_SIGNAL_RUN_LAST,
+                             0,
+                             NULL, NULL,
+                             g_cclosure_marshal_VOID__OBJECT,
+                             G_TYPE_NONE,
+                             1, EMPATHY_TYPE_MESSAGE);
 
-       return (priv->tp_chat != NULL);
+       g_type_class_add_private (object_class, sizeof (EmpathyChatPriv));
 }
 
-static const gchar *
-chat_get_window_id_for_geometry (EmpathyChat *chat)
+static gboolean
+chat_block_events_timeout_cb (gpointer data)
 {
-       gboolean separate_windows;
+       EmpathyChatPriv *priv = GET_PRIV (data);
 
-       empathy_conf_get_bool (empathy_conf_get (),
-                              EMPATHY_PREFS_UI_SEPARATE_CHAT_WINDOWS,
-                              &separate_windows);
+       priv->block_events_timeout_id = 0;
 
-       if (separate_windows) {
-               return empathy_chat_get_id (chat);
-       } else {
-               return "chat-window";
-       }
+       return FALSE;
 }
 
-void
-empathy_chat_save_geometry (EmpathyChat *chat,
-                          gint        x,
-                          gint        y,
-                          gint        w,
-                          gint        h)
+static void
+empathy_chat_init (EmpathyChat *chat)
 {
-       empathy_geometry_save (chat_get_window_id_for_geometry (chat), x, y, w, h);
+       EmpathyChatPriv *priv = GET_PRIV (chat);
+
+       priv->is_first_char = TRUE;
+       priv->log_manager = empathy_log_manager_new ();
+       priv->default_window_height = -1;
+       priv->vscroll_visible = FALSE;
+       priv->sent_messages = NULL;
+       priv->sent_messages_index = -1;
+       priv->mc = empathy_mission_control_new ();
+
+       priv->token = empathy_connect_to_account_status_changed (priv->mc,
+                                                  G_CALLBACK (chat_status_changed_cb),
+                                                  chat, NULL);
+
+       /* Block events for some time to avoid having "has come online" or
+        * "joined" messages. */
+       priv->block_events_timeout_id =
+               g_timeout_add_seconds (1, chat_block_events_timeout_cb, chat);
+
+       /* Add nick name completion */
+       priv->completion = g_completion_new ((GCompletionFunc) empathy_contact_get_name);
+       g_completion_set_compare (priv->completion, chat_contacts_completion_func);
 }
 
-void
-empathy_chat_load_geometry (EmpathyChat *chat,
-                          gint       *x,
-                          gint       *y,
-                          gint       *w,
-                          gint       *h)
+EmpathyChat *
+empathy_chat_new (EmpathyTpChat *tp_chat)
 {
-       empathy_geometry_load (chat_get_window_id_for_geometry (chat), x, y, w, h);
+       return g_object_new (EMPATHY_TYPE_CHAT, "tp-chat", tp_chat, NULL);
 }
 
-static gboolean
-chat_block_events_timeout_cb (gpointer data)
+EmpathyTpChat *
+empathy_chat_get_tp_chat (EmpathyChat *chat)
 {
-       EmpathyChat     *chat = EMPATHY_CHAT (data);
        EmpathyChatPriv *priv = GET_PRIV (chat);
 
-       chat->block_events = FALSE;
-       priv->block_events_timeout_id = 0;
+       g_return_val_if_fail (EMPATHY_IS_CHAT (chat), NULL);
 
-       return FALSE;
+       return priv->tp_chat;
 }
 
 void
@@ -1433,10 +1645,10 @@ empathy_chat_set_tp_chat (EmpathyChat   *chat,
                          EmpathyTpChat *tp_chat)
 {
        EmpathyChatPriv *priv;
-       TpChan          *tp_chan;
 
        g_return_if_fail (EMPATHY_IS_CHAT (chat));
        g_return_if_fail (EMPATHY_IS_TP_CHAT (tp_chat));
+       g_return_if_fail (empathy_tp_chat_is_ready (tp_chat));
 
        priv = GET_PRIV (chat);
 
@@ -1444,42 +1656,17 @@ empathy_chat_set_tp_chat (EmpathyChat   *chat,
                return;
        }
 
-       /* Block events for some time to avoid having "has come online" or
-        * "joined" messages. */
-       chat->block_events = TRUE;
-       if (priv->block_events_timeout_id != 0) {
-               g_source_remove (priv->block_events_timeout_id);
-       }
-       priv->block_events_timeout_id =
-               g_timeout_add_seconds (1, chat_block_events_timeout_cb, chat);
-
        if (priv->tp_chat) {
-               g_signal_handlers_disconnect_by_func (priv->tp_chat,
-                                                     chat_message_received_cb,
-                                                     chat);
-               g_signal_handlers_disconnect_by_func (priv->tp_chat,
-                                                     chat_send_error_cb,
-                                                     chat);
-               g_signal_handlers_disconnect_by_func (priv->tp_chat,
-                                                     chat_destroy_cb,
-                                                     chat);
                g_object_unref (priv->tp_chat);
        }
        if (priv->account) {
                g_object_unref (priv->account);
        }
-
        g_free (priv->id);
+
        priv->tp_chat = g_object_ref (tp_chat);
        priv->id = g_strdup (empathy_tp_chat_get_id (tp_chat));
        priv->account = g_object_ref (empathy_tp_chat_get_account (tp_chat));
-       tp_chan = empathy_tp_chat_get_channel (tp_chat);
-       priv->handle_type = tp_chan->handle_type;
-
-       if (priv->first_tp_chat) {
-               chat_add_logs (chat);
-               priv->first_tp_chat = FALSE;
-       }
 
        g_signal_connect (tp_chat, "message-received",
                          G_CALLBACK (chat_message_received_cb),
@@ -1490,35 +1677,95 @@ empathy_chat_set_tp_chat (EmpathyChat   *chat,
        g_signal_connect (tp_chat, "chat-state-changed",
                          G_CALLBACK (chat_state_changed_cb),
                          chat);
+       g_signal_connect (tp_chat, "property-changed",
+                         G_CALLBACK (chat_property_changed_cb),
+                         chat);
+       g_signal_connect (tp_chat, "members-changed",
+                         G_CALLBACK (chat_members_changed_cb),
+                         chat);
+       g_signal_connect_swapped (tp_chat, "notify::remote-contact",
+                                 G_CALLBACK (chat_remote_contact_changed_cb),
+                                 chat);
        g_signal_connect (tp_chat, "destroy",
                          G_CALLBACK (chat_destroy_cb),
                          chat);
 
-       if (!priv->sensitive) {
+       chat_remote_contact_changed_cb (chat);
+
+       if (chat->input_text_view) {
                gtk_widget_set_sensitive (chat->input_text_view, TRUE);
-               empathy_chat_view_append_event (chat->view, _("Connected"));
-               priv->sensitive = TRUE;
+               if (priv->block_events_timeout_id == 0) {
+                       empathy_chat_view_append_event (chat->view, _("Connected"));
+               }
        }
 
        g_object_notify (G_OBJECT (chat), "tp-chat");
+       g_object_notify (G_OBJECT (chat), "id");
+       g_object_notify (G_OBJECT (chat), "account");
+}
+
+McAccount *
+empathy_chat_get_account (EmpathyChat *chat)
+{
+       EmpathyChatPriv *priv = GET_PRIV (chat);
+
+       g_return_val_if_fail (EMPATHY_IS_CHAT (chat), NULL);
+
+       return priv->account;
 }
 
 const gchar *
 empathy_chat_get_id (EmpathyChat *chat)
 {
-       EmpathyChatPriv *priv;
+       EmpathyChatPriv *priv = GET_PRIV (chat);
 
-       priv = GET_PRIV (chat);
+       g_return_val_if_fail (EMPATHY_IS_CHAT (chat), NULL);
 
        return priv->id;
 }
 
-McAccount *
-empathy_chat_get_account (EmpathyChat *chat)
+const gchar *
+empathy_chat_get_name (EmpathyChat *chat)
 {
        EmpathyChatPriv *priv = GET_PRIV (chat);
 
-       return priv->account;
+       g_return_val_if_fail (EMPATHY_IS_CHAT (chat), NULL);
+
+       return priv->name;
+}
+
+const gchar *
+empathy_chat_get_subject (EmpathyChat *chat)
+{
+       EmpathyChatPriv *priv = GET_PRIV (chat);
+
+       g_return_val_if_fail (EMPATHY_IS_CHAT (chat), NULL);
+
+       return priv->subject;
+}
+
+EmpathyContact *
+empathy_chat_get_remote_contact (EmpathyChat *chat)
+{
+       EmpathyChatPriv *priv = GET_PRIV (chat);
+
+       g_return_val_if_fail (EMPATHY_IS_CHAT (chat), NULL);
+
+       return priv->remote_contact;
+}
+
+guint
+empathy_chat_get_members_count (EmpathyChat *chat)
+{
+       EmpathyChatPriv *priv = GET_PRIV (chat);
+
+       g_return_val_if_fail (EMPATHY_IS_CHAT (chat), 0);
+
+       if (priv->tp_chat) {
+               return empathy_tp_chat_get_members_count (priv->tp_chat);
+       }
+
+       return 0;
 }
 
 void
@@ -1590,88 +1837,22 @@ empathy_chat_paste (EmpathyChat *chat)
        gtk_text_buffer_paste_clipboard (buffer, clipboard, NULL, TRUE);
 }
 
-gboolean
-empathy_chat_should_play_sound (EmpathyChat *chat)
-{
-       EmpathyChatPriv *priv = GET_PRIV (chat);
-       GtkWindow       *window;
-       gboolean         has_focus = FALSE;
-
-       g_return_val_if_fail (EMPATHY_IS_CHAT (chat), FALSE);
-
-       window = empathy_get_toplevel_window (priv->widget);
-       if (window) {
-               g_object_get (window, "has-toplevel-focus", &has_focus, NULL);
-       }
-
-       return !has_focus;
-}
-
-gboolean
-empathy_chat_should_highlight_nick (EmpathyMessage *message)
+void
+empathy_chat_correct_word (EmpathyChat  *chat,
+                         GtkTextIter  start,
+                         GtkTextIter  end,
+                         const gchar *new_word)
 {
-       EmpathyContact *contact;
-       const gchar   *msg, *to;
-       gchar         *cf_msg, *cf_to;
-       gchar         *ch;
-       gboolean       ret_val;
-
-       g_return_val_if_fail (EMPATHY_IS_MESSAGE (message), FALSE);
-
-       empathy_debug (DEBUG_DOMAIN, "Highlighting nickname");
-
-       ret_val = FALSE;
-
-       msg = empathy_message_get_body (message);
-       if (!msg) {
-               return FALSE;
-       }
-
-       contact = empathy_message_get_receiver (message);
-       if (!contact || !empathy_contact_is_user (contact)) {
-               return FALSE;
-       }
-
-       to = empathy_contact_get_name (contact);
-       if (!to) {
-               return FALSE;
-       }
-
-       cf_msg = g_utf8_casefold (msg, -1);
-       cf_to = g_utf8_casefold (to, -1);
-
-       ch = strstr (cf_msg, cf_to);
-       if (ch == NULL) {
-               goto finished;
-       }
-
-       if (ch != cf_msg) {
-               /* Not first in the message */
-               if ((*(ch - 1) != ' ') &&
-                   (*(ch - 1) != ',') &&
-                   (*(ch - 1) != '.')) {
-                       goto finished;
-               }
-       }
-
-       ch = ch + strlen (cf_to);
-       if (ch >= cf_msg + strlen (cf_msg)) {
-               ret_val = TRUE;
-               goto finished;
-       }
+       GtkTextBuffer *buffer;
 
-       if ((*ch == ' ') ||
-           (*ch == ',') ||
-           (*ch == '.') ||
-           (*ch == ':')) {
-               ret_val = TRUE;
-               goto finished;
-       }
+       g_return_if_fail (chat != NULL);
+       g_return_if_fail (new_word != NULL);
 
-finished:
-       g_free (cf_msg);
-       g_free (cf_to);
+       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (chat->input_text_view));
 
-       return ret_val;
+       gtk_text_buffer_delete (buffer, &start, &end);
+       gtk_text_buffer_insert (buffer, &start,
+                               new_word,
+                               -1);
 }