summaryrefslogtreecommitdiff
path: root/include/asterisk
diff options
context:
space:
mode:
authorTerry Wilson <twilson@digium.com>2011-07-11 19:49:35 +0000
committerTerry Wilson <twilson@digium.com>2011-07-11 19:49:35 +0000
commit3b4d9075f6fb1f8317072cbb8c87597b13878206 (patch)
tree769e8a24df7d0032961fda42d59bc3a85dab4397 /include/asterisk
parent881173268c7277db4a5c379d8bbdb0e775c82099 (diff)
Merged revisions 327682 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r327682 | twilson | 2011-07-11 12:41:59 -0700 (Mon, 11 Jul 2011) | 9 lines Update chan_gtalk to work with changed GMail-based calls The messages sent by the GMail client have changed, but include the old-style messages as well. This patch checks for this case and uses the old-style offer. (closes issue ASTERISK-18084) Review: https://reviewboard.asterisk.org/r/1312/ ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@327683 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk')
-rw-r--r--include/asterisk/jingle.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asterisk/jingle.h b/include/asterisk/jingle.h
index bbe86c8f2..77820654c 100644
--- a/include/asterisk/jingle.h
+++ b/include/asterisk/jingle.h
@@ -44,6 +44,7 @@
#define JINGLE_DTMF_NS "urn:xmpp:tmp:jingle:dtmf"
#define GOOGLE_NS "http://www.google.com/session"
+#define GOOGLE_JINGLE_NS "urn:xmpp:jingle:1"
#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"