From: Mark Spencer <markster@digium.com>
Date: Wed, 19 May 2004 15:11:27 +0000 (+0000)
Subject: Don't qualify with overlap dial anymore
X-Git-Tag: 1.0.0-rc1~435
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce55c480e96ffb8fca239c929329152c45b6cea8;p=thirdparty%2Fasterisk.git

Don't qualify with overlap dial anymore


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

diff --git a/channels/Makefile b/channels/Makefile
index 32f611c92a..a5274a9c2c 100755
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -26,7 +26,7 @@ CHANNEL_LIBS=chan_modem.so chan_sip.so \
 # If you really want IAX1 uncomment the following, but it is
 # unmaintained
 #
-#CHANNEL_LIBS+=chan_iax.so
+CHANNEL_LIBS+=chan_iax.so
 
 #
 # If you really want VoFR you can have it :-P
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 84a6896e38..0ac13e620d 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -3850,7 +3850,7 @@ static int zt_write(struct ast_channel *ast, struct ast_frame *frame)
 	}
 	
 #ifdef PRI_EVENT_PROCEEDING
-	if (!p->proceeding && p->sig==SIG_PRI && p->pri && p->pri->overlapdial) {
+	if (!p->proceeding && p->sig==SIG_PRI && p->pri) {
 		if (p->pri->pri) {		
 			if (!pri_grab(p, p->pri)) {
 #ifdef PRI_PROGRESS
@@ -3936,7 +3936,7 @@ static int zt_indicate(struct ast_channel *chan, int condition)
 			break;
 		case AST_CONTROL_RINGING:
 #ifdef ZAPATA_PRI
-			if (!p->proceeding && p->sig==SIG_PRI && p->pri && p->pri->overlapdial) {
+			if (!p->proceeding && p->sig==SIG_PRI && p->pri) {
 				if (p->pri->pri) {		
 					if (!pri_grab(p, p->pri)) {
 						pri_acknowledge(p->pri->pri,p->call, p->prioffset, 1);
@@ -3964,7 +3964,7 @@ static int zt_indicate(struct ast_channel *chan, int condition)
 			ast_log(LOG_DEBUG,"Received AST_CONTROL_PROGRESS on %s\n",chan->name);
 #ifdef ZAPATA_PRI
 #ifdef PRI_EVENT_PROCEEDING
-			if (!p->proceeding && p->sig==SIG_PRI && p->pri && p->pri->overlapdial) {
+			if (!p->proceeding && p->sig==SIG_PRI && p->pri) {
 				if (p->pri->pri) {		
 					if (!pri_grab(p, p->pri)) {
 #ifdef PRI_PROGRESS