[Asterisk-cvs] asterisk/channels Makefile,1.49,1.50 chan_zap.c,1.227,1.228

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv23959/channels

Modified Files:
	Makefile chan_zap.c 
Log Message:
Don't qualify with overlap dial anymore


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/Makefile,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- Makefile	15 May 2004 22:42:25 -0000	1.49
+++ Makefile	19 May 2004 15:11:27 -0000	1.50
@@ -26,7 +26,7 @@
 # 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

Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -d -r1.227 -r1.228
--- chan_zap.c	19 May 2004 15:00:14 -0000	1.227
+++ chan_zap.c	19 May 2004 15:11:27 -0000	1.228
@@ -3850,7 +3850,7 @@
 	}
 	
 #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 @@
 			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 @@
 			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