]> git.0d.be Git - empathy.git/blobdiff - src/empathy-chat-window.c
Improve dispatcher. Fixes bug #465928.
[empathy.git] / src / empathy-chat-window.c
index 898f54961f035123da5d2194e801bda69b99f73d..1db873b5a435a9246d763fe0744939dc59ca5b24 100644 (file)
 #include <glade/glade.h>
 #include <glib/gi18n.h>
 
+#include <telepathy-glib/util.h>
 #include <libmissioncontrol/mission-control.h>
 
 #include <libempathy/empathy-contact-factory.h>
-#include <libempathy/empathy-log-manager.h>
-#include <libempathy/empathy-chatroom-manager.h>
 #include <libempathy/empathy-contact.h>
-#include <libempathy/empathy-debug.h>
 #include <libempathy/empathy-message.h>
+#include <libempathy/empathy-dispatcher.h>
 #include <libempathy/empathy-utils.h>
 
 #include <libempathy-gtk/empathy-images.h>
 #include <libempathy-gtk/empathy-conf.h>
 #include <libempathy-gtk/empathy-contact-dialogs.h>
 #include <libempathy-gtk/empathy-log-window.h>
+#include <libempathy-gtk/empathy-geometry.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 
 #include "empathy-chat-window.h"
-#include "empathy-new-chatroom-dialog.h"
-#include "empathy-preferences.h"
 #include "empathy-about-dialog.h"
 
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_CHAT_WINDOW, EmpathyChatWindowPriv))
-
-#define DEBUG_DOMAIN "ChatWindow"
+#define DEBUG_FLAG EMPATHY_DEBUG_CHAT
+#include <libempathy/empathy-debug.h>
 
-struct _EmpathyChatWindowPriv {
-       EmpathyChatroomManager *chatroom_manager;
-       GList                  *chats;
-       GList                  *chats_new_msg;
-       GList                  *chats_composing;
-       EmpathyChat            *current_chat;
-       gboolean                page_added;
-       gboolean                dnd_same_window;
-       guint                   save_geometry_id;
-       GtkWidget              *dialog;
-       GtkWidget              *notebook;
+#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyChatWindow)
+typedef struct {
+       EmpathyChat *current_chat;
+       GList       *chats;
+       GList       *chats_new_msg;
+       GList       *chats_composing;
+       gboolean     page_added;
+       gboolean     dnd_same_window;
+       guint        save_geometry_id;
+       GtkWidget   *dialog;
+       GtkWidget   *notebook;
 
        /* Menu items. */
-       GtkWidget             *menu_conv_clear;
-       GtkWidget             *menu_conv_insert_smiley;
-       GtkWidget             *menu_conv_call;
-       GtkWidget             *menu_conv_call_separator;
-       GtkWidget             *menu_conv_log;
-       GtkWidget             *menu_conv_separator;
-       GtkWidget             *menu_conv_add_contact;
-       GtkWidget             *menu_conv_info;
-       GtkWidget             *menu_conv_close;
-
-       GtkWidget             *menu_room;
-       GtkWidget             *menu_room_set_topic;
-       GtkWidget             *menu_room_join_new;
-       GtkWidget             *menu_room_invite;
-       GtkWidget             *menu_room_add;
-       GtkWidget             *menu_room_show_contacts;
-
-       GtkWidget             *menu_edit_cut;
-       GtkWidget             *menu_edit_copy;
-       GtkWidget             *menu_edit_paste;
-
-       GtkWidget             *menu_tabs_next;
-       GtkWidget             *menu_tabs_prev;
-       GtkWidget             *menu_tabs_left;
-       GtkWidget             *menu_tabs_right;
-       GtkWidget             *menu_tabs_detach;
+       GtkWidget   *menu_conv_clear;
+       GtkWidget   *menu_conv_insert_smiley;
+       GtkWidget   *menu_conv_contact;
+       GtkWidget   *menu_conv_close;
+
+       GtkWidget   *menu_edit_cut;
+       GtkWidget   *menu_edit_copy;
+       GtkWidget   *menu_edit_paste;
+
+       GtkWidget   *menu_tabs_next;
+       GtkWidget   *menu_tabs_prev;
+       GtkWidget   *menu_tabs_left;
+       GtkWidget   *menu_tabs_right;
+       GtkWidget   *menu_tabs_detach;
        
-       GtkWidget             *menu_help_contents;
-       GtkWidget             *menu_help_about;
-};
-
-static void       empathy_chat_window_class_init (EmpathyChatWindowClass *klass);
-static void       empathy_chat_window_init       (EmpathyChatWindow      *window);
-static void       chat_window_finalize           (GObject                *object);
+       GtkWidget   *menu_help_contents;
+       GtkWidget   *menu_help_about;
+} EmpathyChatWindowPriv;
 
 static GList *chat_windows = NULL;
 
@@ -191,30 +172,6 @@ chat_window_close_button_style_set_cb (GtkWidget *button,
        gtk_widget_set_size_request (button, w, h);
 }
 
-static void
-chat_window_update_tooltip (EmpathyChatWindow *window,
-                           EmpathyChat       *chat)
-{
-       EmpathyChatWindowPriv *priv;
-       GtkWidget             *widget;
-       const gchar           *tooltip;
-       gchar                 *str = NULL;
-
-       priv = GET_PRIV (window);
-
-       tooltip = empathy_chat_get_tooltip (chat);
-
-       if (g_list_find (priv->chats_composing, chat)) {
-               str = g_strconcat (tooltip, "\n", _("Typing a message."), NULL);
-               tooltip = str;
-       }
-
-       widget = g_object_get_data (G_OBJECT (chat), "chat-window-tab-tooltip-widget");
-       gtk_widget_set_tooltip_text (widget, tooltip);
-
-       g_free (str);
-}
-
 static GtkWidget *
 chat_window_create_label (EmpathyChatWindow *window,
                          EmpathyChat       *chat)
@@ -238,7 +195,7 @@ chat_window_create_label (EmpathyChatWindow *window,
        event_box = gtk_event_box_new ();
        gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE);
 
-       name_label = gtk_label_new (empathy_chat_get_name (chat));
+       name_label = gtk_label_new (NULL);
        gtk_label_set_ellipsize (GTK_LABEL (name_label), PANGO_ELLIPSIZE_END);
 
        attr_list = pango_attr_list_new ();
@@ -297,27 +254,62 @@ chat_window_create_label (EmpathyChatWindow *window,
                          G_CALLBACK (chat_window_close_clicked_cb),
                          chat);
 
-       /* Set up tooltip */
-       chat_window_update_tooltip (window, chat);
-
        gtk_widget_show_all (hbox);
 
        return hbox;
 }
 
