[asterisk-commits] file: trunk r374834 - in /trunk: ./ channels/chan_motif.c

[SVN commits to the Asterisk project]

Author: file
Date: Thu Oct 11 08:34:52 2012
New Revision: 374834

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=374834
Log:
Consider the Google Talk content stanza name (jin:content) valid.
........

Merged revisions 374833 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/channels/chan_motif.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/channels/chan_motif.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_motif.c?view=diff&rev=374834&r1=374833&r2=374834
==============================================================================
--- trunk/channels/chan_motif.c (original)
+++ trunk/channels/chan_motif.c Thu Oct 11 08:34:52 2012
@@ -2111,7 +2111,8 @@
 		struct ast_rtp_instance *rtp = NULL;
 		iks *description, *transport;
 
-		if (strcmp(iks_name(content), "content")) {
+		if (strcmp(iks_name(content), "content") &&
+		    strcmp(iks_name(content), "jin:content")) {
 			continue;
 		}