diff options
| author | Joshua Colp <jcolp@digium.com> | 2012-07-09 16:27:47 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2012-07-09 16:27:47 +0000 |
| commit | 540f4b81f918c1a3d2d2fac952dc8d63abc382f7 (patch) | |
| tree | da1a8089dd59d3c85f8d37e4aead414fa3a4a343 | |
| parent | fa0bcb6c70713ea80df43d08de104fc76a9c7edf (diff) | |
Add additional namespaces for Google Talk which are used for the gmail client.
(closes issue ASTERISK-20101)
Reported by: Malcolm Davenport
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@369816 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | res/res_xmpp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/res/res_xmpp.c b/res/res_xmpp.c index 8428e3d09..63e6384c7 100644 --- a/res/res_xmpp.c +++ b/res/res_xmpp.c @@ -2185,7 +2185,7 @@ static void xmpp_client_set_presence(struct ast_xmpp_client *client, const char iks_insert_node(presence, priority); iks_insert_attrib(cnode, "node", "http://www.asterisk.org/xmpp/client/caps"); iks_insert_attrib(cnode, "ver", "asterisk-xmpp"); - iks_insert_attrib(cnode, "ext", "voice-v1"); + iks_insert_attrib(cnode, "ext", "voice-v1 video-v1 camera-v1"); iks_insert_attrib(cnode, "xmlns", "http://jabber.org/protocol/caps"); iks_insert_node(presence, cnode); ast_xmpp_client_send(client, presence); @@ -3084,7 +3084,9 @@ static int xmpp_pak_presence(struct ast_xmpp_client *client, struct ast_xmpp_cli if (iks_find_with_attrib(pak->x, "c", "node", "http://www.google.com/xmpp/client/caps") || iks_find_with_attrib(pak->x, "caps:c", "node", "http://www.google.com/xmpp/client/caps") || iks_find_with_attrib(pak->x, "c", "node", "http://www.android.com/gtalk/client/caps") || - iks_find_with_attrib(pak->x, "caps:c", "node", "http://www.android.com/gtalk/client/caps")) { + iks_find_with_attrib(pak->x, "caps:c", "node", "http://www.android.com/gtalk/client/caps") || + iks_find_with_attrib(pak->x, "c", "node", "http://mail.google.com/xmpp/client/caps") || + iks_find_with_attrib(pak->x, "caps:c", "node", "http://mail.google.com/xmpp/client/caps")) { resource->caps.google = 1; } |