[Asterisk-cvs] asterisk/channels chan_zap.c,1.225,1.226

[markster at lists.digium.com]

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

Modified Files:
	chan_zap.c 
Log Message:
Don't automatically send proceeding/alerting


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -d -r1.225 -r1.226
--- chan_zap.c	15 May 2004 22:50:51 -0000	1.225
+++ chan_zap.c	19 May 2004 14:51:11 -0000	1.226
@@ -3949,7 +3949,11 @@
 			if (!p->proceeding && p->sig==SIG_PRI && p->pri && p->pri->overlapdial) {
 				if (p->pri->pri) {		
 					if (!pri_grab(p, p->pri)) {
+#ifdef PRI_PROGRESS
+						pri_progress(p->pri->pri,p->call);
+#else						
 						pri_acknowledge(p->pri->pri,p->call, p->prioffset, 1);
+#endif						
 						pri_rel(p->pri);
 					}
 					else
@@ -6513,7 +6517,9 @@
 						if (res < 0)
 							ast_log(LOG_WARNING, "Unable to set gains on channel %d\n", pri->pvt[chan]->channel);
 						if (e->ring.complete || !pri->overlapdial) {
-							pri_acknowledge(pri->pri, e->ring.call, chan, 1);
+							/* We don't send acknowledge here because that means ringing, and that
+							   isn't necessarily the case */
+							/* pri_acknowledge(pri->pri, e->ring.call, chan, 1); */
 						} else  {
 							pri_need_more_info(pri->pri, e->ring.call, chan, 1);
 						}