Mercurial > pidgin
comparison libpurple/protocols/jabber/namespaces.h @ 29812:1e8dc177415e
propagate from branch 'im.pidgin.pidgin' (head 267f28808ab6eeda6b5d68f6433f2b3fcf230d4f)
to branch 'im.pidgin.cpw.malu.ft_thumbnails' (head e638c5bb96c2400620511beaf38c52bedb56db4b)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Thu, 18 Feb 2010 21:59:26 +0000 |
| parents | 9ab75ab032b4 172a37a43a30 |
| children | 885ceb384678 |
comparison
equal
deleted
inserted
replaced
| 29401:bc2760c74a79 | 29812:1e8dc177415e |
|---|---|
| 86 #define NS_BOB "urn:xmpp:bob" | 86 #define NS_BOB "urn:xmpp:bob" |
| 87 | 87 |
| 88 /* XEP-0237 Roster Versioning */ | 88 /* XEP-0237 Roster Versioning */ |
| 89 #define NS_ROSTER_VERSIONING "urn:xmpp:features:rosterver" | 89 #define NS_ROSTER_VERSIONING "urn:xmpp:features:rosterver" |
| 90 | 90 |
| 91 /* XEP-0264 File Transfer Thumbnails (Thumbs) */ | |
| 92 #define NS_THUMBS "urn:xmpp:thumbs:0" | |
| 93 | |
| 91 /* Google extensions */ | 94 /* Google extensions */ |
| 92 #define NS_GOOGLE_CAMERA "http://www.google.com/xmpp/protocol/camera/v1" | 95 #define NS_GOOGLE_CAMERA "http://www.google.com/xmpp/protocol/camera/v1" |
| 93 #define NS_GOOGLE_VIDEO "http://www.google.com/xmpp/protocol/video/v1" | 96 #define NS_GOOGLE_VIDEO "http://www.google.com/xmpp/protocol/video/v1" |
| 94 #define NS_GOOGLE_VOICE "http://www.google.com/xmpp/protocol/voice/v1" | 97 #define NS_GOOGLE_VOICE "http://www.google.com/xmpp/protocol/voice/v1" |
| 95 #define NS_GOOGLE_JINGLE_INFO "google:jingleinfo" | 98 #define NS_GOOGLE_JINGLE_INFO "google:jingleinfo" |