[asterisk-commits] russell: trunk r60566 - in /trunk: ./ apps/app_meetme.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Fri Apr  6 14:52:12 2007
New Revision: 60566

URL: http://svn.digium.com/view/asterisk?view=rev&rev=60566
Log:
Merged revisions 60565 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r60565 | russell | 2007-04-06 14:50:52 -0500 (Fri, 06 Apr 2007) | 3 lines

When a station picks up a trunk that was on hold, make the hints reflect that
nobody has the trunk on hold anymore.

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_meetme.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?view=diff&rev=60566&r1=60565&r2=60566
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Fri Apr  6 14:52:12 2007
@@ -4192,6 +4192,7 @@
 		trunk_ref->trunk->on_hold) {
 		trunk_ref->trunk->on_hold = 0;
 		ast_indicate(trunk_ref->trunk->chan, AST_CONTROL_UNHOLD);
+		sla_change_trunk_state(trunk_ref->trunk, SLA_TRUNK_STATE_UP, ALL_TRUNK_REFS, NULL);
 	}
 
 	snprintf(conf_name, sizeof(conf_name), "SLA_%s", trunk_ref->trunk->name);