[asterisk-commits] pabelanger: trunk r332880 - in /trunk: ./ channels/chan_gtalk.c

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Mon Aug 22 14:56:00 2011
New Revision: 332880

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=332880
Log:
Merged revisions 332877 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r332877 | pabelanger | 2011-08-22 15:43:33 -0400 (Mon, 22 Aug 2011) | 13 lines
  
  Merged revisions 332876 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r332876 | pabelanger | 2011-08-22 15:41:24 -0400 (Mon, 22 Aug 2011) | 6 lines
    
    Revert previous commit
    
    It seems google is still making changes to the protocol.
    
    (issue ASTERISK-18301)
  ........
................

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

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

Modified: trunk/channels/chan_gtalk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_gtalk.c?view=diff&rev=332880&r1=332879&r2=332880
==============================================================================
--- trunk/channels/chan_gtalk.c (original)
+++ trunk/channels/chan_gtalk.c Mon Aug 22 14:56:00 2011
@@ -496,7 +496,7 @@
 				break;
 			}
 			if (!strcasecmp(name, "error") &&
-				(redirect = iks_find_cdata(traversenodes, "sta:redirect")) &&
+				(redirect = iks_find_cdata(traversenodes, "redirect")) &&
 				(redirect = strstr(redirect, "xmpp:"))) {
 				redirect += 5;
 				ast_debug(1, "redirect %s\n", redirect);