[telepathy-gabble/master] Change ..._channel_presence_updated to take the LmMessageNode, not LmMessage.

Vivek Dasmohapatra vivek at collabora.co.uk
Sun Dec 27 11:34:13 PST 2009


---
 src/tubes-channel.c |    6 +++---
 src/tubes-channel.h |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/tubes-channel.c b/src/tubes-channel.c
index fcbf36b..856aa4d 100644
--- a/src/tubes-channel.c
+++ b/src/tubes-channel.c
@@ -807,7 +807,7 @@ contact_left_muc (GabbleTubesChannel *self,
 void
 gabble_tubes_channel_presence_updated (GabbleTubesChannel *self,
                                        TpHandle contact,
-                                       LmMessage *presence)
+                                       LmMessageNode *pnode)
 {
   GabbleTubesChannelPrivate *priv = GABBLE_TUBES_CHANNEL_GET_PRIVATE (self);
   LmMessageNode *tubes_node;
@@ -825,14 +825,14 @@ gabble_tubes_channel_presence_updated (GabbleTubesChannel *self,
 
   /* We are interested by this presence only if it contains tube information
    * or indicates someone left the muc */
-  presence_type = lm_message_node_get_attribute (presence->node, "type");
+  presence_type = lm_message_node_get_attribute (pnode, "type");
   if (!tp_strdiff (presence_type, "unavailable"))
     {
       contact_left_muc (self, contact);
       return;
     }
 
-  tubes_node = lm_message_node_get_child_with_namespace (presence->node,
+  tubes_node = lm_message_node_get_child_with_namespace (pnode,
       "tubes", NS_TUBES);
 
   if (tubes_node == NULL)
diff --git a/src/tubes-channel.h b/src/tubes-channel.h
index e00ac14..8f761f9 100644
--- a/src/tubes-channel.h
+++ b/src/tubes-channel.h
@@ -77,7 +77,7 @@ GabbleTubeIface *gabble_tubes_channel_tube_request (GabbleTubesChannel *self,
     gboolean require_new);
 
 void gabble_tubes_channel_presence_updated (GabbleTubesChannel *chan,
-    TpHandle contact, LmMessage *presence);
+    TpHandle contact, LmMessageNode *presence);
 
 void gabble_tubes_channel_tube_si_offered (GabbleTubesChannel *chan,
     GabbleBytestreamIface *bytestream, LmMessage *msg);
-- 
1.5.6.5




More information about the telepathy-commits mailing list