[svn-commits] murf: trunk r76984 - in /trunk: ./ channels/chan_zap.c

[SVN commits to the Digium repositories]

Author: murf
Date: Tue Jul 24 19:34:42 2007
New Revision: 76984

URL: http://svn.digium.com/view/asterisk?view=rev&rev=76984
Log:
Merged revisions 76983 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r76983 | murf | 2007-07-24 18:18:32 -0600 (Tue, 24 Jul 2007) | 9 lines

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

........
r76978 | murf | 2007-07-24 18:07:24 -0600 (Tue, 24 Jul 2007) | 1 line

this fixes bug 10293, where the error message because defaultzone or loadzone was not defined was confusing
........

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

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

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

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?view=diff&rev=76984&r1=76983&r2=76984
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Tue Jul 24 19:34:42 2007
@@ -6972,7 +6972,7 @@
 					else
 						res = tone_zone_play_tone(i->subs[SUB_REAL].zfd, ZT_TONE_DIALTONE);
 					if (res < 0) 
-						ast_log(LOG_WARNING, "Unable to play dialtone on channel %d\n", i->channel);
+						ast_log(LOG_WARNING, "Unable to play dialtone on channel %d, do you have defaultzone and loadzone defined?\n", i->channel);
 					if (ast_pthread_create_detached(&threadid, NULL, ss_thread, chan)) {
 						ast_log(LOG_WARNING, "Unable to start simple switch thread on channel %d\n", i->channel);
 						res = tone_zone_play_tone(i->subs[SUB_REAL].zfd, ZT_TONE_CONGESTION);