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
........


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

channels/chan_zap.c

@@ -9632,7 +9632,6 @@ static void *ss7_linkset(void *data)
 					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 @@ static void *ss7_linkset(void *data)
 					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;