+static const gchar *
+chat_window_get_chat_name (EmpathyChat *chat)
+{
+       EmpathyContact *remote_contact = NULL;
+       const gchar    *name = NULL;
+
+       name = empathy_chat_get_name (chat);
+       if (!name) {
+               remote_contact = empathy_chat_get_remote_contact (chat);
+               if (remote_contact) {
+                       name = empathy_contact_get_name (remote_contact);
+               }
+       }
+
+       return name ? name : _("Conversation");
+}
+
 static void
-chat_window_update_title (EmpathyChatWindow *window,
-                         EmpathyChat       *chat)
+chat_window_update (EmpathyChatWindow *window)
 {
-       EmpathyChatWindowPriv *priv;
-       gint                   n_chats;
-       
-       priv = GET_PRIV (window);
-       
+       EmpathyChatWindowPriv *priv = GET_PRIV (window);
+       gboolean               first_page;
+       gboolean               last_page;
+       gboolean               is_connected;
+       gint                   num_pages;
+       gint                   page_num;
+       const gchar           *name;
+       guint                  n_chats;
+
+       /* Get information */
+       page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook));
+       num_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook));
+       first_page = (page_num == 0);
+       last_page = (page_num == (num_pages - 1));
+       is_connected = empathy_chat_get_tp_chat (priv->current_chat) != NULL;
+       name = chat_window_get_chat_name (priv->current_chat);
        n_chats = g_list_length (priv->chats);
