[Telepathy-commits] [telepathy-gabble/master] pass the item_node to _gabble_muc_channel_member_presence_updated

[Guillaume Desmottes]

---
 src/muc-channel.c |    9 +++------
 src/muc-channel.h |    3 ++-
 src/muc-factory.c |    2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/muc-channel.c b/src/muc-channel.c
index 97e06fe..54f7a7b 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -1803,13 +1803,14 @@ void
 _gabble_muc_channel_member_presence_updated (GabbleMucChannel *chan,
                                              TpHandle handle,
                                              LmMessage *message,
-                                             LmMessageNode *x_node)
+                                             LmMessageNode *x_node,
+                                             LmMessageNode *item_node)
 {
   GabbleMucChannelPrivate *priv;
   TpBaseConnection *conn;
   TpIntSet *set;
   TpGroupMixin *mixin;
-  LmMessageNode *item_node, *node;
+  LmMessageNode *node;
   const gchar *affil, *role, *owner_jid, *status_code;
   TpHandle actor = 0;
   guint reason_code = TP_CHANNEL_GROUP_CHANGE_REASON_NONE;
@@ -1827,10 +1828,6 @@ _gabble_muc_channel_member_presence_updated (GabbleMucChannel *chan,
 
   mixin = TP_GROUP_MIXIN (chan);
 
-  item_node = lm_message_node_get_child (x_node, "item");
-  /* muc-factory already checked that */
-  g_assert (item_node != NULL);
-
   node = lm_message_node_get_child (x_node, "status");
   if (node)
     {
diff --git a/src/muc-channel.h b/src/muc-channel.h
index 8cc0db5..7dea57d 100644
--- a/src/muc-channel.h
+++ b/src/muc-channel.h
@@ -86,7 +86,8 @@ gboolean _gabble_muc_channel_is_ready (GabbleMucChannel *chan);
 void _gabble_muc_channel_presence_error (GabbleMucChannel *chan,
     const gchar *jid, LmMessageNode *pres_node);
 void _gabble_muc_channel_member_presence_updated (GabbleMucChannel *chan,
-    TpHandle handle, LmMessage *message, LmMessageNode *x_node);
+    TpHandle handle, LmMessage *message, LmMessageNode *x_node,
+    LmMessageNode *item_node);
 void _gabble_muc_channel_handle_subject (GabbleMucChannel *chan,
     TpChannelTextMessageType msg_type, TpHandleType handle_type,
     TpHandle sender, time_t timestamp, const gchar *subject, LmMessage *msg);
diff --git a/src/muc-factory.c b/src/muc-factory.c
index 6ed246d..acdcf50 100644
--- a/src/muc-factory.c
+++ b/src/muc-factory.c
@@ -930,7 +930,7 @@ muc_factory_presence_cb (LmMessageHandler *handler,
             }
 
           _gabble_muc_channel_member_presence_updated (muc_chan, handle,
-                                                       msg, x_node);
+              msg, x_node, item_node);
           tp_handle_unref (contact_repo, handle);
         }
       else
-- 
1.5.6.5