Merged revisions 133296 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r133296 | qwell | 2008-07-23 16:50:20 -0500 (Wed, 23 Jul 2008) | 9 lines

Merged revisions 133295 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r133295 | qwell | 2008-07-23 16:49:03 -0500 (Wed, 23 Jul 2008) | 1 line

inbandrelease is gone - it's now inbanddisconnect
........

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


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

channels/chan_dahdi.c

@@ -8304,7 +8304,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
 						pris[span].minidle = conf->pri.minidle;
 						pris[span].overlapdial = conf->pri.overlapdial;
 #ifdef HAVE_PRI_INBANDDISCONNECT
-						pris[span].inbanddisconnect = conf->pri.inbandrelease;
+						pris[span].inbanddisconnect = conf->pri.inbanddisconnect;
 #endif
 						pris[span].facilityenable = conf->pri.facilityenable;
 						ast_copy_string(pris[span].idledial, conf->pri.idledial, sizeof(pris[span].idledial));
@@ -11335,7 +11335,7 @@ static int start_pri(struct dahdi_pri *pri)
 			pri->overlapdial |= DAHDI_OVERLAPDIAL_BOTH;
 		pri_set_overlapdial(pri->dchans[i],(pri->overlapdial & DAHDI_OVERLAPDIAL_OUTGOING)?1:0);
 #ifdef HAVE_PRI_INBANDDISCONNECT
-		pri_set_inbanddisconnect(pri->dchans[i], pri->inbandrelease);
+		pri_set_inbanddisconnect(pri->dchans[i], pri->inbanddisconnect);
 #endif
 		/* Enslave to master if appropriate */
 		if (i)