[asterisk-commits] russell: trunk r62332 - in /trunk: ./ channels/chan_zap.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Sun Apr 29 00:51:18 2007
New Revision: 62332

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

........
r62331 | russell | 2007-04-29 00:50:37 -0500 (Sun, 29 Apr 2007) | 3 lines

Fix a bug that made the "language" setting in zapata.conf not
functional.  (issue #9626, reported and fixed by sergee)

........

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=62332&r1=62331&r2=62332
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Sun Apr 29 00:51:18 2007
@@ -213,7 +213,6 @@
 static char defaultcic[64] = "";
 static char defaultozz[64] = "";
 
-static char language[MAX_LANGUAGE] = "";
 static char progzone[10] = "";
 
 static int usedistinctiveringdetection = 0;
@@ -7890,7 +7889,7 @@
 		tmp->canpark = conf.chan.canpark;
 		tmp->transfer = conf.chan.transfer;
 		ast_copy_string(tmp->defcontext,conf.chan.context,sizeof(tmp->defcontext));
-		ast_copy_string(tmp->language, language, sizeof(tmp->language));
+		ast_copy_string(tmp->language, conf.chan.language, sizeof(tmp->language));
 		ast_copy_string(tmp->mohinterpret, conf.chan.mohinterpret, sizeof(tmp->mohinterpret));
 		ast_copy_string(tmp->mohsuggest, conf.chan.mohsuggest, sizeof(tmp->mohsuggest));
 		ast_copy_string(tmp->context, conf.chan.context, sizeof(tmp->context));