summaryrefslogtreecommitdiff
path: root/telepathy-glib/channel-group.c
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2010-05-21 12:10:15 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2010-05-21 12:10:15 +0100
commit51b8cae49b7a57fa26f30b2d3c3659515a4aed8c (patch)
treed8fc7e13db686e308ed6f564a1301b33fabed640 /telepathy-glib/channel-group.c
parent28644244e5459b8143c52d6b0a10c76940a188b6 (diff)
downloadtelepathy-glib-51b8cae49b7a57fa26f30b2d3c3659515a4aed8c.tar.gz
TpChannel: use TpIntSetFastIter
Diffstat (limited to 'telepathy-glib/channel-group.c')
-rw-r--r--telepathy-glib/channel-group.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/telepathy-glib/channel-group.c b/telepathy-glib/channel-group.c
index cc888071d..6cb78eeed 100644
--- a/telepathy-glib/channel-group.c
+++ b/telepathy-glib/channel-group.c
@@ -668,7 +668,10 @@ _tp_channel_emit_initial_sets (TpChannel *self)
{
GArray *added, *remote_pending;
GArray empty_array = { NULL, 0 };
- TpIntSetIter iter = TP_INTSET_ITER_INIT (self->priv->group_local_pending);
+ TpIntSetFastIter iter;
+ TpHandle handle;
+
+ tp_intset_fast_iter_init (&iter, self->priv->group_local_pending);
added = tp_intset_to_array (self->priv->group_members);
remote_pending = tp_intset_to_array (self->priv->group_remote_pending);
@@ -676,15 +679,13 @@ _tp_channel_emit_initial_sets (TpChannel *self)
g_signal_emit_by_name (self, "group-members-changed", "",
added, &empty_array, &empty_array, remote_pending, 0, 0);
- while (tp_intset_iter_next (&iter))
+ while (tp_intset_fast_iter_next (&iter, &handle))
{
- TpHandle handle;
GArray local_pending = { (gchar *) &handle, 1 };
TpHandle actor;
TpChannelGroupChangeReason reason;
const gchar *message;
- handle = iter.element;
tp_channel_group_get_local_pending_info (self, handle, &actor, &reason,
&message);