diff options
author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-05 22:01:52 +0000 |
---|---|---|
committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-05 22:01:52 +0000 |
commit | 16e41447aeb53deec45a88d41ae87bea4bdf89e8 (patch) | |
tree | c69b98b3a5cfa0cdafa1e292f46fa254ba02f619 /include | |
parent | 047955e8edd1491c7a35cf780d2cf3ed7672727b (diff) |
Merged revisions 290479 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r290479 | dvossel | 2010-10-05 17:00:43 -0500 (Tue, 05 Oct 2010) | 6 lines
Fixes chan_gtalk to work with gmail client
This patch was written by Philippe Sultan (phsultan). Thanks
for keeping this up to date!
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@290480 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/jabber.h | 1 | ||||
-rw-r--r-- | include/asterisk/jingle.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/asterisk/jabber.h b/include/asterisk/jabber.h index 5f5dd14f3..3965f7a0f 100644 --- a/include/asterisk/jabber.h +++ b/include/asterisk/jabber.h @@ -72,6 +72,7 @@ */ #define AJI_MAX_JIDLEN 3071 #define AJI_MAX_RESJIDLEN 1023 +#define AJI_MAX_ATTRLEN 256 #define MUC_NS "http://jabber.org/protocol/muc" diff --git a/include/asterisk/jingle.h b/include/asterisk/jingle.h index 7442d9aca..bbe86c8f2 100644 --- a/include/asterisk/jingle.h +++ b/include/asterisk/jingle.h @@ -44,6 +44,9 @@ #define JINGLE_DTMF_NS "urn:xmpp:tmp:jingle:dtmf" #define GOOGLE_NS "http://www.google.com/session" +#define GOOGLE_AUDIO_NS "http://www.google.com/session/phone" +#define GOOGLE_VIDEO_NS "http://www.google.com/session/video" +#define GOOGLE_TRANSPORT_NS "http://www.google.com/transport/p2p" #define JINGLE_SID "sid" #define GOOGLE_SID "id" |