[asterisk-commits] russell: branch murf/bug11210 r99425 - in /team/murf/bug11210: ./ channels/

[SVN commits to the Asterisk project]

Author: russell
Date: Mon Jan 21 17:35:08 2008
New Revision: 99425

URL: http://svn.digium.com/view/asterisk?view=rev&rev=99425
Log:
sync with trunk

Modified:
    team/murf/bug11210/   (props changed)
    team/murf/bug11210/channels/chan_zap.c

Change Statistics:
 team/murf/bug11210/channels/chan_zap.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Propchange: team/murf/bug11210/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 21 17:35:08 2008
@@ -1,1 +1,1 @@
-/trunk:1-99416
+/trunk:1-99424

Modified: team/murf/bug11210/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug11210/channels/chan_zap.c?view=diff&rev=99425&r1=99424&r2=99425
==============================================================================
--- team/murf/bug11210/channels/chan_zap.c (original)
+++ team/murf/bug11210/channels/chan_zap.c Mon Jan 21 17:35:08 2008
@@ -454,8 +454,6 @@
 #define POLARITY_IDLE   0
 #define POLARITY_REV    1
 
-
-static struct zt_distRings drings;
 
 struct distRingData {
 	int ring[3];
@@ -8356,7 +8354,7 @@
 			tmp->permcallwaiting = 0;
 		/* Flag to destroy the channel must be cleared on new mkif.  Part of changes for reload to work */
 		tmp->destroy = 0;
-		tmp->drings = drings;
+		tmp->drings = conf.chan.drings;
 		tmp->usedistinctiveringdetection = usedistinctiveringdetection;
 		tmp->callwaitingcallerid = conf.chan.callwaitingcallerid;
 		tmp->threewaycalling = conf.chan.threewaycalling;
@@ -13149,7 +13147,7 @@
 		} else if (!strcasecmp(v->name, "dring3context")) {
 			ast_copy_string(confp->chan.drings.ringContext[2].contextData,v->value,sizeof(confp->chan.drings.ringContext[2].contextData));
 		} else if (!strcasecmp(v->name, "dring1range")) {
-			drings.ringnum[0].range = atoi(v->value);
+			confp->chan.drings.ringnum[0].range = atoi(v->value);
 			/* 10 is a nice default. */
 			if (confp->chan.drings.ringnum[0].range == 0)
 				confp->chan.drings.ringnum[0].range = 10;