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)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62332 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 3703b40f9de6a0b2edbd18f00ea8313d5f73f8d2..47904b8183bbddfb7a6844e303df1718f99bba1b 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -213,7 +213,6 @@ static const char config[] = "zapata.conf";
 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 @@ static struct zt_pvt *mkintf(int channel, struct zt_chan_conf conf, struct zt_pr
                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));