[asterisk-commits] branch group/asterisk-xmpp r29517 - in /team/group/asterisk-xmpp: ./ res/

[asterisk-commits at lists.digium.com]

Author: mogorman
Date: Mon May 22 15:33:35 2006
New Revision: 29517

URL: http://svn.digium.com/view/asterisk?rev=29517&view=rev
Log:
Merged revisions 29514 via svnmerge from 
https://svn.digium.com/svn/asterisk/trunk

................
r29514 | file | 2006-05-22 15:19:00 -0500 (Mon, 22 May 2006) | 10 lines

Merged revisions 29512 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r29512 | file | 2006-05-22 17:15:04 -0300 (Mon, 22 May 2006) | 2 lines

Use the correct language when playing the transfer sound (issue #7109 reported by casper)

........

................

Modified:
    team/group/asterisk-xmpp/   (props changed)
    team/group/asterisk-xmpp/res/res_features.c

Propchange: team/group/asterisk-xmpp/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/group/asterisk-xmpp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon May 22 15:33:35 2006
@@ -1,1 +1,1 @@
-/trunk:1-29492
+/trunk:1-29516

Modified: team/group/asterisk-xmpp/res/res_features.c
URL: http://svn.digium.com/view/asterisk/team/group/asterisk-xmpp/res/res_features.c?rev=29517&r1=29516&r2=29517&view=diff
==============================================================================
--- team/group/asterisk-xmpp/res/res_features.c (original)
+++ team/group/asterisk-xmpp/res/res_features.c Mon May 22 15:33:35 2006
@@ -638,7 +638,7 @@
 		if (option_verbose > 2)	
 			ast_verbose(VERBOSE_PREFIX_3 "Unable to find extension '%s' in context '%s'\n", xferto, transferer_real_context);
 	}
-	if (ast_stream_and_wait(transferer, xferfailsound, transferee->language, AST_DIGIT_ANY) < 0 ) {
+	if (ast_stream_and_wait(transferer, xferfailsound, transferer->language, AST_DIGIT_ANY) < 0 ) {
 		finishup(transferee);
 		return -1;
 	}