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

[SVN commits to the Asterisk project]

Author: file
Date: Thu Oct 11 16:19:33 2012
New Revision: 374878

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=374878
Log:
Fix a bug where audio on Google Voice would not work due to ignoring candidates.

Instead of ignoring parts of the message that are not known just ignore the ones
we know may be present and that would cause a problem.
........

Merged revisions 374877 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=374878&r1=374877&r2=374878
==============================================================================
--- trunk/channels/chan_motif.c (original)
+++ trunk/channels/chan_motif.c Thu Oct 11 16:19:33 2012
@@ -2117,8 +2117,8 @@
 		struct ast_rtp_instance *rtp = NULL;
 		iks *description, *transport;
 
-		if (strcmp(iks_name(content), "content") &&
-		    strcmp(iks_name(content), "jin:content")) {
+		/* Ignore specific parts if they are known not to be useful */
+		if (!strcmp(iks_name(content), "conference-info")) {
 			continue;
 		}