[Asterisk-cvs] asterisk/channels chan_zap.c,1.230,1.231

[markster at lists.digium.com]

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

Modified Files:
	chan_zap.c 
Log Message:
Update for newer libpri


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -d -r1.230 -r1.231
--- chan_zap.c	19 May 2004 15:40:01 -0000	1.230
+++ chan_zap.c	19 May 2004 21:02:11 -0000	1.231
@@ -3854,7 +3854,7 @@
 		if (p->pri->pri) {		
 			if (!pri_grab(p, p->pri)) {
 #ifdef PRI_PROGRESS
-					pri_progress(p->pri->pri,p->call, 1);
+					pri_progress(p->pri->pri,p->call, p->prioffset, 1);
 #else						
 					pri_acknowledge(p->pri->pri,p->call, p->prioffset, 1);
 #endif						
@@ -3968,7 +3968,7 @@
 				if (p->pri->pri) {		
 					if (!pri_grab(p, p->pri)) {
 #ifdef PRI_PROGRESS
-						pri_progress(p->pri->pri,p->call, 1);
+						pri_progress(p->pri->pri,p->call, p->prioffset, 1);
 #else						
 						pri_acknowledge(p->pri->pri,p->call, p->prioffset, 1);
 #endif						
@@ -6536,10 +6536,10 @@
 							ast_log(LOG_WARNING, "Unable to set gains on channel %d\n", pri->pvt[chan]->channel);
 						if (e->ring.complete || !pri->overlapdial) {
 							/* Just announce proceeding */
-#ifdef PRI_PROCEEDING
-							pri_proceeding(pri->pri, e->ring.call, 0);
+#ifdef PRI_PROCEEDING_FULL
+							pri_proceeding(pri->pri, e->ring.call, chan, 0);
 #else
-#warning "You need newer libpri!"
+#warning "You need a newer libpri!"
 #endif							
 						} else  {
 							pri_need_more_info(pri->pri, e->ring.call, chan, 1);