[asterisk-commits] mattf: branch 1.6.0 r116798 - in /branches/1.6.0: ./ channels/chan_zap.c

[SVN commits to the Asterisk project]

Author: mattf
Date: Fri May 16 15:03:31 2008
New Revision: 116798

URL: http://svn.digium.com/view/asterisk?view=rev&rev=116798
Log:
Merged revisions 116797 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r116797 | mattf | 2008-05-16 15:00:04 -0500 (Fri, 16 May 2008) | 1 line

Try to see if we can make our ringback situation a little better
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_zap.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_zap.c?view=diff&rev=116798&r1=116797&r2=116798
==============================================================================
--- branches/1.6.0/channels/chan_zap.c (original)
+++ branches/1.6.0/channels/chan_zap.c Fri May 16 15:03:31 2008
@@ -9632,7 +9632,6 @@
 					break;
 				} else {
 					struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_PROCEEDING, };
-					struct ast_frame g = { AST_FRAME_CONTROL, AST_CONTROL_PROGRESS, };
 
 					p = linkset->pvts[chanpos];
 
@@ -9645,9 +9644,11 @@
 					ast_mutex_lock(&p->lock);
 					zap_queue_frame(p, &f, linkset);
 					p->proceeding = 1;
-					zap_queue_frame(p, &g, linkset);
-					p->progress = 1;
-
+					/* Send alerting if subscriber is free */
+					if (e->acm.called_party_status_ind == 1) {
+						p->alerting = 1;
+						p->subs[SUB_REAL].needringing = 1;
+					}
 					ast_mutex_unlock(&p->lock);
 				}
 				break;