summaryrefslogtreecommitdiff
path: root/telepathy-glib/text-channel.c
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2011-07-12 16:37:56 +0100
committerWill Thompson <will.thompson@collabora.co.uk>2011-07-12 16:43:27 +0100
commitf34329fed56539cad3dd63cee46d620c25200692 (patch)
tree9c50de9fa46794a96773572f6c2ff140d68aa0dc /telepathy-glib/text-channel.c
parent20a7d3ff395b2934cc8e0f207955820104d3620f (diff)
downloadtelepathy-glib-f34329fed56539cad3dd63cee46d620c25200692.tar.gz
TextChannel: clarify choice of _by_handle vs _by_id
These comments' positioning confused me.
Diffstat (limited to 'telepathy-glib/text-channel.c')
-rw-r--r--telepathy-glib/text-channel.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/telepathy-glib/text-channel.c b/telepathy-glib/text-channel.c
index f1d770e83..a2683fb7b 100644
--- a/telepathy-glib/text-channel.c
+++ b/telepathy-glib/text-channel.c
@@ -777,10 +777,15 @@ get_pending_messages_cb (TpProxy *proxy,
DEBUG ("Pending messages may be re-ordered, please fix CM (%s)",
tp_proxy_get_object_path (conn));
- /* Pass ownership of outstanding messages to the callback */
+ /* If we have an identifier for the sender of every outstanding message,
+ * use those rather than handles to get the contacts. (There may be
+ * duplicates, but telepathy-glib copes.)
+ *
+ * Ownership of the parts list in 'outstanding' is transferred to the
+ * callbacks.
+ */
if (sender_ids->len == outstanding.length)
{
- /* Use the sender ID rather than the handles */
tp_connection_get_contacts_by_id (conn, sender_ids->len,
(const gchar * const *) sender_ids->pdata,
0, NULL, got_pending_senders_contact_by_id_cb, outstanding.head,
@@ -797,6 +802,7 @@ get_pending_messages_cb (TpProxy *proxy,
g_array_unref (tmp);
}
+
}
tp_intset_destroy (senders);