diff options
| author | Paul Belanger <paul.belanger@polybeacon.com> | 2011-08-22 19:56:00 +0000 |
|---|---|---|
| committer | Paul Belanger <paul.belanger@polybeacon.com> | 2011-08-22 19:56:00 +0000 |
| commit | eb46a4128ac43bd43bf52fd7ba0859ce49eb09cf (patch) | |
| tree | c83e64ec9f19c5011e8d6c8275f83ade76c087d8 /channels | |
| parent | 4110af69768c996a7b2d6fbfcec280f2840bb3bf (diff) | |
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)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@332880 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_gtalk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index 8671c02d9..a15fca975 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -496,7 +496,7 @@ static int gtalk_ringing_ack(void *data, ikspak *pak) 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); |