]> git.0d.be Git - empathy.git/blobdiff - libempathy/empathy-tp-chat.c
individual-menu: remove link-contacts-activated signal
[empathy.git] / libempathy / empathy-tp-chat.c
index 58011252999378f66da03c15ee534af6bcf62f15..4e26a769b5f4e803ea37de5f62c43f06e0ca161a 100644 (file)
@@ -30,7 +30,6 @@
 #include "empathy-tp-chat.h"
 #include "empathy-tp-contact-factory.h"
 #include "empathy-contact-list.h"
-#include "empathy-marshal.h"
 #include "empathy-request-util.h"
 #include "empathy-time.h"
 #include "empathy-utils.h"
 #define DEBUG_FLAG EMPATHY_DEBUG_TP | EMPATHY_DEBUG_CHAT
 #include "empathy-debug.h"
 
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyTpChat)
-typedef struct {
-       gboolean               dispose_has_run;
+struct _EmpathyTpChatPrivate {
        TpAccount             *account;
-       TpConnection          *connection;
        EmpathyContact        *user;
        EmpathyContact        *remote_contact;
        GList                 *members;
-       TpChannel             *channel;
        /* Queue of messages not signalled yet */
        GQueue                *messages_queue;
        /* Queue of messages signalled but not acked yet */
        GQueue                *pending_messages_queue;
-       gboolean               had_properties_list;
-       GPtrArray             *properties;
-       TpChannelPasswordFlags password_flags;
-       /* TRUE if we fetched the password flag of the channel or if it's not needed
-        * (channel doesn't implement the Password interface) */
-       gboolean               got_password_flags;
-       gboolean               ready;
+
+       /* Subject */
+       gboolean               supports_subject;
+       gboolean               can_set_subject;
+       gchar                 *subject;
+       gchar                 *subject_actor;
+
+       /* Room config (for now, we only track the title and don't support
+        * setting it) */
+       gchar                 *title;
+
        gboolean               can_upgrade_to_muc;
-} EmpathyTpChatPriv;
+
+       GHashTable            *messages_being_sent;
+
+       /* GSimpleAsyncResult used when preparing EMPATHY_TP_CHAT_FEATURE_CORE */
+       GSimpleAsyncResult    *ready_result;
+};
 
 static void tp_chat_iface_init         (EmpathyContactListIface *iface);
 
 enum {
        PROP_0,
        PROP_ACCOUNT,
-       PROP_CHANNEL,
+       PROP_SELF_CONTACT,
        PROP_REMOTE_CONTACT,
-       PROP_PASSWORD_NEEDED,
-       PROP_READY,
+       PROP_N_MESSAGES_SENDING,
+       PROP_TITLE,
+       PROP_SUBJECT,
 };
 
 enum {
        MESSAGE_RECEIVED,
        SEND_ERROR,
        CHAT_STATE_CHANGED,
-       PROPERTY_CHANGED,
-       DESTROY,
+       MESSAGE_ACKNOWLEDGED,
        LAST_SIGNAL
 };
 
 static guint signals[LAST_SIGNAL];
 