+
+       DEBUG ("Update window");
+
+       /* Update menu */
+       gtk_widget_set_sensitive (priv->menu_tabs_next, !last_page);
+       gtk_widget_set_sensitive (priv->menu_tabs_prev, !first_page);
+       gtk_widget_set_sensitive (priv->menu_tabs_detach, num_pages > 1);
+       gtk_widget_set_sensitive (priv->menu_tabs_left, !first_page);
+       gtk_widget_set_sensitive (priv->menu_tabs_right, !last_page);
+       gtk_widget_set_sensitive (priv->menu_conv_insert_smiley, is_connected);
+
+       /* Update window title */
        if (n_chats == 1) {
-               gtk_window_set_title (GTK_WINDOW (priv->dialog),
-                                     empathy_chat_get_name (priv->current_chat));
+               gtk_window_set_title (GTK_WINDOW (priv->dialog), name);
        } else {
                gchar *title;
 
@@ -326,6 +318,7 @@ chat_window_update_title (EmpathyChatWindow *window,
                g_free (title);
        }
 
+       /* Update window icon */
        if (priv->chats_new_msg) {
                gtk_window_set_icon_name (GTK_WINDOW (priv->dialog),
                                          EMPATHY_IMAGE_MESSAGE);
@@ -335,131 +328,107 @@ chat_window_update_title (EmpathyChatWindow *window,
 }
 
 static void
-chat_window_update_status (EmpathyChatWindow *window,
-                          EmpathyChat       *chat)
+chat_window_update_chat_tab (EmpathyChat *chat)
 {
+       EmpathyChatWindow     *window;
        EmpathyChatWindowPriv *priv;
-       GtkImage             *image;
-       const gchar          *icon_name = NULL;
+       EmpathyContact        *remote_contact;
+       const gchar           *name;
+       const gchar           *subject;
+       GtkWidget             *widget;
+       GString               *tooltip;
+       gchar                 *str;
+       const gchar           *icon_name;
 
+       window = chat_window_find_chat (chat);
+       if (!window) {
+               return;
+       }
        priv = GET_PRIV (window);
 
+       /* Get information */
+       name = chat_window_get_chat_name (chat);
+       subject = empathy_chat_get_subject (chat);
+       remote_contact = empathy_chat_get_remote_contact (chat);
+
+       DEBUG ("Updating chat tab, name=%s, subject=%s, remote_contact=%p",
+               name, subject, remote_contact);
+
+       /* Update tab image */
        if (g_list_find (priv->chats_new_msg, chat)) {
                icon_name = EMPATHY_IMAGE_MESSAGE;
        }
        else if (g_list_find (priv->chats_composing, chat)) {
                icon_name = EMPATHY_IMAGE_TYPING;
        }
+       else if (remote_contact) {
+               icon_name = empathy_icon_name_for_contact (remote_contact);
+       } else {
+               icon_name = EMPATHY_IMAGE_GROUP_MESSAGE;
+       }
+       widget = g_object_get_data (G_OBJECT (chat), "chat-window-tab-image");
+       gtk_image_set_from_icon_name (GTK_IMAGE (widget), icon_name, GTK_ICON_SIZE_MENU);
+
+       /* Update tab tooltip */
+       tooltip = g_string_new (NULL);
+       if (remote_contact) {
+               g_string_append_printf (tooltip, "%s\n%s",
+                                       empathy_contact_get_id (remote_contact),
+                                       empathy_contact_get_status (remote_contact));
+       }
        else {
-               icon_name = empathy_chat_get_status_icon_name (chat);
+               g_string_append (tooltip, name);
        }
-       image = g_object_get_data (G_OBJECT (chat), "chat-window-tab-image");
-       gtk_image_set_from_icon_name (image, icon_name, GTK_ICON_SIZE_MENU);
+       if (subject) {
+               g_string_append_printf (tooltip, "\n%s %s", _("Topic:"), subject);
+       }
+       if (g_list_find (priv->chats_composing, chat)) {
+               g_string_append_printf (tooltip, "\n%s", _("Typing a message."));
+       }
+       str = g_string_free (tooltip, FALSE);
+       widget = g_object_get_data (G_OBJECT (chat), "chat-window-tab-tooltip-widget");
+       gtk_widget_set_tooltip_text (widget, str);
+       g_free (str);
 
-       chat_window_update_title (window, chat);
-       chat_window_update_tooltip (window, chat);
+       /* Update tab label */
+       widget = g_object_get_data (G_OBJECT (chat), "chat-window-tab-label");
+       gtk_label_set_text (GTK_LABEL (widget), name);
+
+       /* Update the window if it's the current chat */
+       if (priv->current_chat == chat) {
+               chat_window_update (window);
+       }
 }
 
 static void
-chat_window_update_menu (EmpathyChatWindow *window)
+chat_window_chat_notify_cb (EmpathyChat *chat)
 {
-       EmpathyChatWindowPriv *priv;
-       gboolean              first_page;
-       gboolean              last_page;
-       gboolean              is_connected;
-       gint                  num_pages;
-       gint                  page_num;
-
-       priv = GET_PRIV (window);
-
-       /* Notebook pages */
-       page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook));
-       num_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook));
-       first_page = (page_num == 0);
-       last_page = (page_num == (num_pages - 1));
-
-       gtk_widget_set_sensitive (priv->menu_tabs_next, !last_page);
-       gtk_widget_set_sensitive (priv->menu_tabs_prev, !first_page);
-       gtk_widget_set_sensitive (priv->menu_tabs_detach, num_pages > 1);
-       gtk_widget_set_sensitive (priv->menu_tabs_left, !first_page);
-       gtk_widget_set_sensitive (priv->menu_tabs_right, !last_page);
-
-       is_connected = empathy_chat_is_connected (priv->current_chat);
-
-       if (empathy_chat_is_group_chat (priv->current_chat)) {
-               EmpathyGroupChat *group_chat;
-               EmpathyChatroom  *chatroom;
-               gboolean         show_contacts;
-
-               group_chat = EMPATHY_GROUP_CHAT (priv->current_chat);
-
-               /* Show / Hide widgets */
-               gtk_widget_show (priv->menu_room);
-
-               gtk_widget_hide (priv->menu_conv_add_contact);
-               gtk_widget_hide (priv->menu_conv_info);
-               gtk_widget_hide (priv->menu_conv_separator);
-
-               /* Can we add this room to our favourites and are we
-                * connected to the room?
-                */
-               chatroom = empathy_chatroom_manager_find (priv->chatroom_manager,
-                                                         empathy_chat_get_account (priv->current_chat),
-                                                         empathy_chat_get_id (priv->current_chat));
-
-               gtk_widget_set_sensitive (priv->menu_room_add, chatroom == NULL);
-               gtk_widget_set_sensitive (priv->menu_conv_insert_smiley, is_connected);
-               gtk_widget_set_sensitive (priv->menu_room_join_new, is_connected);
-               gtk_widget_set_sensitive (priv->menu_room_invite, is_connected);
-
-               /* We need to block the signal here because all we are
-                * really trying to do is check or uncheck the menu
-                * item. If we don't do this we get funny behaviour
-                * with 2 or more group chat windows where showing
-                * contacts doesn't do anything.
-                */
-               show_contacts = empathy_group_chat_get_show_contacts (group_chat);
-
-               g_signal_handlers_block_by_func (priv->menu_room_show_contacts,
-                                                chat_window_show_contacts_toggled_cb,
-                                                window);
-
-               g_object_set (priv->menu_room_show_contacts,
-                             "active", show_contacts,
-                             NULL);
-
-               g_signal_handlers_unblock_by_func (priv->menu_room_show_contacts,
-                                                  chat_window_show_contacts_toggled_cb,
-                                                  window);
-       } else {
-               EmpathyPrivateChat *chat;
-               EmpathyContact     *contact;
-               McPresence          presence;
-
-               chat = EMPATHY_PRIVATE_CHAT (priv->current_chat);
-
-               /* Show / Hide widgets */
-               gtk_widget_hide (priv->menu_room);
-
-               /* Unset presence means this contact refuses to send us his
-                * presence. By adding the contact we ask the contact to accept
-                * to send his presence. */
-               contact = empathy_private_chat_get_contact (chat);
-               presence = empathy_contact_get_presence (contact);
-               if (presence == MC_PRESENCE_UNSET) {
-                       gtk_widget_show (priv->menu_conv_add_contact);
-               } else {
-                       gtk_widget_hide (priv->menu_conv_add_contact);
+       EmpathyContact *old_remote_contact;
+       EmpathyContact *remote_contact = NULL;
+
+       old_remote_contact = g_object_get_data (G_OBJECT (chat), "chat-window-remote-contact");
+       remote_contact = empathy_chat_get_remote_contact (chat);
+
+       if (old_remote_contact != remote_contact) {
+               /* The remote-contact associated with the chat changed, we need
+                * to keep track of any change of that contact and update the
+                * window each time. */
+               if (remote_contact) {
+                       g_signal_connect_swapped (remote_contact, "notify",
+                                                 G_CALLBACK (chat_window_update_chat_tab),
+                                                 chat);
+               }
+               if (old_remote_contact) {
+                       g_signal_handlers_disconnect_by_func (old_remote_contact,
+                                                             chat_window_update_chat_tab,
+                                                             chat);
                }
 
-               gtk_widget_show (priv->menu_conv_separator);
-               gtk_widget_show (priv->menu_conv_info);
-
-               /* Are we connected? */
-               gtk_widget_set_sensitive (priv->menu_conv_insert_smiley, is_connected);
-               gtk_widget_set_sensitive (priv->menu_conv_add_contact, is_connected);
-               gtk_widget_set_sensitive (priv->menu_conv_info, is_connected);
+               g_object_set_data (G_OBJECT (chat), "chat-window-remote-contact",
+                                  remote_contact);
        }
+
+       chat_window_update_chat_tab (chat);
 }
 
 static void
@@ -485,77 +454,47 @@ chat_window_insert_smiley_activate_cb (GtkWidget         *menuitem,
 }
 
 static void
-chat_window_clear_activate_cb (GtkWidget        *menuitem,
-                              EmpathyChatWindow *window)
-{
-       EmpathyChatWindowPriv *priv;
-
-       priv = GET_PRIV (window);
-
-       empathy_chat_clear (priv->current_chat);
-}
-
-static void
-chat_window_add_contact_activate_cb (GtkWidget        *menuitem,
-                                    EmpathyChatWindow *window)
-{
-       EmpathyChatWindowPriv *priv;
-       //EmpathyContact        *contact;
-
-       priv = GET_PRIV (window);
-
-       //contact = empathy_chat_get_contact (priv->current_chat);
-
-       // FIXME: empathy_add_contact_dialog_show (NULL, contact);
-}
-
-static void
-chat_window_call_activate_cb (GtkWidget         *menuitem,
+chat_window_conv_activate_cb (GtkWidget         *menuitem,
                              EmpathyChatWindow *window)
 {
-       EmpathyChatWindowPriv *priv;
-
-       priv = GET_PRIV (window);
-
-       if (!empathy_chat_is_group_chat (priv->current_chat)) {
-               EmpathyPrivateChat *chat;
-               EmpathyContact     *contact;
-
-               chat = EMPATHY_PRIVATE_CHAT (priv->current_chat);
-               contact = empathy_private_chat_get_contact (chat);
-
-               empathy_call_with_contact (contact);
+       EmpathyChatWindowPriv *priv = GET_PRIV (window);
+       GtkWidget             *submenu = NULL;
+
+       submenu = empathy_chat_get_contact_menu (priv->current_chat);
+       if (submenu) {
+               gtk_menu_item_set_submenu (GTK_MENU_ITEM (priv->menu_conv_contact),
+                                          submenu);
+               gtk_widget_show (priv->menu_conv_contact);
+               gtk_widget_show (submenu);
+       } else {
+               gtk_widget_hide (priv->menu_conv_contact);
        }
 }
 
 static void
-chat_window_log_activate_cb (GtkWidget        *menuitem,
-                            EmpathyChatWindow *window)
+chat_window_clear_activate_cb (GtkWidget        *menuitem,
+                              EmpathyChatWindow *window)
 {
-       EmpathyChatWindowPriv *priv;
-
-       priv = GET_PRIV (window);
+       EmpathyChatWindowPriv *priv = GET_PRIV (window);
 
-       empathy_log_window_show (empathy_chat_get_account (priv->current_chat),
-                                empathy_chat_get_id (priv->current_chat),
-                                empathy_chat_is_group_chat (priv->current_chat),
-                                GTK_WINDOW (priv->dialog));
+       empathy_chat_clear (priv->current_chat);
 }
 
-static void
-chat_window_info_activate_cb (GtkWidget        *menuitem,
-                             EmpathyChatWindow *window)
+static const gchar *
+chat_get_window_id_for_geometry (EmpathyChat *chat)
 {
-       EmpathyChatWindowPriv *priv;
-       EmpathyContact        *contact;
+       const gchar *res = NULL;
+       gboolean     separate_windows;
 
-       priv = GET_PRIV (window);
+       empathy_conf_get_bool (empathy_conf_get (),
+                              EMPATHY_PREFS_UI_SEPARATE_CHAT_WINDOWS,
+                              &separate_windows);
 
-       contact = empathy_private_chat_get_contact (EMPATHY_PRIVATE_CHAT (priv->current_chat));
+       if (separate_windows) {
+               res = empathy_chat_get_id (chat);
+       }
 
-       empathy_contact_information_dialog_show (contact,
-                                                GTK_WINDOW (priv->dialog),
-                                                FALSE, FALSE);
+       return res ? res : "chat-window";
 }
 
 static gboolean
@@ -569,7 +508,8 @@ chat_window_save_geometry_timeout_cb (EmpathyChatWindow *window)
        gtk_window_get_size (GTK_WINDOW (priv->dialog), &w, &h);
        gtk_window_get_position (GTK_WINDOW (priv->dialog), &x, &y);
 
-       empathy_chat_save_geometry (priv->current_chat, x, y, w, h);
+       empathy_geometry_save (chat_get_window_id_for_geometry (priv->current_chat),
+                              x, y, w, h);
 
        priv->save_geometry_id = 0;
 
@@ -597,57 +537,6 @@ chat_window_configure_event_cb (GtkWidget         *widget,
        return FALSE;
 }
 
-static void
-chat_window_conv_activate_cb (GtkWidget         *menuitem,
-                             EmpathyChatWindow *window)
-{
-       EmpathyChatWindowPriv *priv;
-       EmpathyLogManager     *manager;
-       gboolean              log_exists = FALSE;
-       gboolean              can_voip = FALSE;
-
-       priv = GET_PRIV (window);
-
-       manager = empathy_log_manager_new ();
-       log_exists = empathy_log_manager_exists (manager,
-                                                empathy_chat_get_account (priv->current_chat),
-                                                empathy_chat_get_id (priv->current_chat),
-                                                empathy_chat_is_group_chat (priv->current_chat));
-       g_object_unref (manager);
-
-       if (!empathy_chat_is_group_chat (priv->current_chat)) {
-               EmpathyPrivateChat *chat;
-               EmpathyContact     *contact;
-
-               chat = EMPATHY_PRIVATE_CHAT (priv->current_chat);
-               contact = empathy_private_chat_get_contact (chat);
-               can_voip = empathy_contact_can_voip (contact);
-       }
-
-       gtk_widget_set_sensitive (priv->menu_conv_log, log_exists);
-#ifdef HAVE_VOIP
-       gtk_widget_set_sensitive (priv->menu_conv_call, can_voip);
-#else 
-       g_object_set (priv->menu_conv_call, "visible", FALSE, NULL);
-       g_object_set (priv->menu_conv_call_separator, "visible", FALSE, NULL);
-#endif
-}
-
-static void
-chat_window_show_contacts_toggled_cb (GtkWidget        *menuitem,
-                                     EmpathyChatWindow *window)
-{
-       EmpathyChatWindowPriv *priv;
-       gboolean              show;
-
-       priv = GET_PRIV (window);
-
-       g_return_if_fail (priv->current_chat != NULL);
-
-       show = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (priv->menu_room_show_contacts));
-       empathy_group_chat_set_show_contacts (EMPATHY_GROUP_CHAT (priv->current_chat), show);
-}
-
 static void
 chat_window_close_activate_cb (GtkWidget        *menuitem,
                               EmpathyChatWindow *window)
@@ -661,80 +550,6 @@ chat_window_close_activate_cb (GtkWidget        *menuitem,
        empathy_chat_window_remove_chat (window, priv->current_chat);
 }
 
-static void
-chat_window_room_set_topic_activate_cb (GtkWidget        *menuitem,
-                                       EmpathyChatWindow *window)
-{
-       EmpathyChatWindowPriv *priv = GET_PRIV (window);
-       
-       if (empathy_chat_is_group_chat (priv->current_chat)) {
-               empathy_group_chat_set_topic (EMPATHY_GROUP_CHAT (priv->current_chat));
-       }
-}
-
-static void
-chat_window_room_join_new_activate_cb (GtkWidget        *menuitem,
-                                      EmpathyChatWindow *window)
-{
-       EmpathyChatWindowPriv *priv;
-
-       priv = GET_PRIV (window);
-
-       empathy_new_chatroom_dialog_show (GTK_WINDOW (priv->dialog));
-}
-
-static void
-chat_window_room_invite_activate_cb (GtkWidget        *menuitem,
-                                    EmpathyChatWindow *window)
-{
-/* FIXME:
-       EmpathyChatWindowPriv *priv;
-       EmpathyContact        *own_contact;
-       EmpathyChatroomId      id = 0;
-
-       priv = GET_PRIV (window);
-       own_contact = empathy_chat_get_own_contact (priv->current_chat);
-
-       if (empathy_chat_is_group_chat (priv->current_chat)) {
-               EmpathyGroupChat *group_chat;
-
-               group_chat = EMPATHY_GROUP_CHAT (priv->current_chat);
-               id = empathy_group_chat_get_chatroom_id (group_chat);
-       }
-
-       empathy_chat_invite_dialog_show (own_contact, id);
-*/
-}
-
-static void
-chat_window_room_add_activate_cb (GtkWidget        *menuitem,
-                                 EmpathyChatWindow *window)
-{
-       EmpathyChatWindowPriv  *priv;
-       EmpathyChatroomManager *manager;
-       EmpathyChatroom        *chatroom;
-
-       priv = GET_PRIV (window);
-
-       g_return_if_fail (priv->current_chat != NULL);
-
-       if (!empathy_chat_is_group_chat (priv->current_chat)) {
-               return;
-       }
-
-       chatroom = empathy_chatroom_new_full (empathy_chat_get_account (priv->current_chat),
-                                             empathy_chat_get_id (priv->current_chat),
-                                             empathy_chat_get_name (priv->current_chat),
-                                             FALSE);
-
-       manager = empathy_chatroom_manager_new ();
-       empathy_chatroom_manager_add (manager, chatroom);
-       chat_window_update_menu (window);
-
-       g_object_unref (chatroom);
-       g_object_unref (manager);
-}
-
 static void
 chat_window_edit_activate_cb (GtkWidget        *menuitem,
                              EmpathyChatWindow *window)
@@ -748,7 +563,7 @@ chat_window_edit_activate_cb (GtkWidget        *menuitem,
 
        g_return_if_fail (priv->current_chat != NULL);
 
-       if (!empathy_chat_is_connected (priv->current_chat)) {
+       if (!empathy_chat_get_tp_chat (priv->current_chat)) {
                gtk_widget_set_sensitive (priv->menu_edit_copy, FALSE);
                gtk_widget_set_sensitive (priv->menu_edit_cut, FALSE);
                gtk_widget_set_sensitive (priv->menu_edit_paste, FALSE);
@@ -830,11 +645,8 @@ chat_window_tabs_left_activate_cb (GtkWidget        *menuitem,
        }
 
        gtk_notebook_reorder_child (GTK_NOTEBOOK (priv->notebook),
-                                   empathy_chat_get_widget (chat),
+                                   GTK_WIDGET (chat),
                                    index - 1);
-
-       chat_window_update_menu (window);
-       chat_window_update_status (window, chat);
 }
 
 static void
@@ -851,11 +663,8 @@ chat_window_tabs_right_activate_cb (GtkWidget        *menuitem,
        index = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook));
 
        gtk_notebook_reorder_child (GTK_NOTEBOOK (priv->notebook),
-                                   empathy_chat_get_widget (chat),
+                                   GTK_WIDGET (chat),
                                    index + 1);
-
-       chat_window_update_menu (window);
-       chat_window_update_status (window, chat);
 }
 
 static void
@@ -881,7 +690,7 @@ static void
 chat_window_help_contents_cb (GtkWidget         *menuitem,
                              EmpathyChatWindow *window)
 {
-       //empathy_help_show ();
+       empathy_url_show ("ghelp:empathy?chat");
 }
 
 static void
@@ -898,45 +707,19 @@ chat_window_delete_event_cb (GtkWidget        *dialog,
                             GdkEvent         *event,
                             EmpathyChatWindow *window)
 {
-       EmpathyChatWindowPriv *priv;
-       GList                *list;
-       GList                *l;
-
-       priv = GET_PRIV (window);
-
-       empathy_debug (DEBUG_DOMAIN, "Delete event received");
+       EmpathyChatWindowPriv *priv = GET_PRIV (window);
 
-       list = g_list_copy (priv->chats);
+       DEBUG ("Delete event received");
 
-       for (l = list; l; l = l->next) {
-               empathy_chat_window_remove_chat (window, l->data);
+       g_object_ref (window);
+       while (priv->chats) {
+               empathy_chat_window_remove_chat (window, priv->chats->data);
        }
-
-       g_list_free (list);
+       g_object_unref (window);
 
        return TRUE;
 }
 
-static void
-chat_window_status_changed_cb (EmpathyChat       *chat,
-                              EmpathyChatWindow *window)
-{
-       chat_window_update_menu (window);
-       chat_window_update_status (window, chat);
-}
-
-static void
-chat_window_name_changed_cb (EmpathyChat       *chat,
-                            const gchar      *name,
-                            EmpathyChatWindow *window)
-{
-       GtkLabel *label;
-
-       label = g_object_get_data (G_OBJECT (chat), "chat-window-tab-label");
-
-       gtk_label_set_text (label, name);
-}
-
 static void
 chat_window_composing_cb (EmpathyChat       *chat,
                          gboolean          is_composing,
@@ -952,13 +735,24 @@ chat_window_composing_cb (EmpathyChat       *chat,
                priv->chats_composing = g_list_remove (priv->chats_composing, chat);
        }
 
-       chat_window_update_status (window, chat);
+       chat_window_update_chat_tab (chat);
+}
+
+static void
+chat_window_set_urgency_hint (EmpathyChatWindow *window,
+                             gboolean          urgent)
+{
+       EmpathyChatWindowPriv *priv;
+
+       priv = GET_PRIV (window);
+
+       DEBUG ("Turning %s urgency hint", urgent ? "on" : "off");
+       gtk_window_set_urgency_hint (GTK_WINDOW (priv->dialog), urgent);
 }
 
 static void
 chat_window_new_message_cb (EmpathyChat       *chat,
                            EmpathyMessage    *message,
-                           gboolean          is_backlog,
                            EmpathyChatWindow *window)
 {
        EmpathyChatWindowPriv *priv;
@@ -968,21 +762,13 @@ chat_window_new_message_cb (EmpathyChat       *chat,
        priv = GET_PRIV (window);
 
        has_focus = empathy_chat_window_has_focus (window);
-       
+
        if (has_focus && priv->current_chat == chat) {
-               empathy_debug (DEBUG_DOMAIN, "New message, we have focus");
                return;
        }
        
-       empathy_debug (DEBUG_DOMAIN, "New message, no focus");
-
-       needs_urgency = FALSE;
-       if (empathy_chat_is_group_chat (chat)) {                
-               if (!is_backlog && 
-                   empathy_chat_should_highlight_nick (message)) {
-                       empathy_debug (DEBUG_DOMAIN, "Highlight this nick");
-                       needs_urgency = TRUE;
-               }
+       if (empathy_chat_get_members_count (chat) > 2) {
+               needs_urgency = empathy_message_should_highlight (message);
        } else {
                needs_urgency = TRUE;
        }
@@ -991,10 +777,9 @@ chat_window_new_message_cb (EmpathyChat       *chat,
                chat_window_set_urgency_hint (window, TRUE);
        }
 
-       if (!is_backlog && 
-           !g_list_find (priv->chats_new_msg, chat)) {
+       if (!g_list_find (priv->chats_new_msg, chat)) {
                priv->chats_new_msg = g_list_prepend (priv->chats_new_msg, chat);
-               chat_window_update_status (window, chat);
+               chat_window_update_chat_tab (chat);
        }
 }
 
@@ -1009,13 +794,13 @@ chat_window_detach_hook (GtkNotebook *source,
        EmpathyChatWindow     *window, *new_window;
        EmpathyChat           *chat;
 
-       chat = g_object_get_data (G_OBJECT (page), "chat");
+       chat = EMPATHY_CHAT (page);
        window = chat_window_find_chat (chat);
 
        new_window = empathy_chat_window_new ();
        priv = GET_PRIV (new_window);
 
-       empathy_debug (DEBUG_DOMAIN, "Detach hook called");
+       DEBUG ("Detach hook called");
 
        empathy_chat_window_move_chat (window, new_window, chat);
 
@@ -1035,12 +820,12 @@ chat_window_page_switched_cb (GtkNotebook      *notebook,
        EmpathyChat           *chat;
        GtkWidget            *child;
 
-       empathy_debug (DEBUG_DOMAIN, "Page switched");
+       DEBUG ("Page switched");
 
        priv = GET_PRIV (window);
 
        child = gtk_notebook_get_nth_page (notebook, page_num);
-       chat = g_object_get_data (G_OBJECT (child), "chat");
+       chat = EMPATHY_CHAT (child);
 
        if (priv->page_added) {
                priv->page_added = FALSE;
@@ -1053,19 +838,7 @@ chat_window_page_switched_cb (GtkNotebook      *notebook,
        priv->current_chat = chat;
        priv->chats_new_msg = g_list_remove (priv->chats_new_msg, chat);
 
-       chat_window_update_menu (window);
-       chat_window_update_status (window, chat);
-}
-
-static void
-chat_window_page_reordered_cb (GtkNotebook      *notebook,
-                              GtkWidget        *widget,
-                              guint             page_num,
-                              EmpathyChatWindow *window)
-{
-       empathy_debug (DEBUG_DOMAIN, "Page reordered");
-       
-       chat_window_update_menu (window);
+       chat_window_update_chat_tab (chat);
 }
 
 static void
@@ -1084,23 +857,17 @@ chat_window_page_added_cb (GtkNotebook      *notebook,
         * it, so we return here and in "page-added".
         */
        if (priv->dnd_same_window) {
-               empathy_debug (DEBUG_DOMAIN, "Page added (back to the same window)");
+               DEBUG ("Page added (back to the same window)");
                priv->dnd_same_window = FALSE;
                return;
        }
 
-       empathy_debug (DEBUG_DOMAIN, "Page added");
+       DEBUG ("Page added");
 
        /* Get chat object */
-       chat = g_object_get_data (G_OBJECT (child), "chat");
+       chat = EMPATHY_CHAT (child);
 
        /* Connect chat signals for this window */
-       g_signal_connect (chat, "status-changed",
-                         G_CALLBACK (chat_window_status_changed_cb),
-                         window);
-       g_signal_connect (chat, "name-changed",
-                         G_CALLBACK (chat_window_name_changed_cb),
-                         window);
        g_signal_connect (chat, "composing",
                          G_CALLBACK (chat_window_composing_cb),
                          window);
@@ -1115,6 +882,8 @@ chat_window_page_added_cb (GtkNotebook      *notebook,
 
        /* Get list of chats up to date */
        priv->chats = g_list_append (priv->chats, chat);
+
+       chat_window_update_chat_tab (chat);
 }
 
 static void
@@ -1133,22 +902,16 @@ chat_window_page_removed_cb (GtkNotebook      *notebook,
         * it, so we return here and in "page-added".
         */
        if (priv->dnd_same_window) {
-               empathy_debug (DEBUG_DOMAIN, "Page removed (and will be readded to same window)");
+               DEBUG ("Page removed (and will be readded to same window)");
                return;
        }
 
-       empathy_debug (DEBUG_DOMAIN, "Page removed");
+       DEBUG ("Page removed");
 
        /* Get chat object */
-       chat = g_object_get_data (G_OBJECT (child), "chat");
+       chat = EMPATHY_CHAT (child);
 
        /* Disconnect all signal handlers for this chat and this window */
-       g_signal_handlers_disconnect_by_func (chat,
-                                             G_CALLBACK (chat_window_status_changed_cb),
-                                             window);
-       g_signal_handlers_disconnect_by_func (chat,
-                                             G_CALLBACK (chat_window_name_changed_cb),
-                                             window);
        g_signal_handlers_disconnect_by_func (chat,
                                              G_CALLBACK (chat_window_composing_cb),
                                              window);
@@ -1164,8 +927,7 @@ chat_window_page_removed_cb (GtkNotebook      *notebook,
        if (priv->chats == NULL) {
                g_object_unref (window);
        } else {
-               chat_window_update_menu (window);
-               chat_window_update_title (window, NULL);
+               chat_window_update (window);
        }
 }
 
@@ -1176,7 +938,7 @@ chat_window_focus_in_event_cb (GtkWidget        *widget,
 {
        EmpathyChatWindowPriv *priv;
 
-       empathy_debug (DEBUG_DOMAIN, "Focus in event, updating title");
+       DEBUG ("Focus in event, updating title");
 
        priv = GET_PRIV (window);
 
@@ -1185,7 +947,7 @@ chat_window_focus_in_event_cb (GtkWidget        *widget,
        chat_window_set_urgency_hint (window, FALSE);
        
        /* Update the title, since we now mark all unread messages as read. */
-       chat_window_update_status (window, priv->current_chat);
+       chat_window_update_chat_tab (priv->current_chat);
 
        return FALSE;
 }
@@ -1204,21 +966,19 @@ chat_window_drag_data_received (GtkWidget        *widget,
                EmpathyChat           *chat;
                EmpathyChatWindow     *old_window;
                McAccount             *account;
-               const gchar           *id = NULL;
+               const gchar           *id;
                gchar                **strv;
 
-               if (selection) {
-                       id = (const gchar*) selection->data;
-               }
+               id = (const gchar*) selection->data;
 
-               empathy_debug (DEBUG_DOMAIN, "DND contact from roster with id:'%s'", id);
+               DEBUG ("DND contact from roster with id:'%s'", id);
                
                strv = g_strsplit (id, "/", 2);
                account = mc_account_lookup (strv[0]);
                chat = empathy_chat_window_find_chat (account, strv[1]);
 
                if (!chat) {
-                       empathy_chat_with_contact_id (account, strv[2]);
+                       empathy_dispatcher_chat_with_contact_id (account, strv[2]);
                        g_object_unref (account);
                        g_strfreev (strv);
                        return;
@@ -1249,28 +1009,21 @@ chat_window_drag_data_received (GtkWidget        *widget,
                gtk_drag_finish (context, TRUE, FALSE, time);
        }
        else if (info == DND_DRAG_TYPE_TAB) {
-               EmpathyChat        *chat = NULL;
-               EmpathyChatWindow  *old_window;
-               GtkWidget        **child = NULL;
+               EmpathyChat        **chat;
+               EmpathyChatWindow   *old_window = NULL;
 
-               empathy_debug (DEBUG_DOMAIN, "DND tab");
+               DEBUG ("DND tab");
 
-               if (selection) {
-                       child = (void*) selection->data;
-               }
+               chat = (void*) selection->data;
+               old_window = chat_window_find_chat (*chat);
 
-               if (child) {
-                       chat = g_object_get_data (G_OBJECT (*child), "chat");
-               }
-
-               old_window = chat_window_find_chat (chat);
                if (old_window) {
                        EmpathyChatWindowPriv *priv;
 
                        priv = GET_PRIV (window);
 
                        if (old_window == window) {
-                               empathy_debug (DEBUG_DOMAIN, "DND tab (within same window)");
+                               DEBUG ("DND tab (within same window)");
                                priv->dnd_same_window = TRUE;
                                gtk_drag_finish (context, TRUE, FALSE, time);
                                return;
@@ -1286,24 +1039,11 @@ chat_window_drag_data_received (GtkWidget        *widget,
                 */
                gtk_drag_finish (context, TRUE, FALSE, time);
        } else {
-               empathy_debug (DEBUG_DOMAIN, "DND from unknown source");
+               DEBUG ("DND from unknown source");
                gtk_drag_finish (context, FALSE, FALSE, time);
        }
 }
 
-static void
-chat_window_set_urgency_hint (EmpathyChatWindow *window,
-                             gboolean          urgent)
-{
-       EmpathyChatWindowPriv *priv;
-
-       priv = GET_PRIV (window);
-
-       empathy_debug (DEBUG_DOMAIN, "Turning %s urgency hint",
-                      urgent ? "on" : "off");
-       gtk_window_set_urgency_hint (GTK_WINDOW (priv->dialog), urgent);
-}
-
 static void
 chat_window_finalize (GObject *object)
 {
@@ -1313,7 +1053,7 @@ chat_window_finalize (GObject *object)
        window = EMPATHY_CHAT_WINDOW (object);
        priv = GET_PRIV (window);
 
-       empathy_debug (DEBUG_DOMAIN, "Finalized: %p", object);
+       DEBUG ("Finalized: %p", object);
 
        if (priv->save_geometry_id != 0) {
                g_source_remove (priv->save_geometry_id);
@@ -1322,11 +1062,6 @@ chat_window_finalize (GObject *object)
        chat_windows = g_list_remove (chat_windows, window);
        gtk_widget_destroy (priv->dialog);
 
-       g_signal_handlers_disconnect_by_func (priv->chatroom_manager,
-                                             chat_window_update_menu,
-                                             window);
-       g_object_unref (priv->chatroom_manager);
-
        G_OBJECT_CLASS (empathy_chat_window_parent_class)->finalize (object);
 }
 
@@ -1335,7 +1070,7 @@ empathy_chat_window_class_init (EmpathyChatWindowClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       object_class->finalize = empathy_chat_window_finalize;
+       object_class->finalize = chat_window_finalize;
 
        g_type_class_add_private (object_class, sizeof (EmpathyChatWindowPriv));
 
@@ -1355,19 +1090,18 @@ empathy_chat_window_class_init (EmpathyChatWindowClass *klass)
 static void
 empathy_chat_window_init (EmpathyChatWindow *window)
 {
-       EmpathyChatWindowPriv *priv;
-       GladeXML             *glade;
-       GtkAccelGroup        *accel_group;
-       GtkWidget            *image;
-       GClosure             *closure;
-       GtkWidget            *menu_conv;
-       GtkWidget            *menu;
-       gint                  i;
-       GtkWidget            *chat_vbox;
-       gchar                *filename;
-
-       priv = GET_PRIV (window);
-
+       GladeXML              *glade;
+       GtkAccelGroup         *accel_group;
+       GClosure              *closure;
+       GtkWidget             *menu_conv;
+       GtkWidget             *menu;
+       gint                   i;
+       GtkWidget             *chat_vbox;
+       gchar                 *filename;
+       EmpathyChatWindowPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (window,
+               EMPATHY_TYPE_CHAT_WINDOW, EmpathyChatWindowPriv);
+
+       window->priv = priv;
        filename = empathy_file_lookup ("empathy-chat-window.glade", "src");
        glade = empathy_glade_get_file (filename,
                                       "chat_window",
@@ -1377,19 +1111,8 @@ empathy_chat_window_init (EmpathyChatWindow *window)
                                       "menu_conv", &menu_conv,
                                       "menu_conv_clear", &priv->menu_conv_clear,
                                       "menu_conv_insert_smiley", &priv->menu_conv_insert_smiley,
-                                      "menu_conv_call", &priv->menu_conv_call,
-                                      "menu_conv_call_separator", &priv->menu_conv_call_separator,
-                                      "menu_conv_log", &priv->menu_conv_log,
-                                      "menu_conv_separator", &priv->menu_conv_separator,
-                                      "menu_conv_add_contact", &priv->menu_conv_add_contact,
-                                      "menu_conv_info", &priv->menu_conv_info,
+                                      "menu_conv_contact", &priv->menu_conv_contact,
                                       "menu_conv_close", &priv->menu_conv_close,
-                                      "menu_room", &priv->menu_room,
-                                      "menu_room_set_topic", &priv->menu_room_set_topic,
-                                      "menu_room_join_new", &priv->menu_room_join_new,
-                                      "menu_room_invite", &priv->menu_room_invite,
-                                      "menu_room_add", &priv->menu_room_add,
-                                      "menu_room_show_contacts", &priv->menu_room_show_contacts,
                                       "menu_edit_cut", &priv->menu_edit_cut,
                                       "menu_edit_copy", &priv->menu_edit_copy,
                                       "menu_edit_paste", &priv->menu_edit_paste,
@@ -1408,15 +1131,7 @@ empathy_chat_window_init (EmpathyChatWindow *window)
                              "chat_window", "configure-event", chat_window_configure_event_cb,
                              "menu_conv", "activate", chat_window_conv_activate_cb,
                              "menu_conv_clear", "activate", chat_window_clear_activate_cb,
-                             "menu_conv_call", "activate", chat_window_call_activate_cb,
-                             "menu_conv_log", "activate", chat_window_log_activate_cb,
-                             "menu_conv_add_contact", "activate", chat_window_add_contact_activate_cb,
-                             "menu_conv_info", "activate", chat_window_info_activate_cb,
                              "menu_conv_close", "activate", chat_window_close_activate_cb,
-                             "menu_room_set_topic", "activate", chat_window_room_set_topic_activate_cb,
-                             "menu_room_join_new", "activate", chat_window_room_join_new_activate_cb,
-                             "menu_room_invite", "activate", chat_window_room_invite_activate_cb,
-                             "menu_room_add", "activate", chat_window_room_add_activate_cb,
                              "menu_edit", "activate", chat_window_edit_activate_cb,
                              "menu_edit_cut", "activate", chat_window_cut_activate_cb,
                              "menu_edit_copy", "activate", chat_window_copy_activate_cb,
@@ -1430,15 +1145,6 @@ empathy_chat_window_init (EmpathyChatWindow *window)
 
        g_object_unref (glade);
 
-       /* Set up chatroom manager */
-       priv->chatroom_manager = empathy_chatroom_manager_new ();
-       g_signal_connect_swapped (priv->chatroom_manager, "chatroom-added",
-                                 G_CALLBACK (chat_window_update_menu),
-                                 window);
-       g_signal_connect_swapped (priv->chatroom_manager, "chatroom-removed",
-                                 G_CALLBACK (chat_window_update_menu),
-                                 window);
-
        priv->notebook = gtk_notebook_new ();
        gtk_notebook_set_group (GTK_NOTEBOOK (priv->notebook), "EmpathyChatWindow"); 
        gtk_box_pack_start (GTK_BOX (chat_vbox), priv->notebook, TRUE, TRUE, 0);
@@ -1461,14 +1167,6 @@ empathy_chat_window_init (EmpathyChatWindow *window)
 
        g_object_unref (accel_group);
 
-       /* Set the contact information menu item image to the Empathy
-        * stock image
-        */
-       image = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (priv->menu_conv_info));
-       gtk_image_set_from_icon_name (GTK_IMAGE (image),
-                                     EMPATHY_IMAGE_CONTACT_INFORMATION,
-                                     GTK_ICON_SIZE_MENU);
-
        /* Set up smiley menu */
        menu = empathy_chat_view_get_smiley_menu (
                G_CALLBACK (chat_window_insert_smiley_activate_cb),
@@ -1484,11 +1182,6 @@ empathy_chat_window_init (EmpathyChatWindow *window)
                          G_CALLBACK (chat_window_delete_event_cb),
                          window);
 
-       g_signal_connect (priv->menu_room_show_contacts,
-                         "toggled",
-                         G_CALLBACK (chat_window_show_contacts_toggled_cb),
-                         window);
-
        g_signal_connect_swapped (priv->menu_tabs_prev,
                                  "activate",
                                  G_CALLBACK (gtk_notebook_prev_page),
@@ -1506,10 +1199,6 @@ empathy_chat_window_init (EmpathyChatWindow *window)
                                "switch_page",
                                G_CALLBACK (chat_window_page_switched_cb),
                                window);
-       g_signal_connect (priv->notebook,
-                         "page_reordered",
-                         G_CALLBACK (chat_window_page_reordered_cb),
-                         window);
        g_signal_connect (priv->notebook,
                          "page_added",
                          G_CALLBACK (chat_window_page_added_cb),
@@ -1610,7 +1299,7 @@ empathy_chat_window_add_chat (EmpathyChatWindow *window,
        /* Reference the chat object */
        g_object_ref (chat);
 
-       empathy_chat_load_geometry (chat, &x, &y, &w, &h);
+       empathy_geometry_load (chat_get_window_id_for_geometry (chat), &x, &y, &w, &h);
 
        if (x >= 0 && y >= 0) {
                /* Let the window manager position it if we don't have
@@ -1626,8 +1315,20 @@ empathy_chat_window_add_chat (EmpathyChatWindow *window,
                gtk_window_resize (GTK_WINDOW (priv->dialog), w, h);
        }
 
-       child = empathy_chat_get_widget (chat);
+       child = GTK_WIDGET (chat);
        label = chat_window_create_label (window, chat); 
+       gtk_widget_show (child);
+
+       g_signal_connect (chat, "notify::name",
+                         G_CALLBACK (chat_window_chat_notify_cb),
+                         NULL);
+       g_signal_connect (chat, "notify::subject",
+                         G_CALLBACK (chat_window_chat_notify_cb),
+                         NULL);
+       g_signal_connect (chat, "notify::remote-contact",
+                         G_CALLBACK (chat_window_chat_notify_cb),
+                         NULL);
+       chat_window_chat_notify_cb (chat);
 
        gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), child, label);
        gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (priv->notebook), child, TRUE);
@@ -1635,9 +1336,7 @@ empathy_chat_window_add_chat (EmpathyChatWindow *window,
        gtk_notebook_set_tab_label_packing (GTK_NOTEBOOK (priv->notebook), child,
                                            TRUE, TRUE, GTK_PACK_START); 
 
-       empathy_debug (DEBUG_DOMAIN, 
-                     "Chat added (%d references)",
-                     G_OBJECT (chat)->ref_count);
+       DEBUG ("Chat added (%d references)", G_OBJECT (chat)->ref_count);
 }
 
 void
@@ -1645,20 +1344,30 @@ empathy_chat_window_remove_chat (EmpathyChatWindow *window,
                                 EmpathyChat       *chat)
 {
        EmpathyChatWindowPriv *priv;
-       gint                  position;
+       gint                   position;
+       EmpathyContact        *remote_contact;
 
        g_return_if_fail (window != NULL);
        g_return_if_fail (EMPATHY_IS_CHAT (chat));
 
        priv = GET_PRIV (window);
 
+       g_signal_handlers_disconnect_by_func (chat,
+                                             chat_window_chat_notify_cb,
+                                             NULL);
+       remote_contact = g_object_get_data (G_OBJECT (chat),
+                                           "chat-window-remote-contact");
+       if (remote_contact) {
+               g_signal_handlers_disconnect_by_func (remote_contact,
+                                                     chat_window_update_chat_tab,
+                                                     chat);
+       }
+
        position = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook),
-                                         empathy_chat_get_widget (chat));
+                                         GTK_WIDGET (chat));
        gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook), position);
 
-       empathy_debug (DEBUG_DOMAIN, 
-                     "Chat removed (%d references)", 
-                     G_OBJECT (chat)->ref_count - 1);
+       DEBUG ("Chat removed (%d references)", G_OBJECT (chat)->ref_count - 1);
 
        g_object_unref (chat);
 }
@@ -1674,12 +1383,10 @@ empathy_chat_window_move_chat (EmpathyChatWindow *old_window,
        g_return_if_fail (EMPATHY_IS_CHAT_WINDOW (new_window));
        g_return_if_fail (EMPATHY_IS_CHAT (chat));
 
-       widget = empathy_chat_get_widget (chat);
+       widget = GTK_WIDGET (chat);
 
-       empathy_debug (DEBUG_DOMAIN,
-                     "Chat moving with widget:%p (%d references)", 
-                     widget,
-                     G_OBJECT (widget)->ref_count);
+       DEBUG ("Chat moving with widget:%p (%d references)", widget,
+               G_OBJECT (widget)->ref_count);
 
        /* We reference here to make sure we don't loose the widget
         * and the EmpathyChat object during the move.
@@ -1707,7 +1414,7 @@ empathy_chat_window_switch_to_chat (EmpathyChatWindow *window,
        priv = GET_PRIV (window);
 
        page_num = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook),
-                                         empathy_chat_get_widget (chat));
+                                         GTK_WIDGET (chat));
        gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook),
                                       page_num);
 }
@@ -1750,7 +1457,7 @@ empathy_chat_window_find_chat (McAccount   *account,
                        chat = ll->data;
 
                        if (empathy_account_equal (account, empathy_chat_get_account (chat)) &&
-                           strcmp (id, empathy_chat_get_id (chat)) == 0) {
+                           !tp_strdiff (id, empathy_chat_get_id (chat))) {
                                return chat;
                        }
                }
@@ -1786,3 +1493,17 @@ empathy_chat_window_present_chat (EmpathyChat *chat)
        gtk_widget_grab_focus (chat->input_text_view); 
 }
 
+#if 0
+static gboolean
+chat_window_should_play_sound (EmpathyChatWindow *window)
+{
+       EmpathyChatWindowPriv *priv = GET_PRIV (window);
+       gboolean               has_focus = FALSE;
+
+       g_return_val_if_fail (EMPATHY_IS_CHAT_WINDOW (window), FALSE);
+
+       g_object_get (priv->dialog, "has-toplevel-focus", &has_focus, NULL);
+
+       return !has_focus;
+}
+#endif