summaryrefslogtreecommitdiff
path: root/tests/twisted/ns.py
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2010-06-10 14:28:48 +0100
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2010-06-10 14:28:48 +0100
commitb7dcafcaa3cf72b3cd6a6948a068970b36b552b5 (patch)
tree64312d4caa52221623829e3161e9faa2c6fcd0a8 /tests/twisted/ns.py
parent8dbdeedb09d5253dd3b8f558892b772dba8be0d5 (diff)
parent1513b23d9fe474d25e113a9f051f6b8e0429db16 (diff)
Merge branch 'igoogle-merge-test'
Diffstat (limited to 'tests/twisted/ns.py')
-rw-r--r--tests/twisted/ns.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/twisted/ns.py b/tests/twisted/ns.py
index c9008022d..d9b290fff 100644
--- a/tests/twisted/ns.py
+++ b/tests/twisted/ns.py
@@ -8,6 +8,7 @@ FEATURE_NEG = 'http://jabber.org/protocol/feature-neg'
FILE_TRANSFER = 'http://jabber.org/protocol/si/profile/file-transfer'
GEOLOC = 'http://jabber.org/protocol/geoloc'
GOOGLE_FEAT_SESSION = 'http://www.google.com/xmpp/protocol/session'
+GOOGLE_FEAT_SHARE = 'http://google.com/xmpp/protocol/share/v1'
GOOGLE_FEAT_VOICE = 'http://www.google.com/xmpp/protocol/voice/v1'
GOOGLE_FEAT_VIDEO = 'http://www.google.com/xmpp/protocol/video/v1'
GOOGLE_JINGLE_INFO = 'google:jingleinfo'
@@ -15,6 +16,7 @@ GOOGLE_P2P = "http://www.google.com/transport/p2p"
GOOGLE_QUEUE = 'google:queue'
GOOGLE_ROSTER = 'google:roster'
GOOGLE_SESSION = "http://www.google.com/session"
+GOOGLE_SESSION_SHARE = "http://www.google.com/session/share"
GOOGLE_SESSION_PHONE = "http://www.google.com/session/phone"
GOOGLE_SESSION_VIDEO = "http://www.google.com/session/video"
GOOGLE_MAIL_NOTIFY = "google:mail:notify"