-G_DEFINE_TYPE_WITH_CODE (EmpathyTpChat, empathy_tp_chat, G_TYPE_OBJECT,
+G_DEFINE_TYPE_WITH_CODE (EmpathyTpChat, empathy_tp_chat, TP_TYPE_TEXT_CHANNEL,
                         G_IMPLEMENT_INTERFACE (EMPATHY_TYPE_CONTACT_LIST,
                                                tp_chat_iface_init));
 
-static void acknowledge_messages (EmpathyTpChat *chat, GArray *ids);
-
 static void
-tp_chat_invalidated_cb (TpProxy       *proxy,
-                       guint          domain,
-                       gint           code,
-                       gchar         *message,
-                       EmpathyTpChat *chat)
+tp_chat_set_delivery_status (EmpathyTpChat         *self,
+                            const gchar           *token,
+                            EmpathyDeliveryStatus  delivery_status)
 {
-       DEBUG ("Channel invalidated: %s", message);
-       g_signal_emit (chat, signals[DESTROY], 0);
+       TpDeliveryReportingSupportFlags flags =
+               tp_text_channel_get_delivery_reporting_support (
+                       TP_TEXT_CHANNEL (self));
+
+       /* channel must support receiving failures and successes */
+       if (!tp_str_empty (token) &&
+           flags & TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_FAILURES &&
+           flags & TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_SUCCESSES) {
+
+               DEBUG ("Delivery status (%s) = %u", token, delivery_status);
+
+               switch (delivery_status) {
+                       case EMPATHY_DELIVERY_STATUS_NONE:
+                               g_hash_table_remove (self->priv->messages_being_sent,
+                                       token);
+                               break;
+
+                       default:
+                               g_hash_table_insert (self->priv->messages_being_sent,
+                                       g_strdup (token),
+                                       GUINT_TO_POINTER (delivery_status));
+                               break;
+               }
+
+               g_object_notify (G_OBJECT (self), "n-messages-sending");
+       }
 }
 
+static void tp_chat_prepare_ready_async (TpProxy *proxy,
+       const TpProxyFeature *feature,
+       GAsyncReadyCallback callback,
+       gpointer user_data);
+
 static void
 tp_chat_async_cb (TpChannel *proxy,
                  const GError *error,
@@ -130,9 +159,10 @@ tp_chat_add (EmpathyContactList *list,
             EmpathyContact     *contact,
             const gchar        *message)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (list);
+       EmpathyTpChat *self = (EmpathyTpChat *) list;
+       TpChannel *channel = (TpChannel *) self;
 
-       if (tp_proxy_has_interface_by_id (priv->channel,
+       if (tp_proxy_has_interface_by_id (self,
                TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP)) {
                TpHandle           handle;
                GArray             handles = {(gchar *) &handle, 1};
@@ -141,9 +171,9 @@ tp_chat_add (EmpathyContactList *list,
                g_return_if_fail (EMPATHY_IS_CONTACT (contact));
 
                handle = empathy_contact_get_handle (contact);
-               tp_cli_channel_interface_group_call_add_members (priv->channel,
+               tp_cli_channel_interface_group_call_add_members (channel,
                        -1, &handles, NULL, NULL, NULL, NULL, NULL);
-       } else if (priv->can_upgrade_to_muc) {
+       } else if (self->priv->can_upgrade_to_muc) {
                TpAccountChannelRequest *req;
                GHashTable        *props;
                const char        *object_path;
@@ -151,7 +181,7 @@ tp_chat_add (EmpathyContactList *list,
                const char        *invitees[2] = { NULL, };
 
                invitees[0] = empathy_contact_get_id (contact);
-               object_path = tp_proxy_get_object_path (priv->channel);
+               object_path = tp_proxy_get_object_path (self);
 
                props = tp_asv_new (
                    TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
@@ -165,7 +195,7 @@ tp_chat_add (EmpathyContactList *list,
                    /* FIXME: InvitationMessage ? */
                    NULL);
 
-               req = tp_account_channel_request_new (priv->account, props,
+               req = tp_account_channel_request_new (self->priv->account, props,
                        TP_USER_ACTION_TIME_NOT_USER_ACTION);
 
                /* Although this is a MUC, it's anonymous, so CreateChannel is
@@ -185,7 +215,7 @@ tp_chat_remove (EmpathyContactList *list,
                EmpathyContact     *contact,
                const gchar        *message)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (list);
+       EmpathyTpChat *self = (EmpathyTpChat *) list;
        TpHandle           handle;
        GArray             handles = {(gchar *) &handle, 1};
 
@@ -193,7 +223,7 @@ tp_chat_remove (EmpathyContactList *list,
        g_return_if_fail (EMPATHY_IS_CONTACT (contact));
 
        handle = empathy_contact_get_handle (contact);
-       tp_cli_channel_interface_group_call_remove_members (priv->channel, -1,
+       tp_cli_channel_interface_group_call_remove_members ((TpChannel *) self, -1,
                                                            &handles, NULL,
                                                            NULL, NULL, NULL,
                                                            NULL);
@@ -202,59 +232,56 @@ tp_chat_remove (EmpathyContactList *list,
 static GList *
 tp_chat_get_members (EmpathyContactList *list)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (list);
+       EmpathyTpChat *self = (EmpathyTpChat *) list;
        GList             *members = NULL;
 
        g_return_val_if_fail (EMPATHY_IS_TP_CHAT (list), NULL);
 
-       if (priv->members) {
-               members = g_list_copy (priv->members);
+       if (self->priv->members) {
+               members = g_list_copy (self->priv->members);
                g_list_foreach (members, (GFunc) g_object_ref, NULL);
        } else {
-               members = g_list_prepend (members, g_object_ref (priv->user));
-               if (priv->remote_contact != NULL)
-                       members = g_list_prepend (members, g_object_ref (priv->remote_contact));
+               members = g_list_prepend (members, g_object_ref (self->priv->user));
+               if (self->priv->remote_contact != NULL)
+                       members = g_list_prepend (members, g_object_ref (self->priv->remote_contact));
        }
 
        return members;
 }
 
 static void
-check_ready (EmpathyTpChat *chat)
+check_ready (EmpathyTpChat *self)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
-
-       if (priv->ready)
+       if (self->priv->ready_result == NULL)
                return;
 
-       if (g_queue_get_length (priv->messages_queue) > 0)
+       if (g_queue_get_length (self->priv->messages_queue) > 0)
                return;
 
        DEBUG ("Ready");
 
-       priv->ready = TRUE;
-       g_object_notify (G_OBJECT (chat), "ready");
+       g_simple_async_result_complete (self->priv->ready_result);
+       tp_clear_object (&self->priv->ready_result);
 }
 
 static void
-tp_chat_emit_queued_messages (EmpathyTpChat *chat)
+tp_chat_emit_queued_messages (EmpathyTpChat *self)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
        EmpathyMessage    *message;
 
        /* Check if we can now emit some queued messages */
-       while ((message = g_queue_peek_head (priv->messages_queue)) != NULL) {
+       while ((message = g_queue_peek_head (self->priv->messages_queue)) != NULL) {
                if (empathy_message_get_sender (message) == NULL) {
                        break;
                }
 
                DEBUG ("Queued message ready");
-               g_queue_pop_head (priv->messages_queue);
-               g_queue_push_tail (priv->pending_messages_queue, message);
-               g_signal_emit (chat, signals[MESSAGE_RECEIVED], 0, message);
+               g_queue_pop_head (self->priv->messages_queue);
+               g_queue_push_tail (self->priv->pending_messages_queue, message);
+               g_signal_emit (self, signals[MESSAGE_RECEIVED], 0, message);
        }
 
-       check_ready (chat);
+       check_ready (self);
 }
 
 static void
@@ -264,47 +291,47 @@ tp_chat_got_sender_cb (TpConnection            *connection,
                       gpointer                 message,
                       GObject                 *chat)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
+       EmpathyTpChat *self = (EmpathyTpChat *) chat;
 
        if (error) {
                DEBUG ("Error: %s", error->message);
                /* Do not block the message queue, just drop this message */
-               g_queue_remove (priv->messages_queue, message);
+               g_queue_remove (self->priv->messages_queue, message);
        } else {
                empathy_message_set_sender (message, contact);
        }
 
-       tp_chat_emit_queued_messages (EMPATHY_TP_CHAT (chat));
+       tp_chat_emit_queued_messages (EMPATHY_TP_CHAT (self));
 }
 
 static void
-tp_chat_build_message (EmpathyTpChat *chat,
+tp_chat_build_message (EmpathyTpChat *self,
                       TpMessage     *msg,
                       gboolean       incoming)
 {
-       EmpathyTpChatPriv *priv;
        EmpathyMessage    *message;
        TpContact *sender;
 
-       priv = GET_PRIV (chat);
-
        message = empathy_message_new_from_tp_message (msg, incoming);
        /* FIXME: this is actually a lie for incoming messages. */
-       empathy_message_set_receiver (message, priv->user);
+       empathy_message_set_receiver (message, self->priv->user);
 
-       g_queue_push_tail (priv->messages_queue, message);
+       g_queue_push_tail (self->priv->messages_queue, message);
 
        sender = tp_signalled_message_get_sender (msg);
        g_assert (sender != NULL);
 
        if (tp_contact_get_handle (sender) == 0) {
-               empathy_message_set_sender (message, priv->user);
-               tp_chat_emit_queued_messages (chat);
+               empathy_message_set_sender (message, self->priv->user);
+               tp_chat_emit_queued_messages (self);
        } else {
-               empathy_tp_contact_factory_get_from_handle (priv->connection,
+               TpConnection *connection = tp_channel_borrow_connection (
+                       (TpChannel *) self);
+
+               empathy_tp_contact_factory_get_from_handle (connection,
                        tp_contact_get_handle (sender),
                        tp_chat_got_sender_cb,
-                       message, NULL, G_OBJECT (chat));
+                       message, NULL, G_OBJECT (self));
        }
 }
 
@@ -312,31 +339,50 @@ static void
 handle_delivery_report (EmpathyTpChat *self,
                TpMessage *message)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (self);
        TpDeliveryStatus delivery_status;
        const GHashTable *header;
        TpChannelTextSendError delivery_error;
        gboolean valid;
        GPtrArray *echo;
        const gchar *message_body = NULL;
+       const gchar *delivery_dbus_error;
+       const gchar *delivery_token = NULL;
 
        header = tp_message_peek (message, 0);
        if (header == NULL)
                goto out;
 
+       delivery_token = tp_asv_get_string (header, "delivery-token");
        delivery_status = tp_asv_get_uint32 (header, "delivery-status", &valid);
-       if (!valid || delivery_status != TP_DELIVERY_STATUS_PERMANENTLY_FAILED)
+
+       if (!valid) {
+               goto out;
+       } else if (delivery_status == TP_DELIVERY_STATUS_ACCEPTED) {
+               DEBUG ("Accepted %s", delivery_token);
+               tp_chat_set_delivery_status (self, delivery_token,
+                       EMPATHY_DELIVERY_STATUS_ACCEPTED);
+               goto out;
+       } else if (delivery_status == TP_DELIVERY_STATUS_DELIVERED) {
+               DEBUG ("Delivered %s", delivery_token);
+               tp_chat_set_delivery_status (self, delivery_token,
+                       EMPATHY_DELIVERY_STATUS_NONE);
                goto out;
+       } else if (delivery_status != TP_DELIVERY_STATUS_PERMANENTLY_FAILED &&
+                  delivery_status != TP_DELIVERY_STATUS_TEMPORARILY_FAILED) {
+               goto out;
+       }
 
        delivery_error = tp_asv_get_uint32 (header, "delivery-error", &valid);
        if (!valid)
                delivery_error = TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN;
 
+       delivery_dbus_error = tp_asv_get_string (header, "delivery-dbus-error");
+
        /* TODO: ideally we should use tp-glib API giving us the echoed message as a
         * TpMessage. (fdo #35884) */
        echo = tp_asv_get_boxed (header, "delivery-echo",
                TP_ARRAY_TYPE_MESSAGE_PART_LIST);
-       if (echo != NULL && echo->len >= 1) {
+       if (echo != NULL && echo->len >= 2) {
                const GHashTable *echo_body;
 
                echo_body = g_ptr_array_index (echo, 1);
@@ -344,10 +390,13 @@ handle_delivery_report (EmpathyTpChat *self,
                        message_body = tp_asv_get_string (echo_body, "content");
        }
 
-       g_signal_emit (self, signals[SEND_ERROR], 0, message_body, delivery_error);
+       tp_chat_set_delivery_status (self, delivery_token,
+                       EMPATHY_DELIVERY_STATUS_NONE);
+       g_signal_emit (self, signals[SEND_ERROR], 0, message_body,
+                       delivery_error, delivery_dbus_error);
 
 out:
-       tp_text_channel_ack_message_async (TP_TEXT_CHANNEL (priv->channel),
+       tp_text_channel_ack_message_async (TP_TEXT_CHANNEL (self),
                message, NULL, NULL);
 }
 
@@ -356,7 +405,6 @@ handle_incoming_message (EmpathyTpChat *self,
                         TpMessage *message,
                         gboolean pending)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (self);
        gchar *message_body;
 
        if (tp_message_is_delivery_report (message)) {
@@ -368,12 +416,12 @@ handle_incoming_message (EmpathyTpChat *self,
 
        DEBUG ("Message %s (channel %s): %s",
                pending ? "pending" : "received",
-               tp_proxy_get_object_path (priv->channel), message_body);
+               tp_proxy_get_object_path (self), message_body);
 
        if (message_body == NULL) {
                DEBUG ("Empty message with NonTextContent, ignoring and acking.");
 
-               tp_text_channel_ack_message_async (TP_TEXT_CHANNEL (priv->channel),
+               tp_text_channel_ack_message_async (TP_TEXT_CHANNEL (self),
                        message, NULL, NULL);
                return;
        }
@@ -386,9 +434,41 @@ handle_incoming_message (EmpathyTpChat *self,
 static void
 message_received_cb (TpTextChannel   *channel,
                     TpMessage *message,
-                    EmpathyTpChat *chat)
+                    EmpathyTpChat *self)
+{
+       handle_incoming_message (self, message, FALSE);
+}
+
+static gboolean
+find_pending_message_func (gconstpointer a,
+                          gconstpointer b)
+{
+       EmpathyMessage *msg = (EmpathyMessage *) a;
+       TpMessage *message = (TpMessage *) b;
+
+       if (empathy_message_get_tp_message (msg) == message)
+               return 0;
+
+       return -1;
+}
+
+static void
+pending_message_removed_cb (TpTextChannel   *channel,
+                           TpMessage *message,
+                           EmpathyTpChat *self)
 {
-       handle_incoming_message (chat, message, FALSE);
+       GList *m;
+
+       m = g_queue_find_custom (self->priv->pending_messages_queue, message,
+                                find_pending_message_func);
+
+       if (m == NULL)
+               return;
+
+       g_signal_emit (self, signals[MESSAGE_ACKNOWLEDGED], 0, m->data);
+
+       g_object_unref (m->data);
+       g_queue_delete_link (self->priv->pending_messages_queue, m);
 }
 
 static void
@@ -396,7 +476,7 @@ message_sent_cb (TpTextChannel   *channel,
                 TpMessage *message,
                 TpMessageSendingFlags flags,
                 gchar              *token,
-                EmpathyTpChat      *chat)
+                EmpathyTpChat      *self)
 {
        gchar *message_body;
 
@@ -404,7 +484,7 @@ message_sent_cb (TpTextChannel   *channel,
 
        DEBUG ("Message sent: %s", message_body);
 
-       tp_chat_build_message (chat, message, FALSE);
+       tp_chat_build_message (self, message, FALSE);
 
        g_free (message_body);
 }
@@ -434,22 +514,27 @@ message_send_cb (GObject *source,
                 GAsyncResult *result,
                 gpointer      user_data)
 {
-       EmpathyTpChat *chat = user_data;
+       EmpathyTpChat *self = user_data;
        TpTextChannel *channel = (TpTextChannel *) source;
+       gchar *token = NULL;
        GError *error = NULL;
 
-       if (!tp_text_channel_send_message_finish (channel, result, NULL, &error)) {
+       if (!tp_text_channel_send_message_finish (channel, result, &token, &error)) {
                DEBUG ("Error: %s", error->message);
 
                /* FIXME: we should use the body of the message as first argument of the
                 * signal but can't easily get it as we just get a user_data pointer. Once
                 * we'll have rebased EmpathyTpChat on top of TpTextChannel we'll be able
                 * to use the user_data pointer to pass the message and fix this. */
-               g_signal_emit (chat, signals[SEND_ERROR], 0,
-                              NULL, error_to_text_send_error (error));
+               g_signal_emit (self, signals[SEND_ERROR], 0,
+                              NULL, error_to_text_send_error (error), NULL);
 
                g_error_free (error);
        }
+
+       tp_chat_set_delivery_status (self, token,
+               EMPATHY_DELIVERY_STATUS_SENDING);
+       g_free (token);
 }
 
 typedef struct {
@@ -483,26 +568,23 @@ static void
 tp_chat_state_changed_cb (TpChannel *channel,
                          TpHandle   handle,
                          TpChannelChatState state,
-                         gpointer   user_data,
-                         GObject   *chat)
+                         EmpathyTpChat *self)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
+       TpConnection *connection = tp_channel_borrow_connection (
+               (TpChannel *) self);
 
-       empathy_tp_contact_factory_get_from_handle (priv->connection, handle,
+       empathy_tp_contact_factory_get_from_handle (connection, handle,
                tp_chat_state_changed_got_contact_cb, GUINT_TO_POINTER (state),
-               NULL, chat);
+               NULL, G_OBJECT (self));
 }
 
 static void
 list_pending_messages (EmpathyTpChat *self)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (self);
        GList *messages, *l;
 
-       g_assert (priv->channel != NULL);
-
        messages = tp_text_channel_get_pending_messages (
-               TP_TEXT_CHANNEL (priv->channel));
+               TP_TEXT_CHANNEL (self));
 
        for (l = messages; l != NULL; l = g_list_next (l)) {
                TpMessage *message = l->data;
@@ -514,273 +596,183 @@ list_pending_messages (EmpathyTpChat *self)
 }
 
 static void
-tp_chat_property_flags_changed_cb (TpProxy         *proxy,
-                                  const GPtrArray *properties,
-                                  gpointer         user_data,
-                                  GObject         *chat)
+update_subject (EmpathyTpChat *self,
+               GHashTable *properties)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
-       guint              i, j;
-
-       if (priv->channel == NULL)
-               return;
+       EmpathyTpChatPrivate *priv = self->priv;
+       gboolean can_set, valid;
+       const gchar *subject;
 
-       if (!priv->had_properties_list || !properties) {
-               return;
+       can_set = tp_asv_get_boolean (properties, "CanSet", &valid);
+       if (valid) {
+               priv->can_set_subject = can_set;
        }
 
-       for (i = 0; i < properties->len; i++) {
-               GValueArray           *prop_struct;
-               EmpathyTpChatProperty *property;
-               guint                  id;
-               guint                  flags;
-
-               prop_struct = g_ptr_array_index (properties, i);
-               id = g_value_get_uint (g_value_array_get_nth (prop_struct, 0));
-               flags = g_value_get_uint (g_value_array_get_nth (prop_struct, 1));
-
-               for (j = 0; j < priv->properties->len; j++) {
-                       property = g_ptr_array_index (priv->properties, j);
-                       if (property->id == id) {
-                               property->flags = flags;
-                               DEBUG ("property %s flags changed: %d",
-                                       property->name, property->flags);
-                               break;
-                       }
-               }
+       subject = tp_asv_get_string (properties, "Subject");
+       if (subject != NULL) {
+               const gchar *actor;
+
+               g_free (priv->subject);
+               priv->subject = g_strdup (subject);
+
+               /* If the actor is included with this update, use it;
+                * otherwise, clear it to avoid showing stale information.
+                * Why might it not be included? When you join an IRC channel,
+                * you get a pair of messages: first, the current topic; next,
+                * who set it, and when. Idle reports these in two separate
+                * signals.
+                */
+               actor = tp_asv_get_string (properties, "Actor");
+               g_free (priv->subject_actor);
+               priv->subject_actor = g_strdup (actor);
+
+               g_object_notify (G_OBJECT (self), "subject");
        }
+
+       /* TODO: track Timestamp. */
 }
 
 static void
-tp_chat_properties_changed_cb (TpProxy         *proxy,
-                              const GPtrArray *properties,
-                              gpointer         user_data,
-                              GObject         *chat)
+tp_chat_get_all_subject_cb (TpProxy      *proxy,
+                           GHashTable   *properties,
+                           const GError *error,
+                           gpointer      user_data G_GNUC_UNUSED,
+                           GObject      *chat)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
-       guint              i, j;
+       EmpathyTpChat *self = EMPATHY_TP_CHAT (chat);
+       EmpathyTpChatPrivate *priv = self->priv;
 
-       if (priv->channel == NULL)
-               return;
-
-       if (!priv->had_properties_list || !properties) {
+       if (error) {
+               DEBUG ("Error fetching subject: %s", error->message);
                return;
        }
 
-       for (i = 0; i < properties->len; i++) {
-               GValueArray           *prop_struct;
-               EmpathyTpChatProperty *property;
-               guint                  id;
-               GValue                *src_value;
-
-               prop_struct = g_ptr_array_index (properties, i);
-               id = g_value_get_uint (g_value_array_get_nth (prop_struct, 0));
-               src_value = g_value_get_boxed (g_value_array_get_nth (prop_struct, 1));
-
-               for (j = 0; j < priv->properties->len; j++) {
-                       property = g_ptr_array_index (priv->properties, j);
-                       if (property->id == id) {
-                               if (property->value) {
-                                       g_value_copy (src_value, property->value);
-                               } else {
-                                       property->value = tp_g_value_slice_dup (src_value);
-                               }
-
-                               DEBUG ("property %s changed", property->name);
-                               g_signal_emit (chat, signals[PROPERTY_CHANGED], 0,
-                                              property->name, property->value);
-                               break;
-                       }
+       priv->supports_subject = TRUE;
+       update_subject (self, properties);
+}
+
+static void
+update_title (EmpathyTpChat *self,
+             GHashTable *properties)
+{
+       EmpathyTpChatPrivate *priv = self->priv;
+       const gchar *title = tp_asv_get_string (properties, "Title");
+
+       if (title != NULL) {
+               if (tp_str_empty (title)) {
+                       title = NULL;
                }
+
+               g_free (priv->title);
+               priv->title = g_strdup (title);
+               g_object_notify (G_OBJECT (self), "title");
        }
 }
 
 static void
-tp_chat_get_properties_cb (TpProxy         *proxy,
-                          const GPtrArray *properties,
-                          const GError    *error,
-                          gpointer         user_data,
-                          GObject         *chat)
+tp_chat_get_all_room_config_cb (TpProxy      *proxy,
+                               GHashTable   *properties,
+                               const GError *error,
+                               gpointer      user_data G_GNUC_UNUSED,
+                               GObject      *chat)
 {
+       EmpathyTpChat *self = EMPATHY_TP_CHAT (chat);
+
        if (error) {
-               DEBUG ("Error getting properties: %s", error->message);
+               DEBUG ("Error fetching room config: %s", error->message);
                return;
        }
 
-       tp_chat_properties_changed_cb (proxy, properties, user_data, chat);
+       update_title (self, properties);
 }
 
 static void
-tp_chat_list_properties_cb (TpProxy         *proxy,
-                           const GPtrArray *properties,
-                           const GError    *error,
-                           gpointer         user_data,
-                           GObject         *chat)
+tp_chat_dbus_properties_changed_cb (TpProxy *proxy,
+                                   const gchar *interface_name,
+                                   GHashTable *changed,
+                                   const gchar **invalidated,
+                                   gpointer user_data,
+                                   GObject *chat)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
-       GArray            *ids;
-       guint              i;
-
-       if (priv->channel == NULL)
-               return;
-
-       priv->had_properties_list = TRUE;
+       EmpathyTpChat *self = EMPATHY_TP_CHAT (chat);
 
-       if (error) {
-               DEBUG ("Error listing properties: %s", error->message);
-               return;
+       if (!tp_strdiff (interface_name, TP_IFACE_CHANNEL_INTERFACE_SUBJECT)) {
+               update_subject (self, changed);
        }
 
-       ids = g_array_sized_new (FALSE, FALSE, sizeof (guint), properties->len);
-       priv->properties = g_ptr_array_sized_new (properties->len);
-       for (i = 0; i < properties->len; i++) {
-               GValueArray           *prop_struct;
-               EmpathyTpChatProperty *property;
-
-               prop_struct = g_ptr_array_index (properties, i);
-               property = g_slice_new0 (EmpathyTpChatProperty);
-               property->id = g_value_get_uint (g_value_array_get_nth (prop_struct, 0));
-               property->name = g_value_dup_string (g_value_array_get_nth (prop_struct, 1));
-               property->flags = g_value_get_uint (g_value_array_get_nth (prop_struct, 3));
-
-               DEBUG ("Adding property name=%s id=%d flags=%d",
-                       property->name, property->id, property->flags);
-               g_ptr_array_add (priv->properties, property);
-               if (property->flags & TP_PROPERTY_FLAG_READ) {
-                       g_array_append_val (ids, property->id);
-               }
+       if (!tp_strdiff (interface_name, TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG)) {
+               update_title (self, changed);
        }
-
-       tp_cli_properties_interface_call_get_properties (proxy, -1,
-                                                        ids,
-                                                        tp_chat_get_properties_cb,
-                                                        NULL, NULL,
-                                                        chat);
-
-       g_array_free (ids, TRUE);
 }
 
 void
-empathy_tp_chat_set_property (EmpathyTpChat *chat,
-                             const gchar   *name,
-                             const GValue  *value)
+empathy_tp_chat_set_subject (EmpathyTpChat *self,
+                            const gchar   *subject)
 {
-       EmpathyTpChatPriv     *priv = GET_PRIV (chat);
-       EmpathyTpChatProperty *property;
-       guint                  i;
-
-       if (!priv->had_properties_list) {
-               return;
-       }
-
-       for (i = 0; i < priv->properties->len; i++) {
-               property = g_ptr_array_index (priv->properties, i);
-               if (!tp_strdiff (property->name, name)) {
-                       GPtrArray   *properties;
-                       GValueArray *prop;
-                       GValue       id = {0, };
-                       GValue       dest_value = {0, };
-
-                       if (!(property->flags & TP_PROPERTY_FLAG_WRITE)) {
-                               break;
-                       }
-
-                       g_value_init (&id, G_TYPE_UINT);
-                       g_value_init (&dest_value, G_TYPE_VALUE);
-                       g_value_set_uint (&id, property->id);
-                       g_value_set_boxed (&dest_value, value);
-
-                       prop = g_value_array_new (2);
-                       g_value_array_append (prop, &id);
-                       g_value_array_append (prop, &dest_value);
+       tp_cli_channel_interface_subject_call_set_subject (TP_CHANNEL (self), -1,
+                                                          subject,
+                                                          tp_chat_async_cb,
+                                                          "while setting subject", NULL,
+                                                          G_OBJECT (self));
+}
 
-                       properties = g_ptr_array_sized_new (1);
-                       g_ptr_array_add (properties, prop);
+const gchar *
+empathy_tp_chat_get_title (EmpathyTpChat *self)
+{
+       EmpathyTpChatPrivate *priv = self->priv;
 
-                       DEBUG ("Set property %s", name);
-                       tp_cli_properties_interface_call_set_properties (priv->channel, -1,
-                                                                        properties,
-                                                                        (tp_cli_properties_interface_callback_for_set_properties)
-                                                                        tp_chat_async_cb,
-                                                                        "Seting property", NULL,
-                                                                        G_OBJECT (chat));
+       return priv->title;
+}
 
-                       g_ptr_array_free (properties, TRUE);
-                       g_value_array_free (prop);
+gboolean
+empathy_tp_chat_supports_subject (EmpathyTpChat *self)
+{
+       EmpathyTpChatPrivate *priv = self->priv;
 
-                       break;
-               }
-       }
+       return priv->supports_subject;
 }
 
-EmpathyTpChatProperty *
-empathy_tp_chat_get_property (EmpathyTpChat *chat,
-                             const gchar   *name)
+gboolean
+empathy_tp_chat_can_set_subject (EmpathyTpChat *self)
 {
-       EmpathyTpChatPriv     *priv = GET_PRIV (chat);
-       EmpathyTpChatProperty *property;
-       guint                  i;
+       EmpathyTpChatPrivate *priv = self->priv;
 
-       if (!priv->had_properties_list) {
-               return NULL;
-       }
+       return priv->can_set_subject;
+}
 
-       for (i = 0; i < priv->properties->len; i++) {
-               property = g_ptr_array_index (priv->properties, i);
-               if (!tp_strdiff (property->name, name)) {
-                       return property;
-               }
-       }
+const gchar *
+empathy_tp_chat_get_subject (EmpathyTpChat *self)
+{
+       EmpathyTpChatPrivate *priv = self->priv;
 
-       return NULL;
+       return priv->subject;
 }
 
-GPtrArray *
-empathy_tp_chat_get_properties (EmpathyTpChat *chat)
+const gchar *
+empathy_tp_chat_get_subject_actor (EmpathyTpChat *self)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
+       EmpathyTpChatPrivate *priv = self->priv;
 
-       return priv->properties;
+       return priv->subject_actor;
 }
 
 static void
 tp_chat_dispose (GObject *object)
 {
        EmpathyTpChat *self = EMPATHY_TP_CHAT (object);
-       EmpathyTpChatPriv *priv = GET_PRIV (self);
-
-       if (priv->dispose_has_run)
-               return;
-
-       priv->dispose_has_run = TRUE;
 
-       tp_clear_object (&priv->account);
+       tp_clear_object (&self->priv->account);
+       tp_clear_object (&self->priv->remote_contact);
+       tp_clear_object (&self->priv->user);
 
-       if (priv->connection != NULL)
-               g_object_unref (priv->connection);
-       priv->connection = NULL;
+       g_queue_foreach (self->priv->messages_queue, (GFunc) g_object_unref, NULL);
+       g_queue_clear (self->priv->messages_queue);
 
-       if (priv->channel != NULL) {
-               g_signal_handlers_disconnect_by_func (priv->channel,
-                       tp_chat_invalidated_cb, self);
-               g_object_unref (priv->channel);
-       }
-       priv->channel = NULL;
-
-       if (priv->remote_contact != NULL)
-               g_object_unref (priv->remote_contact);
-       priv->remote_contact = NULL;
-
-       if (priv->user != NULL)
-               g_object_unref (priv->user);
-       priv->user = NULL;
-
-       g_queue_foreach (priv->messages_queue, (GFunc) g_object_unref, NULL);
-       g_queue_clear (priv->messages_queue);
-
-       g_queue_foreach (priv->pending_messages_queue,
+       g_queue_foreach (self->priv->pending_messages_queue,
                (GFunc) g_object_unref, NULL);
-       g_queue_clear (priv->pending_messages_queue);
+       g_queue_clear (self->priv->pending_messages_queue);
+
+       tp_clear_object (&self->priv->ready_result);
 
        if (G_OBJECT_CLASS (empathy_tp_chat_parent_class)->dispose)
                G_OBJECT_CLASS (empathy_tp_chat_parent_class)->dispose (object);
@@ -789,130 +781,56 @@ tp_chat_dispose (GObject *object)
 static void
 tp_chat_finalize (GObject *object)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (object);
-       guint              i;
+       EmpathyTpChat *self = (EmpathyTpChat *) object;
 
        DEBUG ("Finalize: %p", object);
 
-       if (priv->properties) {
-               for (i = 0; i < priv->properties->len; i++) {
-                       EmpathyTpChatProperty *property;
+       g_queue_free (self->priv->messages_queue);
+       g_queue_free (self->priv->pending_messages_queue);
+       g_hash_table_unref (self->priv->messages_being_sent);
 
-                       property = g_ptr_array_index (priv->properties, i);
-                       g_free (property->name);
-                       if (property->value) {
-                               tp_g_value_slice_free (property->value);
-                       }
-                       g_slice_free (EmpathyTpChatProperty, property);
-               }
-               g_ptr_array_free (priv->properties, TRUE);
-       }
-
-       g_queue_free (priv->messages_queue);
-       g_queue_free (priv->pending_messages_queue);
+       g_free (self->priv->title);
+       g_free (self->priv->subject);
+       g_free (self->priv->subject_actor);
 
        G_OBJECT_CLASS (empathy_tp_chat_parent_class)->finalize (object);
 }
 
 static void
-check_almost_ready (EmpathyTpChat *chat)
+check_almost_ready (EmpathyTpChat *self)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
-
-       if (priv->ready)
-               return;
+       TpChannel *channel = (TpChannel *) self;
 
-       if (priv->user == NULL)
+       if (self->priv->ready_result == NULL)
                return;
 
-       if (!priv->got_password_flags)
+       if (self->priv->user == NULL)
                return;
 
        /* We need either the members (room) or the remote contact (private chat).
         * If the chat is protected by a password we can't get these information so
         * consider the chat as ready so it can be presented to the user. */
-       if (!empathy_tp_chat_password_needed (chat) && priv->members == NULL &&
-           priv->remote_contact == NULL)
+       if (!tp_channel_password_needed (channel) && self->priv->members == NULL &&
+           self->priv->remote_contact == NULL)
                return;
 
-       /* We use the default factory so this feature should have been prepared */
-       g_assert (tp_proxy_is_prepared (priv->channel,
+       g_assert (tp_proxy_is_prepared (self,
                TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES));
 
-       tp_g_signal_connect_object (priv->channel, "message-received",
-               G_CALLBACK (message_received_cb), chat, 0);
-
-       list_pending_messages (chat);
-
-       tp_g_signal_connect_object (priv->channel, "message-sent",
-               G_CALLBACK (message_sent_cb), chat, 0);
-
-       tp_cli_channel_interface_chat_state_connect_to_chat_state_changed (priv->channel,
-                                                                          tp_chat_state_changed_cb,
-                                                                          NULL, NULL,
-                                                                          G_OBJECT (chat), NULL);
-
-       check_ready (chat);
-}
-
-static void
-tp_chat_update_remote_contact (EmpathyTpChat *chat)
-{
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
-       EmpathyContact *contact = NULL;
-       TpHandle self_handle;
-       TpHandleType handle_type;
-       GList *l;
-
-       /* If this is a named chatroom, never pretend it is a private chat */
-       tp_channel_get_handle (priv->channel, &handle_type);
-       if (handle_type == TP_HANDLE_TYPE_ROOM) {
-               return;
-       }
-
-       /* This is an MSN chat, but it's the new style where 1-1 chats don't
-        * have the group interface. If it has the conference interface, then
-        * it is indeed a MUC. */
-       if (tp_proxy_has_interface_by_id (priv->channel,
-                                         TP_IFACE_QUARK_CHANNEL_INTERFACE_CONFERENCE)) {
-               return;
-       }
-
-       /* This is an MSN-like chat where anyone can join the chat at anytime.
-        * If there is only one non-self contact member, we are in a private
-        * chat and we set the "remote-contact" property to that contact. If
-        * there are more, set the "remote-contact" property to NULL and the
-        * UI will display a contact list. */
-       self_handle = tp_channel_group_get_self_handle (priv->channel);
-       for (l = priv->members; l; l = l->next) {
-               /* Skip self contact if member */
-               if (empathy_contact_get_handle (l->data) == self_handle) {
-                       continue;
-               }
-
-               /* We have more than one remote contact, break */
-               if (contact != NULL) {
-                       contact = NULL;
-                       break;
-               }
-
-               /* If we didn't find yet a remote contact, keep this one */
-               contact = l->data;
-       }
+       tp_g_signal_connect_object (self, "message-received",
+               G_CALLBACK (message_received_cb), self, 0);
+       tp_g_signal_connect_object (self, "pending-message-removed",
+               G_CALLBACK (pending_message_removed_cb), self, 0);
 
-       if (priv->remote_contact == contact) {
-               return;
-       }
+       list_pending_messages (self);
 
-       DEBUG ("Changing remote contact from %p to %p",
-               priv->remote_contact, contact);
+       tp_g_signal_connect_object (self, "message-sent",
+               G_CALLBACK (message_sent_cb), self, 0);
 
-       if (priv->remote_contact) {
-               g_object_unref (priv->remote_contact);
-       }
+       tp_g_signal_connect_object (self, "chat-state-changed",
+               G_CALLBACK (tp_chat_state_changed_cb), self, 0);
 
-       priv->remote_contact = contact ? g_object_ref (contact) : NULL;
-       g_object_notify (G_OBJECT (chat), "remote-contact");
+       check_ready (self);
 }
 
 static void
@@ -925,7 +843,7 @@ tp_chat_got_added_contacts_cb (TpConnection            *connection,
                               gpointer                 user_data,
                               GObject                 *chat)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
+       EmpathyTpChat *self = (EmpathyTpChat *) chat;
        guint i;
        const TpIntSet *members;
        TpHandle handle;
@@ -936,33 +854,31 @@ tp_chat_got_added_contacts_cb (TpConnection            *connection,
                return;
        }
 
-       members = tp_channel_group_get_members (priv->channel);
+       members = tp_channel_group_get_members ((TpChannel *) self);
        for (i = 0; i < n_contacts; i++) {
                contact = contacts[i];
                handle = empathy_contact_get_handle (contact);
 
                /* Make sure the contact is still member */
                if (tp_intset_is_member (members, handle)) {
-                       priv->members = g_list_prepend (priv->members,
+                       self->priv->members = g_list_prepend (self->priv->members,
                                g_object_ref (contact));
                        g_signal_emit_by_name (chat, "members-changed",
                                               contact, NULL, 0, NULL, TRUE);
                }
        }
 
-       tp_chat_update_remote_contact (EMPATHY_TP_CHAT (chat));
        check_almost_ready (EMPATHY_TP_CHAT (chat));
 }
 
 static EmpathyContact *
-chat_lookup_contact (EmpathyTpChat *chat,
+chat_lookup_contact (EmpathyTpChat *self,
                     TpHandle       handle,
                     gboolean       remove_)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
        GList *l;
 
-       for (l = priv->members; l; l = l->next) {
+       for (l = self->priv->members; l; l = l->next) {
                EmpathyContact *c = l->data;
 
                if (empathy_contact_get_handle (c) != handle) {
@@ -971,7 +887,7 @@ chat_lookup_contact (EmpathyTpChat *chat,
 
                if (remove_) {
                        /* Caller takes the reference. */
-                       priv->members = g_list_delete_link (priv->members, l);
+                       self->priv->members = g_list_delete_link (self->priv->members, l);
                } else {
                        g_object_ref (c);
                }
@@ -1019,7 +935,7 @@ tp_chat_got_renamed_contacts_cb (TpConnection            *connection,
                                  gpointer                 user_data,
                                  GObject                 *chat)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
+       EmpathyTpChat *self = (EmpathyTpChat *) chat;
        const TpIntSet *members;
        TpHandle handle;
        EmpathyContact *old = NULL, *new = NULL;
@@ -1035,38 +951,37 @@ tp_chat_got_renamed_contacts_cb (TpConnection            *connection,
 
        new = contacts[0];
 
-       members = tp_channel_group_get_members (priv->channel);
+       members = tp_channel_group_get_members ((TpChannel *) self);
        handle = empathy_contact_get_handle (new);
 
-       old = chat_lookup_contact (EMPATHY_TP_CHAT (chat),
-                                  rename_data->old_handle, TRUE);
+       old = chat_lookup_contact (self, rename_data->old_handle, TRUE);
 
        /* Make sure the contact is still member */
        if (tp_intset_is_member (members, handle)) {
-               priv->members = g_list_prepend (priv->members,
+               self->priv->members = g_list_prepend (self->priv->members,
                        g_object_ref (new));
 
                if (old != NULL) {
-                       g_signal_emit_by_name (chat, "member-renamed",
+                       g_signal_emit_by_name (self, "member-renamed",
                                               old, new, rename_data->reason,
                                               rename_data->message);
                        g_object_unref (old);
                }
        }
 
-       if (priv->user == old) {
+       if (self->priv->user == old) {
                /* We change our nick */
-               tp_clear_object (&priv->user);
-               priv->user = g_object_ref (new);
+               tp_clear_object (&self->priv->user);
+               self->priv->user = g_object_ref (new);
+               g_object_notify (chat, "self-contact");
        }
 
-       tp_chat_update_remote_contact (EMPATHY_TP_CHAT (chat));
-       check_almost_ready (EMPATHY_TP_CHAT (chat));
+       check_almost_ready (self);
 }
 
 
 static void
-tp_chat_group_members_changed_cb (TpChannel     *self,
+tp_chat_group_members_changed_cb (TpChannel     *channel,
                                  gchar         *message,
                                  GArray        *added,
                                  GArray        *removed,
@@ -1074,14 +989,15 @@ tp_chat_group_members_changed_cb (TpChannel     *self,
                                  GArray        *remote_pending,
                                  guint          actor,
                                  guint          reason,
-                                 EmpathyTpChat *chat)
+                                 EmpathyTpChat *self)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
        EmpathyContact *contact;
        EmpathyContact *actor_contact = NULL;
        guint i;
        ContactRenameData *rename_data;
        TpHandle old_handle;
+       TpConnection *connection = tp_channel_borrow_connection (
+               (TpChannel *) self);
 
        /* Contact renamed */
        if (reason == TP_CHANNEL_GROUP_CHANGE_REASON_RENAMED) {
@@ -1095,16 +1011,16 @@ tp_chat_group_members_changed_cb (TpChannel     *self,
                old_handle = g_array_index (removed, guint, 0);
 
                rename_data = contact_rename_data_new (old_handle, reason, message);
-               empathy_tp_contact_factory_get_from_handles (priv->connection,
+               empathy_tp_contact_factory_get_from_handles (connection,
                        added->len, (TpHandle *) added->data,
                        tp_chat_got_renamed_contacts_cb,
                        rename_data, (GDestroyNotify) contact_rename_data_free,
-                       G_OBJECT (chat));
+                       G_OBJECT (self));
                return;
        }
 
        if (actor != 0) {
-               actor_contact = chat_lookup_contact (chat, actor, FALSE);
+               actor_contact = chat_lookup_contact (self, actor, FALSE);
                if (actor_contact == NULL) {
                        /* FIXME: handle this a tad more gracefully: perhaps
                         * the actor was a server op. We could use the
@@ -1116,11 +1032,11 @@ tp_chat_group_members_changed_cb (TpChannel     *self,
 
        /* Remove contacts that are not members anymore */
        for (i = 0; i < removed->len; i++) {
-               contact = chat_lookup_contact (chat,
+               contact = chat_lookup_contact (self,
                        g_array_index (removed, TpHandle, i), TRUE);
 
                if (contact != NULL) {
-                       g_signal_emit_by_name (chat, "members-changed", contact,
+                       g_signal_emit_by_name (self, "members-changed", contact,
                                               actor_contact, reason, message,
                                               FALSE);
                        g_object_unref (contact);
@@ -1129,14 +1045,12 @@ tp_chat_group_members_changed_cb (TpChannel     *self,
 
        /* Request added contacts */
        if (added->len > 0) {
-               empathy_tp_contact_factory_get_from_handles (priv->connection,
+               empathy_tp_contact_factory_get_from_handles (connection,
                        added->len, (TpHandle *) added->data,
                        tp_chat_got_added_contacts_cb, NULL, NULL,
-                       G_OBJECT (chat));
+                       G_OBJECT (self));
        }
 
-       tp_chat_update_remote_contact (chat);
-
        if (actor_contact != NULL) {
                g_object_unref (actor_contact);
        }
@@ -1149,18 +1063,18 @@ tp_chat_got_remote_contact_cb (TpConnection            *connection,
                               gpointer                 user_data,
                               GObject                 *chat)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
+       EmpathyTpChat *self = (EmpathyTpChat *) chat;
 
        if (error) {
                DEBUG ("Error: %s", error->message);
-               empathy_tp_chat_leave (EMPATHY_TP_CHAT (chat), "");
+               empathy_tp_chat_leave (self, "");
                return;
        }
 
-       priv->remote_contact = g_object_ref (contact);
+       self->priv->remote_contact = g_object_ref (contact);
        g_object_notify (chat, "remote-contact");
 
-       check_almost_ready (EMPATHY_TP_CHAT (chat));
+       check_almost_ready (self);
 }
 
 static void
@@ -1170,167 +1084,18 @@ tp_chat_got_self_contact_cb (TpConnection            *connection,
                             gpointer                 user_data,
                             GObject                 *chat)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
+       EmpathyTpChat *self = (EmpathyTpChat *) chat;
 
        if (error) {
                DEBUG ("Error: %s", error->message);
-               empathy_tp_chat_leave (EMPATHY_TP_CHAT (chat), "");
+               empathy_tp_chat_leave (self, "");
                return;
        }
 
-       priv->user = g_object_ref (contact);
-       empathy_contact_set_is_user (priv->user, TRUE);
-       check_almost_ready (EMPATHY_TP_CHAT (chat));
-}
-
-static void
-password_flags_changed_cb (TpChannel *channel,
-    guint added,
-    guint removed,
-    gpointer user_data,
-    GObject *weak_object)
-{
-       EmpathyTpChat *self = EMPATHY_TP_CHAT (weak_object);
-       EmpathyTpChatPriv *priv = GET_PRIV (self);
-       gboolean was_needed, needed;
-
-       was_needed = empathy_tp_chat_password_needed (self);
-
-       priv->password_flags |= added;
-       priv->password_flags ^= removed;
-
-       needed = empathy_tp_chat_password_needed (self);
-
-       if (was_needed != needed)
-               g_object_notify (G_OBJECT (self), "password-needed");
-}
-
-static void
-got_password_flags_cb (TpChannel *proxy,
-                            guint password_flags,
-                            const GError *error,
-                            gpointer user_data,
-                            GObject *weak_object)
-{
-       EmpathyTpChat *self = EMPATHY_TP_CHAT (weak_object);
-       EmpathyTpChatPriv *priv = GET_PRIV (self);
-
-       priv->got_password_flags = TRUE;
-       priv->password_flags = password_flags;
-
-       check_almost_ready (EMPATHY_TP_CHAT (self));
-}
-
-static GObject *
-tp_chat_constructor (GType                  type,
-                    guint                  n_props,
-                    GObjectConstructParam *props)
-{
-       GObject           *chat;
-       EmpathyTpChatPriv *priv;
-       TpHandle           handle;
-
-       chat = G_OBJECT_CLASS (empathy_tp_chat_parent_class)->constructor (type, n_props, props);
-
-       priv = GET_PRIV (chat);
-
-       priv->connection = g_object_ref (tp_account_get_connection (priv->account));
-       tp_g_signal_connect_object (priv->channel, "invalidated",
-                         G_CALLBACK (tp_chat_invalidated_cb),
-                         chat, 0);
-
-       g_assert (tp_proxy_is_prepared (priv->connection,
-               TP_CONNECTION_FEATURE_CAPABILITIES));
-
-       if (tp_proxy_has_interface_by_id (priv->channel,
-                                         TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP)) {
-               const TpIntSet *members;
-               GArray *handles;
-
-               /* Get self contact from the group's self handle */
-               handle = tp_channel_group_get_self_handle (priv->channel);
-               empathy_tp_contact_factory_get_from_handle (priv->connection,
-                       handle, tp_chat_got_self_contact_cb,
-                       NULL, NULL, chat);
-
-               /* Get initial member contacts */
-               members = tp_channel_group_get_members (priv->channel);
-               handles = tp_intset_to_array (members);
-               empathy_tp_contact_factory_get_from_handles (priv->connection,
-                       handles->len, (TpHandle *) handles->data,
-                       tp_chat_got_added_contacts_cb, NULL, NULL, chat);
-
-               priv->can_upgrade_to_muc = FALSE;
-
-               tp_g_signal_connect_object (priv->channel, "group-members-changed",
-                       G_CALLBACK (tp_chat_group_members_changed_cb), chat, 0);
-       } else {
-               TpCapabilities *caps;
-               GPtrArray *classes;
-               guint i;
-
-               /* Get the self contact from the connection's self handle */
-               handle = tp_connection_get_self_handle (priv->connection);
-               empathy_tp_contact_factory_get_from_handle (priv->connection,
-                       handle, tp_chat_got_self_contact_cb,
-                       NULL, NULL, chat);
-
-               /* Get the remote contact */
-               handle = tp_channel_get_handle (priv->channel, NULL);
-               empathy_tp_contact_factory_get_from_handle (priv->connection,
-                       handle, tp_chat_got_remote_contact_cb,
-                       NULL, NULL, chat);
-
-               caps = tp_connection_get_capabilities (priv->connection);
-               g_assert (caps != NULL);
-
-               classes = tp_capabilities_get_channel_classes (caps);
-
-               for (i = 0; i < classes->len; i++) {
-                       GValueArray *array = g_ptr_array_index (classes, i);
-                       const char **oprops = g_value_get_boxed (
-                               g_value_array_get_nth (array, 1));
-
-                       if (tp_strv_contains (oprops, TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_CHANNELS)) {
-                               priv->can_upgrade_to_muc = TRUE;
-                               break;
-                       }
-               }
-       }
-
-       if (tp_proxy_has_interface_by_id (priv->channel,
-                                         TP_IFACE_QUARK_PROPERTIES_INTERFACE)) {
-               tp_cli_properties_interface_call_list_properties (priv->channel, -1,
-                                                                 tp_chat_list_properties_cb,
-                                                                 NULL, NULL,
-                                                                 G_OBJECT (chat));
-               tp_cli_properties_interface_connect_to_properties_changed (priv->channel,
-                                                                          tp_chat_properties_changed_cb,
-                                                                          NULL, NULL,
-                                                                          G_OBJECT (chat), NULL);
-               tp_cli_properties_interface_connect_to_property_flags_changed (priv->channel,
-                                                                              tp_chat_property_flags_changed_cb,
-                                                                              NULL, NULL,
-                                                                              G_OBJECT (chat), NULL);
-       }
-
-       /* Check if the chat is password protected */
-       if (tp_proxy_has_interface_by_id (priv->channel,
-                                         TP_IFACE_QUARK_CHANNEL_INTERFACE_PASSWORD)) {
-               priv->got_password_flags = FALSE;
-
-               tp_cli_channel_interface_password_connect_to_password_flags_changed
-                       (priv->channel, password_flags_changed_cb, chat, NULL,
-                        G_OBJECT (chat), NULL);
-
-               tp_cli_channel_interface_password_call_get_password_flags
-                       (priv->channel, -1, got_password_flags_cb, chat, NULL, chat);
-       } else {
-               /* No Password interface, so no need to fetch the password flags */
-               priv->got_password_flags = TRUE;
-       }
-
-       return chat;
+       self->priv->user = g_object_ref (contact);
+       empathy_contact_set_is_user (self->priv->user, TRUE);
+       g_object_notify (chat, "self-contact");
+       check_almost_ready (self);
 }
 
 static void
@@ -1340,23 +1105,28 @@ tp_chat_get_property (GObject    *object,
                      GParamSpec *pspec)
 {
        EmpathyTpChat *self = EMPATHY_TP_CHAT (object);
-       EmpathyTpChatPriv *priv = GET_PRIV (object);
 
        switch (param_id) {
        case PROP_ACCOUNT:
-               g_value_set_object (value, priv->account);
+               g_value_set_object (value, self->priv->account);
                break;
-       case PROP_CHANNEL:
-               g_value_set_object (value, priv->channel);
+       case PROP_SELF_CONTACT:
+               g_value_set_object (value, self->priv->user);
                break;
        case PROP_REMOTE_CONTACT:
-               g_value_set_object (value, priv->remote_contact);
+               g_value_set_object (value, self->priv->remote_contact);
+               break;
+       case PROP_N_MESSAGES_SENDING:
+               g_value_set_uint (value,
+                       g_hash_table_size (self->priv->messages_being_sent));
                break;
-       case PROP_READY:
-               g_value_set_boolean (value, priv->ready);
+       case PROP_TITLE:
+               g_value_set_string (value,
+                       empathy_tp_chat_get_title (self));
                break;
-       case PROP_PASSWORD_NEEDED:
-               g_value_set_boolean (value, empathy_tp_chat_password_needed (self));
+       case PROP_SUBJECT:
+               g_value_set_string (value,
+                       empathy_tp_chat_get_subject (self));
                break;
        default:
                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -1370,14 +1140,11 @@ tp_chat_set_property (GObject      *object,
                      const GValue *value,
                      GParamSpec   *pspec)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (object);
+       EmpathyTpChat *self = EMPATHY_TP_CHAT (object);
 
        switch (param_id) {
        case PROP_ACCOUNT:
-               priv->account = g_value_dup_object (value);
-               break;
-       case PROP_CHANNEL:
-               priv->channel = g_value_dup_object (value);
+               self->priv->account = g_value_dup_object (value);
                break;
        default:
                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -1385,17 +1152,45 @@ tp_chat_set_property (GObject      *object,
        };
 }
 
+enum {
+       FEAT_READY,
+       N_FEAT
+};
+
+static const TpProxyFeature *
+tp_chat_list_features (TpProxyClass *cls G_GNUC_UNUSED)
+{
+       static TpProxyFeature features[N_FEAT + 1] = { { 0 } };
+  static GQuark need[2] = {0, 0};
+
+       if (G_LIKELY (features[0].name != 0))
+               return features;
+
+       features[FEAT_READY].name = EMPATHY_TP_CHAT_FEATURE_READY;
+       need[0] = TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES;
+       features[FEAT_READY].depends_on = need;
+       features[FEAT_READY].prepare_async =
+               tp_chat_prepare_ready_async;
+
+       /* assert that the terminator at the end is there */
+       g_assert (features[N_FEAT].name == 0);
+
+       return features;
+}
+
 static void
 empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
+       TpProxyClass *proxy_class = TP_PROXY_CLASS (klass);
 
        object_class->dispose = tp_chat_dispose;
        object_class->finalize = tp_chat_finalize;
-       object_class->constructor = tp_chat_constructor;
        object_class->get_property = tp_chat_get_property;
        object_class->set_property = tp_chat_set_property;
 
+       proxy_class->list_features = tp_chat_list_features;
+
        g_object_class_install_property (object_class,
                                         PROP_ACCOUNT,
                                         g_param_spec_object ("account",
@@ -1406,14 +1201,18 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
                                                              G_PARAM_CONSTRUCT_ONLY |
                                                              G_PARAM_STATIC_STRINGS));
 
+       /**
+        * EmpathyTpChat:self-contact:
+        *
+        * Not to be confused with TpChannel:group-self-contact.
+        */
        g_object_class_install_property (object_class,
-                                        PROP_CHANNEL,
-                                        g_param_spec_object ("channel",
-                                                             "telepathy channel",
-                                                             "The text channel for the chat",
-                                                             TP_TYPE_CHANNEL,
-                                                             G_PARAM_READWRITE |
-                                                             G_PARAM_CONSTRUCT_ONLY));
+                                        PROP_SELF_CONTACT,
+                                        g_param_spec_object ("self-contact",
+                                                             "The local contact",
+                                                             "The EmpathyContact for the local user on this channel",
+                                                             EMPATHY_TYPE_CONTACT,
+                                                             G_PARAM_READABLE));
 
        g_object_class_install_property (object_class,
                                         PROP_REMOTE_CONTACT,
@@ -1424,29 +1223,39 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
                                                              G_PARAM_READABLE));
 
        g_object_class_install_property (object_class,
-                                        PROP_READY,
-                                        g_param_spec_boolean ("ready",
-                                                              "Is the object ready",
-                                                              "This object can't be used until this becomes true",
-                                                              FALSE,
-                                                              G_PARAM_READABLE));
+                                        PROP_N_MESSAGES_SENDING,
+                                        g_param_spec_uint ("n-messages-sending",
+                                                           "Num Messages Sending",
+                                                           "The number of messages being sent",
+                                                           0, G_MAXUINT, 0,
+                                                           G_PARAM_READABLE));
+
+       g_object_class_install_property (object_class,
+                                        PROP_TITLE,
+                                        g_param_spec_string ("title",
+                                                             "Title",
+                                                             "A human-readable name for the room, if any",
+                                                             NULL,
+                                                             G_PARAM_READABLE |
+                                                             G_PARAM_STATIC_STRINGS));
 
        g_object_class_install_property (object_class,
-                                        PROP_PASSWORD_NEEDED,
-                                        g_param_spec_boolean ("password-needed",
-                                                              "password needed",
-                                                              "TRUE if a password is needed to join the channel",
-                                                              FALSE,
-                                                              G_PARAM_READABLE));
+                                        PROP_SUBJECT,
+                                        g_param_spec_string ("subject",
+                                                             "Subject",
+                                                             "The room's current subject, if any",
+                                                             NULL,
+                                                             G_PARAM_READABLE |
+                                                             G_PARAM_STATIC_STRINGS));
 
        /* Signals */
        signals[MESSAGE_RECEIVED] =
-               g_signal_new ("message-received",
+               g_signal_new ("message-received-empathy",
                              G_TYPE_FROM_CLASS (klass),
                              G_SIGNAL_RUN_LAST,
                              0,
                              NULL, NULL,
-                             g_cclosure_marshal_VOID__OBJECT,
+                             g_cclosure_marshal_generic,
                              G_TYPE_NONE,
                              1, EMPATHY_TYPE_MESSAGE);
 
@@ -1456,52 +1265,43 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
                              G_SIGNAL_RUN_LAST,
                              0,
                              NULL, NULL,
-                             _empathy_marshal_VOID__STRING_UINT,
+                             g_cclosure_marshal_generic,
                              G_TYPE_NONE,
-                             2, G_TYPE_STRING, G_TYPE_UINT);
+                             3, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING);
 
        signals[CHAT_STATE_CHANGED] =
-               g_signal_new ("chat-state-changed",
+               g_signal_new ("chat-state-changed-empathy",
                              G_TYPE_FROM_CLASS (klass),
                              G_SIGNAL_RUN_LAST,
                              0,
                              NULL, NULL,
-                             _empathy_marshal_VOID__OBJECT_UINT,
+                             g_cclosure_marshal_generic,
                              G_TYPE_NONE,
                              2, EMPATHY_TYPE_CONTACT, G_TYPE_UINT);
 
-       signals[PROPERTY_CHANGED] =
-               g_signal_new ("property-changed",
-                             G_TYPE_FROM_CLASS (klass),
-                             G_SIGNAL_RUN_LAST,
-                             0,
-                             NULL, NULL,
-                             _empathy_marshal_VOID__STRING_BOXED,
-                             G_TYPE_NONE,
-                             2, G_TYPE_STRING, G_TYPE_VALUE);
-
-       signals[DESTROY] =
-               g_signal_new ("destroy",
+       signals[MESSAGE_ACKNOWLEDGED] =
+               g_signal_new ("message-acknowledged",
                              G_TYPE_FROM_CLASS (klass),
                              G_SIGNAL_RUN_LAST,
                              0,
                              NULL, NULL,
-                             g_cclosure_marshal_VOID__VOID,
+                             g_cclosure_marshal_generic,
                              G_TYPE_NONE,
-                             0);
+                             1, EMPATHY_TYPE_MESSAGE);
 
-       g_type_class_add_private (object_class, sizeof (EmpathyTpChatPriv));
+       g_type_class_add_private (object_class, sizeof (EmpathyTpChatPrivate));
 }
 
 static void
-empathy_tp_chat_init (EmpathyTpChat *chat)
+empathy_tp_chat_init (EmpathyTpChat *self)
 {
-       EmpathyTpChatPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (chat,
-               EMPATHY_TYPE_TP_CHAT, EmpathyTpChatPriv);
+       self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+               EMPATHY_TYPE_TP_CHAT, EmpathyTpChatPrivate);
 
-       chat->priv = priv;
-       priv->messages_queue = g_queue_new ();
-       priv->pending_messages_queue = g_queue_new ();
+       self->priv->messages_queue = g_queue_new ();
+       self->priv->pending_messages_queue = g_queue_new ();
+       self->priv->messages_being_sent = g_hash_table_new_full (
+               g_str_hash, g_str_equal, g_free, NULL);
 }
 
 static void
@@ -1513,290 +1313,104 @@ tp_chat_iface_init (EmpathyContactListIface *iface)
 }
 
 EmpathyTpChat *
-empathy_tp_chat_new (TpAccount *account,
-                    TpChannel *channel)
+empathy_tp_chat_new (
+                    TpSimpleClientFactory *factory,
+                    TpAccount *account,
+                    TpConnection *conn,
+                    const gchar *object_path,
+                    const GHashTable *immutable_properties)
 {
+       TpProxy *conn_proxy = (TpProxy *) conn;
+
        g_return_val_if_fail (TP_IS_ACCOUNT (account), NULL);
-       g_return_val_if_fail (TP_IS_TEXT_CHANNEL (channel), NULL);
+       g_return_val_if_fail (TP_IS_CONNECTION (conn), NULL);
+       g_return_val_if_fail (immutable_properties != NULL, NULL);
 
        return g_object_new (EMPATHY_TYPE_TP_CHAT,
+                            "factory", factory,
                             "account", account,
-                            "channel", channel,
+                            "connection", conn,
+                            "dbus-daemon", conn_proxy->dbus_daemon,
+                            "bus-name", conn_proxy->bus_name,
+                            "object-path", object_path,
+                            "channel-properties", immutable_properties,
                             NULL);
 }
 
 const gchar *
-empathy_tp_chat_get_id (EmpathyTpChat *chat)
+empathy_tp_chat_get_id (EmpathyTpChat *self)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
        const gchar *id;
 
+       g_return_val_if_fail (EMPATHY_IS_TP_CHAT (self), NULL);
 
-       g_return_val_if_fail (EMPATHY_IS_TP_CHAT (chat), NULL);
-
-       id = tp_channel_get_identifier (priv->channel);
+       id = tp_channel_get_identifier ((TpChannel *) self);
        if (!EMP_STR_EMPTY (id))
                return id;
-       else if (priv->remote_contact)
-               return empathy_contact_get_id (priv->remote_contact);
+       else if (self->priv->remote_contact)
+               return empathy_contact_get_id (self->priv->remote_contact);
        else
                return NULL;
 
 }
 
 EmpathyContact *
-empathy_tp_chat_get_remote_contact (EmpathyTpChat *chat)
-{
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
-
-       g_return_val_if_fail (EMPATHY_IS_TP_CHAT (chat), NULL);
-       g_return_val_if_fail (priv->ready, NULL);
-
-       return priv->remote_contact;
-}
-
-TpChannel *
-empathy_tp_chat_get_channel (EmpathyTpChat *chat)
+empathy_tp_chat_get_remote_contact (EmpathyTpChat *self)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
-
-       g_return_val_if_fail (EMPATHY_IS_TP_CHAT (chat), NULL);
+       g_return_val_if_fail (EMPATHY_IS_TP_CHAT (self), NULL);
 
-       return priv->channel;
+       return self->priv->remote_contact;
 }
 
 TpAccount *
-empathy_tp_chat_get_account (EmpathyTpChat *chat)
+empathy_tp_chat_get_account (EmpathyTpChat *self)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
-
-       g_return_val_if_fail (EMPATHY_IS_TP_CHAT (chat), NULL);
-
-       return priv->account;
-}
-
-TpConnection *
-empathy_tp_chat_get_connection (EmpathyTpChat *chat)
-{
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
-
-       g_return_val_if_fail (EMPATHY_IS_TP_CHAT (chat), NULL);
-
-       return tp_channel_borrow_connection (priv->channel);
-}
-gboolean
-empathy_tp_chat_is_ready (EmpathyTpChat *chat)
-{
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
-
-       g_return_val_if_fail (EMPATHY_IS_TP_CHAT (chat), FALSE);
+       g_return_val_if_fail (EMPATHY_IS_TP_CHAT (self), NULL);
 
-       return priv->ready;
+       return self->priv->account;
 }
 
 void
-empathy_tp_chat_send (EmpathyTpChat *chat,
+empathy_tp_chat_send (EmpathyTpChat *self,
                      TpMessage *message)
 {
-       EmpathyTpChatPriv        *priv = GET_PRIV (chat);
        gchar *message_body;
 
-       g_return_if_fail (EMPATHY_IS_TP_CHAT (chat));
+       g_return_if_fail (EMPATHY_IS_TP_CHAT (self));
        g_return_if_fail (TP_IS_CLIENT_MESSAGE (message));
-       g_return_if_fail (priv->ready);
 
        message_body = tp_message_to_text (message, NULL);
 
        DEBUG ("Sending message: %s", message_body);
 
-       tp_text_channel_send_message_async (TP_TEXT_CHANNEL (priv->channel),
-               message, 0, message_send_cb, chat);
+       tp_text_channel_send_message_async (TP_TEXT_CHANNEL (self),
+               message, TP_MESSAGE_SENDING_FLAG_REPORT_DELIVERY,
+               message_send_cb, self);
 
        g_free (message_body);
 }
 
-void
-empathy_tp_chat_set_state (EmpathyTpChat      *chat,
-                          TpChannelChatState  state)
-{
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
-
-       g_return_if_fail (EMPATHY_IS_TP_CHAT (chat));
-       g_return_if_fail (priv->ready);
-
-       if (tp_proxy_has_interface_by_id (priv->channel,
-                                         TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE)) {
-               DEBUG ("Set state: %d", state);
-               tp_cli_channel_interface_chat_state_call_set_chat_state (priv->channel, -1,
-                                                                        state,
-                                                                        tp_chat_async_cb,
-                                                                        "setting chat state",
-                                                                        NULL,
-                                                                        G_OBJECT (chat));
-       }
-}
-
-
 const GList *
-empathy_tp_chat_get_pending_messages (EmpathyTpChat *chat)
+empathy_tp_chat_get_pending_messages (EmpathyTpChat *self)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
-
-       g_return_val_if_fail (EMPATHY_IS_TP_CHAT (chat), NULL);
-       g_return_val_if_fail (priv->ready, NULL);
-
-       return priv->pending_messages_queue->head;
-}
-
-static void
-acknowledge_messages (EmpathyTpChat *chat, GArray *ids) {
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
+       g_return_val_if_fail (EMPATHY_IS_TP_CHAT (self), NULL);
 
-       tp_cli_channel_type_text_call_acknowledge_pending_messages (
-               priv->channel, -1, ids, tp_chat_async_cb,
-               "acknowledging received message", NULL, G_OBJECT (chat));
+       return self->priv->pending_messages_queue->head;
 }
 
 void
-empathy_tp_chat_acknowledge_message (EmpathyTpChat *chat,
+empathy_tp_chat_acknowledge_message (EmpathyTpChat *self,
                                     EmpathyMessage *message) {
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
-       GArray *message_ids;
-       GList *m;
-       guint id;
+       TpMessage *tp_msg;
 
-       g_return_if_fail (EMPATHY_IS_TP_CHAT (chat));
-       g_return_if_fail (priv->ready);
+       g_return_if_fail (EMPATHY_IS_TP_CHAT (self));
 
        if (!empathy_message_is_incoming (message))
-               goto out;
-
-       message_ids = g_array_sized_new (FALSE, FALSE, sizeof (guint), 1);
-
-       id = empathy_message_get_id (message);
-       g_array_append_val (message_ids, id);
-       acknowledge_messages (chat, message_ids);
-       g_array_free (message_ids, TRUE);
-
-out:
-       m = g_queue_find (priv->pending_messages_queue, message);
-       g_assert (m != NULL);
-       g_queue_delete_link (priv->pending_messages_queue, m);
-       g_object_unref (message);
-}
-
-void
-empathy_tp_chat_acknowledge_messages (EmpathyTpChat *chat,
-                                     const GSList *messages) {
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
-       /* Copy messages as the messges list (probably is) our own */
-       GSList *msgs = g_slist_copy ((GSList *) messages);
-       GSList *l;
-       guint length;
-       GArray *message_ids;
-
-       g_return_if_fail (EMPATHY_IS_TP_CHAT (chat));
-       g_return_if_fail (priv->ready);
-
-       length = g_slist_length ((GSList *) messages);
-
-       if (length == 0)
                return;
 
-       message_ids = g_array_sized_new (FALSE, FALSE, sizeof (guint), length);
-
-       for (l = msgs; l != NULL; l = g_slist_next (l)) {
-               GList *m;
-
-               EmpathyMessage *message = EMPATHY_MESSAGE (l->data);
-
-               m = g_queue_find (priv->pending_messages_queue, message);
-               g_assert (m != NULL);
-               g_queue_delete_link (priv->pending_messages_queue, m);
-
-               if (empathy_message_is_incoming (message)) {
-                       guint id = empathy_message_get_id (message);
-                       g_array_append_val (message_ids, id);
-               }
-               g_object_unref (message);
-       }
-
-       if (message_ids->len > 0)
-               acknowledge_messages (chat, message_ids);
-
-       g_array_free (message_ids, TRUE);
-       g_slist_free (msgs);
-}
-
-void
-empathy_tp_chat_acknowledge_all_messages (EmpathyTpChat *chat)
-{
-  empathy_tp_chat_acknowledge_messages (chat,
-    (GSList *) empathy_tp_chat_get_pending_messages (chat));
-}
-
-gboolean
-empathy_tp_chat_password_needed (EmpathyTpChat *self)
-{
-       EmpathyTpChatPriv *priv = GET_PRIV (self);
-
-       return priv->password_flags & TP_CHANNEL_PASSWORD_FLAG_PROVIDE;
-}
-
-static void
-provide_password_cb (TpChannel *channel,
-                                     gboolean correct,
-                                     const GError *error,
-                                     gpointer user_data,
-                                     GObject *weak_object)
-{
-       GSimpleAsyncResult *result = user_data;
-
-       if (error != NULL) {
-               g_simple_async_result_set_from_error (result, error);
-       }
-       else if (!correct) {
-               /* The current D-Bus API is a bit weird so re-use the
-                * AuthenticationFailed error */
-               g_simple_async_result_set_error (result, TP_ERRORS,
-                                                TP_ERROR_AUTHENTICATION_FAILED, "Wrong password");
-       }
-
-       g_simple_async_result_complete (result);
-       g_object_unref (result);
-}
-
-void
-empathy_tp_chat_provide_password_async (EmpathyTpChat *self,
-                                                    const gchar *password,
-                                                    GAsyncReadyCallback callback,
-                                                    gpointer user_data)
-{
-       EmpathyTpChatPriv *priv = GET_PRIV (self);
-       GSimpleAsyncResult *result;
-
-       result = g_simple_async_result_new (G_OBJECT (self),
-                                           callback, user_data,
-                                           empathy_tp_chat_provide_password_finish);
-
-       tp_cli_channel_interface_password_call_provide_password
-               (priv->channel, -1, password, provide_password_cb, result,
-                NULL, G_OBJECT (self));
-}
-
-gboolean
-empathy_tp_chat_provide_password_finish (EmpathyTpChat *self,
-                                                     GAsyncResult *result,
-                                                     GError **error)
-{
-       if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result),
-               error))
-               return FALSE;
-
-       g_return_val_if_fail (g_simple_async_result_is_valid (result,
-                                                             G_OBJECT (self), empathy_tp_chat_provide_password_finish), FALSE);
-
-       return TRUE;
+       tp_msg = empathy_message_get_tp_message (message);
+       tp_text_channel_ack_message_async (TP_TEXT_CHANNEL (self),
+                                          tp_msg, NULL, NULL);
 }
 
 /**
@@ -1809,14 +1423,10 @@ empathy_tp_chat_provide_password_finish (EmpathyTpChat *self,
 gboolean
 empathy_tp_chat_can_add_contact (EmpathyTpChat *self)
 {
-       EmpathyTpChatPriv *priv;
-
        g_return_val_if_fail (EMPATHY_IS_TP_CHAT (self), FALSE);
 
-       priv = GET_PRIV (self);
-
-       return priv->can_upgrade_to_muc ||
-               tp_proxy_has_interface_by_id (priv->channel,
+       return self->priv->can_upgrade_to_muc ||
+               tp_proxy_has_interface_by_id (self,
                        TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP);;
 }
 
@@ -1838,9 +1448,12 @@ void
 empathy_tp_chat_leave (EmpathyTpChat *self,
                const gchar *message)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (self);
+       TpChannel *channel = (TpChannel *) self;
+
+       DEBUG ("Leaving channel %s with message \"%s\"",
+               tp_channel_get_identifier (channel), message);
 
-       tp_channel_leave_async (priv->channel, TP_CHANNEL_GROUP_CHANGE_REASON_NONE,
+       tp_channel_leave_async (channel, TP_CHANNEL_GROUP_CHANGE_REASON_NONE,
                message, tp_channel_leave_async_cb, self);
 }
 
@@ -1850,65 +1463,169 @@ add_members_cb (TpChannel *proxy,
                gpointer user_data,
                GObject *weak_object)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (weak_object);
+       EmpathyTpChat *self = (EmpathyTpChat *) weak_object;
 
        if (error != NULL) {
                DEBUG ("Failed to join chat (%s): %s",
-                       tp_channel_get_identifier (priv->channel), error->message);
+                       tp_channel_get_identifier ((TpChannel *) self), error->message);
        }
 }
 
 void
 empathy_tp_chat_join (EmpathyTpChat *self)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (self);
        TpHandle self_handle;
        GArray *members;
 
-       self_handle = tp_channel_group_get_self_handle (priv->channel);
+       self_handle = tp_channel_group_get_self_handle ((TpChannel *) self);
 
        members = g_array_sized_new (FALSE, FALSE, sizeof (TpHandle), 1);
        g_array_append_val (members, self_handle);
 
-       tp_cli_channel_interface_group_call_add_members (priv->channel, -1, members,
+       tp_cli_channel_interface_group_call_add_members ((TpChannel *) self, -1, members,
                "", add_members_cb, NULL, NULL, G_OBJECT (self));
 
-       g_array_free (members, TRUE);
+       g_array_unref (members);
 }
 
 gboolean
 empathy_tp_chat_is_invited (EmpathyTpChat *self,
                            TpHandle *inviter)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (self);
        TpHandle self_handle;
 
-       if (!tp_proxy_has_interface (priv->channel, TP_IFACE_CHANNEL_INTERFACE_GROUP))
+       if (!tp_proxy_has_interface (self, TP_IFACE_CHANNEL_INTERFACE_GROUP))
                return FALSE;
 
-       self_handle = tp_channel_group_get_self_handle (priv->channel);
+       self_handle = tp_channel_group_get_self_handle ((TpChannel *) self);
        if (self_handle == 0)
                return FALSE;
 
-       return tp_channel_group_get_local_pending_info (priv->channel, self_handle,
+       return tp_channel_group_get_local_pending_info ((TpChannel *) self, self_handle,
                inviter, NULL, NULL);
 }
 
 TpChannelChatState
-empathy_tp_chat_get_chat_state (EmpathyTpChat *chat,
+empathy_tp_chat_get_chat_state (EmpathyTpChat *self,
                            EmpathyContact *contact)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (chat);
-       return tp_channel_get_chat_state (priv->channel,
+       return tp_channel_get_chat_state ((TpChannel *) self,
                empathy_contact_get_handle (contact));
 }
 
 EmpathyContact *
 empathy_tp_chat_get_self_contact (EmpathyTpChat *self)
 {
-       EmpathyTpChatPriv *priv = GET_PRIV (self);
-
        g_return_val_if_fail (EMPATHY_IS_TP_CHAT (self), NULL);
 
-       return priv->user;
+       return self->priv->user;
+}
+
+GQuark
+empathy_tp_chat_get_feature_ready (void)
+{
+       return g_quark_from_static_string ("empathy-tp-chat-feature-ready");
+}
+
+static void
+tp_chat_prepare_ready_async (TpProxy *proxy,
+       const TpProxyFeature *feature,
+       GAsyncReadyCallback callback,
+       gpointer user_data)
+{
+       EmpathyTpChat *self = (EmpathyTpChat *) proxy;
+       TpChannel *channel = (TpChannel *) proxy;
+       TpConnection *connection;
+       gboolean listen_for_dbus_properties_changed = FALSE;
+
+       g_assert (self->priv->ready_result == NULL);
+       self->priv->ready_result = g_simple_async_result_new (G_OBJECT (self),
+               callback, user_data, tp_chat_prepare_ready_async);
+
+       connection = tp_channel_borrow_connection (channel);
+
+       if (tp_proxy_has_interface_by_id (self,
+                                         TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP)) {
+               const TpIntSet *members;
+               GArray *handles;
+               TpHandle handle;
+
+               /* Get self contact from the group's self handle */
+               handle = tp_channel_group_get_self_handle (channel);
+               empathy_tp_contact_factory_get_from_handle (connection,
+                       handle, tp_chat_got_self_contact_cb,
+                       NULL, NULL, G_OBJECT (self));
+
+               /* Get initial member contacts */
+               members = tp_channel_group_get_members (channel);
+               handles = tp_intset_to_array (members);
+               empathy_tp_contact_factory_get_from_handles (connection,
+                       handles->len, (TpHandle *) handles->data,
+                       tp_chat_got_added_contacts_cb, NULL, NULL, G_OBJECT (self));
+
+               self->priv->can_upgrade_to_muc = FALSE;
+
+               tp_g_signal_connect_object (self, "group-members-changed",
+                       G_CALLBACK (tp_chat_group_members_changed_cb), self, 0);
+       } else {
+               TpCapabilities *caps;
+               GPtrArray *classes;
+               guint i;
+               TpHandle handle;
+
+               /* Get the self contact from the connection's self handle */
+               handle = tp_connection_get_self_handle (connection);
+               empathy_tp_contact_factory_get_from_handle (connection,
+                       handle, tp_chat_got_self_contact_cb,
+                       NULL, NULL, G_OBJECT (self));
+
+               /* Get the remote contact */
+               handle = tp_channel_get_handle (channel, NULL);
+               empathy_tp_contact_factory_get_from_handle (connection,
+                       handle, tp_chat_got_remote_contact_cb,
+                       NULL, NULL, G_OBJECT (self));
+
+               caps = tp_connection_get_capabilities (connection);
+               g_assert (caps != NULL);
+
+               classes = tp_capabilities_get_channel_classes (caps);
+
+               for (i = 0; i < classes->len; i++) {
+                       GValueArray *array = g_ptr_array_index (classes, i);
+                       const char **oprops = g_value_get_boxed (
+                               g_value_array_get_nth (array, 1));
+
+                       if (tp_strv_contains (oprops, TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_CHANNELS)) {
+                               self->priv->can_upgrade_to_muc = TRUE;
+                               break;
+                       }
+               }
+       }
+
+       if (tp_proxy_has_interface_by_id (self,
+                                         TP_IFACE_QUARK_CHANNEL_INTERFACE_SUBJECT)) {
+               tp_cli_dbus_properties_call_get_all (channel, -1,
+                                                    TP_IFACE_CHANNEL_INTERFACE_SUBJECT,
+                                                    tp_chat_get_all_subject_cb,
+                                                    NULL, NULL,
+                                                    G_OBJECT (self));
+               listen_for_dbus_properties_changed = TRUE;
+       }
+
+       if (tp_proxy_has_interface_by_id (self,
+                                         TP_IFACE_QUARK_CHANNEL_INTERFACE_ROOM_CONFIG)) {
+               tp_cli_dbus_properties_call_get_all (channel, -1,
+                                                    TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG,
+                                                    tp_chat_get_all_room_config_cb,
+                                                    NULL, NULL,
+                                                    G_OBJECT (self));
+               listen_for_dbus_properties_changed = TRUE;
+       }
+
+       if (listen_for_dbus_properties_changed) {
+               tp_cli_dbus_properties_connect_to_properties_changed (channel,
+                                                                     tp_chat_dbus_properties_changed_cb,
+                                                                     NULL, NULL,
+                                                                     G_OBJECT (self), NULL);
+       }
 }