summaryrefslogtreecommitdiff
path: root/src/conn-aliasing.c
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2012-01-28 09:51:34 +0000
committerWill Thompson <will.thompson@collabora.co.uk>2012-01-31 17:40:44 +0000
commit582a4e1fa932a81397c9b47992ceec673fe62419 (patch)
treeb7b99107f59d15ed9618937590af6e4b422002f5 /src/conn-aliasing.c
parent48175abc011072b8c4e5fb4c01342f71ab33a982 (diff)
conn-*: move to WockyNodeIter
Diffstat (limited to 'src/conn-aliasing.c')
-rw-r--r--src/conn-aliasing.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/conn-aliasing.c b/src/conn-aliasing.c
index d642437d7..bdc1d5d7a 100644
--- a/src/conn-aliasing.c
+++ b/src/conn-aliasing.c
@@ -737,9 +737,9 @@ gabble_conn_aliasing_pep_nick_reply_handler (GabbleConnection *conn,
WockyStanza *msg,
TpHandle handle)
{
- WockyNode *pubsub_node, *items_node;
+ WockyNode *pubsub_node, *items_node, *item_node;
gboolean found = FALSE;
- NodeIter i;
+ WockyNodeIter i;
pubsub_node = lm_message_node_get_child_with_namespace (
wocky_stanza_get_top_node (msg), "pubsub", NS_PUBSUB);
@@ -769,10 +769,9 @@ gabble_conn_aliasing_pep_nick_reply_handler (GabbleConnection *conn,
return;
}
- for (i = node_iter (items_node); i; i = node_iter_next (i))
+ wocky_node_iter_init (&i, items_node, NULL, NULL);
+ while (wocky_node_iter_next (&i, &item_node))
{
- WockyNode *item_node = node_iter_data (i);
-
if (_grab_nickname (conn, handle, item_node))
{
/* FIXME: does this do the right thing on servers which return