[Telepathy-commits] [telepathy-gabble/master] use 'id' as attribute and not 'activity' to set activity's id in view replies

[Guillaume Desmottes]

20080611085735-7fe3f-94bf688222accca7ca15540e8dd62f8e90cd60cf.gz
---
 src/conn-olpc.c                            |    2 +-
 tests/twisted/olpc/olpc-activity-search.py |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/conn-olpc.c b/src/conn-olpc.c
index 5e92eb5..5905ead 100644
--- a/src/conn-olpc.c
+++ b/src/conn-olpc.c
@@ -3482,7 +3482,7 @@ activity_query_result_cb (GabbleConnection *conn,
           continue;
         }
 
-      act_id = lm_message_node_get_attribute (activity_node, "activity");
+      act_id = lm_message_node_get_attribute (activity_node, "id");
       if (act_id == NULL)
         {
           NODE_DEBUG (activity_node, "No activity ID, skipping");
diff --git a/tests/twisted/olpc/olpc-activity-search.py b/tests/twisted/olpc/olpc-activity-search.py
index 5bc1ffd..5843775 100644
--- a/tests/twisted/olpc/olpc-activity-search.py
+++ b/tests/twisted/olpc/olpc-activity-search.py
@@ -83,7 +83,7 @@ def test(q, bus, conn, stream):
     view = xpath.queryForNodes('/iq/view', reply)[0]
     activity = view.addElement((None, "activity"))
     activity['room'] = 'room1 at conference.localhost'
-    activity['activity'] = 'activity1'
+    activity['id'] = 'activity1'
     properties = activity.addElement((NS_OLPC_ACTIVITY_PROPS, "properties"))
     property = properties.addElement((None, "property"))
     property['type'] = 'str'
@@ -155,7 +155,7 @@ def test(q, bus, conn, stream):
     view = xpath.queryForNodes('/iq/view', reply)[0]
     activity = view.addElement((None, "activity"))
     activity['room'] = 'room2 at conference.localhost'
-    activity['activity'] = 'activity2'
+    activity['id'] = 'activity2'
     properties = activity.addElement((NS_OLPC_ACTIVITY_PROPS, "properties"))
     property = properties.addElement((None, "property"))
     property['type'] = 'str'
@@ -205,7 +205,7 @@ def test(q, bus, conn, stream):
     view = xpath.queryForNodes('/iq/view', reply)[0]
     activity = view.addElement((None, "activity"))
     activity['room'] = 'room2 at conference.localhost'
-    activity['activity'] = 'activity2'
+    activity['id'] = 'activity2'
     properties = activity.addElement((NS_OLPC_ACTIVITY_PROPS, "properties"))
     property = properties.addElement((None, "property"))
     property['type'] = 'str'
-- 
1.5.6.5