[svn-commits] file: trunk r369816 - /trunk/res/res_xmpp.c

[SVN commits to the Digium repositories]

Author: file
Date: Mon Jul  9 11:27:47 2012
New Revision: 369816

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369816
Log:
Add additional namespaces for Google Talk which are used for the gmail client.

(closes issue ASTERISK-20101)
Reported by: Malcolm Davenport

Modified:
    trunk/res/res_xmpp.c

Modified: trunk/res/res_xmpp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_xmpp.c?view=diff&rev=369816&r1=369815&r2=369816
==============================================================================
--- trunk/res/res_xmpp.c (original)
+++ trunk/res/res_xmpp.c Mon Jul  9 11:27:47 2012
@@ -2185,7 +2185,7 @@
 	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 @@
 			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;
 			}