diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-16 13:37:42 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-16 13:37:42 +0000 |
commit | bf4efcfe09ed0b11c9e1a70aff74791780ffc047 (patch) | |
tree | 1255efeb32eecfad984d105481b0273df3a27c46 /docs/tubes.xml | |
parent | d0db83fceb67f1324c492dd196bfd6632470eb43 (diff) | |
download | telepathy-gabble-bf4efcfe09ed0b11c9e1a70aff74791780ffc047.tar.gz |
Explicitly indicate the protocol for each tube
20071016133742-53eee-2633109282283b75f2af28c40c8d3eeea193411e.gz
Diffstat (limited to 'docs/tubes.xml')
-rw-r--r-- | docs/tubes.xml | 49 |
1 files changed, 14 insertions, 35 deletions
diff --git a/docs/tubes.xml b/docs/tubes.xml index e80a6d61d..99d069fdf 100644 --- a/docs/tubes.xml +++ b/docs/tubes.xml @@ -109,9 +109,6 @@ } See below for how the dbus-name is generated. - - The protocol SHOULD be included. If it is omitted, - muc-bytestream should be assumed for MUC D-Bus tubes. --> <presence to='darkcave@conf.macbeth.lit' from='darkcave@conf.macbeth.lit/FirstWitch'> @@ -120,8 +117,7 @@ <tubes xmlns='http://telepathy.freedesktop.org/xmpp/tubes'> <tube type='dbus' initiator='darkcave@conf.macbeth.lit/FirstWitch' service='lit.macbeth.BubblingCauldron' stream-id='12345' - id='54321' dbus-name=':2.Rmlyc3RXaXRjaAAA' - protocol='http://telepathy.freedesktop.org/xmpp/muc-bytestream'> + id='54321' dbus-name=':2.Rmlyc3RXaXRjaAAA'> <parameters> <parameter name='s' type='str'>hello</parameter> <parameter name='ay' type='bytes'>aGVsbG8=</parameter> @@ -146,8 +142,7 @@ <tubes xmlns='http://telepathy.freedesktop.org/xmpp/tubes'> <tube type='dbus' initiator='darkcave@conf.macbeth.lit/FirstWitch' service='lit.macbeth.BubblingCauldron' stream-id='12345' - id='54321' dbus-name=':2.U2Vjb25kIHdpdGNo' - protocol='http://telepathy.freedesktop.org/xmpp/muc-bytestream'> + id='54321' dbus-name=':2.U2Vjb25kIHdpdGNo'> <parameters> <parameter name='s' type='str'>hello</parameter> <parameter name='ay' type='bytes'>aGVsbG8=</parameter> @@ -163,8 +158,7 @@ <example caption='Sending data in a MUC D-Bus tube'> <![CDATA[ <!-- The second witch sends a D-Bus signal to everyone. - MUC D-Bus tubes currently always use MUC Bytestreams - (XEP-proto-muc-bytestream). + MUC D-Bus tubes always use MUC Bytestreams (XEP-proto-muc-bytestream). Messages can also go to a particular participant (for method calls and replies), and can be split up if too big - see the MUC Bytestreams @@ -197,8 +191,7 @@ it's not part of the stream tube --> <tube type='dbus' initiator='darkcave@conf.macbeth.lit/FirstWitch' service='lit.macbeth.BubblingCauldron' stream-id='12345' - id='54321' dbus-name=':2.U2Vjb25kIHdpdGNo' - protocol='http://telepathy.freedesktop.org/xmpp/muc-bytestream'> + id='54321' dbus-name=':2.U2Vjb25kIHdpdGNo'> <parameters> <parameter name='s' type='str'>hello</parameter> <parameter name='ay' type='bytes'>aGVsbG8=</parameter> @@ -210,8 +203,7 @@ <!-- This is the new stream tube. There is no initiator attribute because the initiator is implicitly the participant whose presence it's seen in --> - <tube type='stream' service='webdav' id='666' - protocol='http://jabber.org/protocol/si'> + <tube type='stream' service='webdav' id='666'> <parameters> <parameter name='u' type='str'>anonymous</parameter> <parameter name='p' type='str'>password</parameter> @@ -273,8 +265,7 @@ <tubes xmlns='http://telepathy.freedesktop.org/xmpp/tubes'> <tube type='dbus' initiator='darkcave@conf.macbeth.lit/FirstWitch' service='lit.macbeth.BubblingCauldron' stream-id='12345' - id='54321' dbus-name=':2.Rmlyc3RXaXRjaAAA' - protocol='http://telepathy.freedesktop.org/xmpp/muc-bytestream'> + id='54321' dbus-name=':2.Rmlyc3RXaXRjaAAA'> <parameters> <parameter name='s' type='str'>hello</parameter> <parameter name='ay' type='bytes'>aGVsbG8=</parameter> @@ -460,8 +451,7 @@ <tubes xmlns='http://telepathy.freedesktop.org/xmpp/tubes'> <tube type='dbus' initiator='mercutio@mab' service='lit.verona.Duel' stream-id='8' - id='54321' dbus-name=':2.bWVyY3V0aW9AbWFi' - protocol='http://telepathy.freedesktop.org/xmpp/ll/rmulticast'> + id='54321' dbus-name=':2.bWVyY3V0aW9AbWFi'> <parameters> <parameter name='weapon' type='str'>swords</parameter> </parameters> @@ -480,9 +470,8 @@ <message type='groupchat'> <tubes xmlns='http://telepathy.freedesktop.org/xmpp/tubes'> <tube type='dbus' initiator='mercutio@mab' - service='lit.verona.Duel' stream-id='6' - id='54321' dbus-name=':2.VHliYWx0QGZlbGluZQAA' - protocol='http://telepathy.freedesktop.org/xmpp/ll/rmulticast'> + service='lit.macbeth.BubblingCauldron' stream-id='6' + id='54321' dbus-name=':2.VHliYWx0QGZlbGluZQAA'> <parameters> <parameter name='weapon' type='str'>swords</parameter> </parameters> @@ -531,8 +520,7 @@ <tubes xmlns='http://telepathy.freedesktop.org/xmpp/tubes'> <tube type='dbus' initiator='mercutio@mab' service='lit.verona.Duel' stream-id='8' - id='54321' dbus-name=':2.bWVyY3V0aW9AbWFi' - protocol='http://telepathy.freedesktop.org/xmpp/ll/rmulticast'> + id='54321' dbus-name=':2.bWVyY3V0aW9AbWFi'> <parameters> <parameter name='weapon' type='str'>swords</parameter> </parameters> @@ -545,8 +533,7 @@ <tubes xmlns='http://telepathy.freedesktop.org/xmpp/tubes'> <tube type='dbus' initiator='mercutio@mab' service='lit.verona.Duel' stream-id='6' - id='54321' dbus-name=':2.VHliYWx0QGZlbGluZQAA' - protocol='http://telepathy.freedesktop.org/xmpp/ll/rmulticast'> + id='54321' dbus-name=':2.VHliYWx0QGZlbGluZQAA'> <parameters> <parameter name='weapon' type='str'>swords</parameter> </parameters> @@ -566,8 +553,7 @@ it's not part of the stream tube --> <tube type='dbus' initiator='mercutio@mab' service='lit.verona.Duel' stream-id='8' - id='54321' dbus-name=':2.bWVyY3V0aW9AbWFi' - protocol='http://telepathy.freedesktop.org/xmpp/ll/rmulticast'> + id='54321' dbus-name=':2.bWVyY3V0aW9AbWFi'> <parameters> <parameter name='weapon' type='str'>swords</parameter> </parameters> @@ -576,8 +562,7 @@ <!-- This is the new stream tube. There is no initiator attribute because the initiator is implicitly the participant whose message it's seen in --> - <tube type='stream' service='webdav' id='666' - protocol='http://jabber.org/protocol/si'> + <tube type='stream' service='webdav' id='666'> <parameters> <parameter name='path' type='str'>/warez</parameter> </parameters> @@ -659,8 +644,7 @@ removed --> <tube type='dbus' initiator='mercutio@mab' service='lit.verona.Duel' stream-id='8' - id='54321' dbus-name=':2.bWVyY3V0aW9AbWFi' - protocol='http://telepathy.freedesktop.org/xmpp/ll/rmulticast'> + id='54321' dbus-name=':2.bWVyY3V0aW9AbWFi'> <parameters> <parameter name='weapon' type='str'>swords</parameter> </parameters> @@ -817,11 +801,6 @@ </xs:simpleType> </xs:attribute> <xs:attribute name='service' type='xs:string' use='required'/> - <!-- Implementations SHOULD include this attribute for D-Bus - tubes in a MUC context; if they do not, muc-bytestream MUST - be assumed. For all other tubes, this attribute MUST be included. - --> - <xs:attribute name='protocol' type='xs:anyURI' use='optional'/> <!-- MUC D-Bus tube attributes --> <!-- MUST be present for MUC D-Bus tubes, SHOULD NOT be |