[Telepathy-commits] [telepathy-gabble/master] always put the size attribute in view requests

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Mon Oct 13 08:57:06 PDT 2008


---
 src/olpc-activity-view.c                   |    2 ++
 src/olpc-buddy-view.c                      |    2 ++
 tests/twisted/olpc/olpc-activity-search.py |    2 ++
 tests/twisted/olpc/olpc-buddy-search.py    |    2 ++
 4 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/olpc-activity-view.c b/src/olpc-activity-view.c
index 0894e85..683c49e 100644
--- a/src/olpc-activity-view.c
+++ b/src/olpc-activity-view.c
@@ -318,6 +318,7 @@ gabble_olpc_activity_view_send_request (GabbleOlpcView *view,
           '(', "view", "",
               '@', "xmlns", NS_OLPC_ACTIVITY,
               '@', "id", id_str,
+              '@', "size", max_str,
               '(', "activity", "",
                 '(', "properties", "",
                   '*', &properties_node,
@@ -343,6 +344,7 @@ gabble_olpc_activity_view_send_request (GabbleOlpcView *view,
           '(', "view", "",
               '@', "xmlns", NS_OLPC_ACTIVITY,
               '@', "id", id_str,
+              '@', "size", max_str,
               '(', "activity", "",
                 '*', &activity_node,
               ')',
diff --git a/src/olpc-buddy-view.c b/src/olpc-buddy-view.c
index f5d9bd1..0901c1b 100644
--- a/src/olpc-buddy-view.c
+++ b/src/olpc-buddy-view.c
@@ -280,6 +280,7 @@ gabble_olpc_buddy_view_send_request (GabbleOlpcView *view,
         '(', "view", "",
             '@', "xmlns", NS_OLPC_BUDDY,
             '@', "id", id_str,
+            '@', "size", max_str,
             '(', "buddy", "",
               '(', "properties", "",
                 '*', &properties_node,
@@ -299,6 +300,7 @@ gabble_olpc_buddy_view_send_request (GabbleOlpcView *view,
         '(', "view", "",
             '@', "xmlns", NS_OLPC_BUDDY,
             '@', "id", id_str,
+            '@', "size", max_str,
             '(', "buddy", "",
               '@', "alias", priv->alias,
             ')',
diff --git a/tests/twisted/olpc/olpc-activity-search.py b/tests/twisted/olpc/olpc-activity-search.py
index 4c23759..c46cf0b 100644
--- a/tests/twisted/olpc/olpc-activity-search.py
+++ b/tests/twisted/olpc/olpc-activity-search.py
@@ -199,6 +199,7 @@ def test(q, bus, conn, stream):
     view = iq_event.stanza.firstChildElement()
     assert view.name == 'view'
     assert view['id'] == '2'
+    assert view['size'] == '5'
 
     send_reply_to_activity_view_request(stream, iq_event.stanza,
             [('activity2', 'room2 at conference.localhost',
@@ -254,6 +255,7 @@ def test(q, bus, conn, stream):
     view = iq_event.stanza.firstChildElement()
     assert view.name == 'view'
     assert view['id'] == '3'
+    assert view['size'] == '5'
     assert len(buddies) == 2
     assert (buddies[0]['jid'], buddies[1]['jid']) == ('alice at localhost',
             'bob at localhost')
diff --git a/tests/twisted/olpc/olpc-buddy-search.py b/tests/twisted/olpc/olpc-buddy-search.py
index 0540dbf..9207e90 100644
--- a/tests/twisted/olpc/olpc-buddy-search.py
+++ b/tests/twisted/olpc/olpc-buddy-search.py
@@ -236,6 +236,7 @@ def test(q, bus, conn, stream):
     view = iq_event.stanza.firstChildElement()
     assert view.name == 'view'
     assert view['id'] == '2'
+    assert view['size'] == '10'
 
     # reply to request
     reply = make_result_iq(stream, iq_event.stanza)
@@ -344,6 +345,7 @@ def test(q, bus, conn, stream):
     view = iq_event.stanza.firstChildElement()
     assert view.name == 'view'
     assert view['id'] == '3'
+    assert view['size'] == '10'
     buddy = xpath.queryForNodes('/iq/view/buddy', iq_event.stanza)
     assert len(buddy) == 1
     assert buddy[0]['alias'] == 'tom'
-- 
1.5.6.5




More information about the Telepathy-commits mailing list