Merged revisions 89296 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Thu, 15 Nov 2007 17:27:27 +0000 (17:27 +0000)
committerRussell Bryant <russell@russellbryant.com>
Thu, 15 Nov 2007 17:27:27 +0000 (17:27 +0000)
commit1bf63d1c5bbbaa1977e4c7c3edb47d32983db31c
tree57838f3a3d79b6c02123b58d0df48216fe27ee92
parenteee92d08815ae7120d192c328f9225aab6383081
Merged revisions 89296 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89296 | russell | 2007-11-15 11:19:28 -0600 (Thu, 15 Nov 2007) | 8 lines

Update the SLAStation application to account for the case where the SLA thread
has a call out to the station,  but the user has pressed a line button to answer
the call instead of picking up the handset.  If they do, the phone sends out a
new INVITE.  So, the SLAStation app must check to see if it is picking up a
ringing trunk, and ensure that the other stations stop ringing.

(reported internally, patched by me, tested by mogorman)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89297 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_meetme.c