[asterisk-commits] russell: branch group/http_mods r60567 - in /team/group/http_mods: ./ apps/

[asterisk-commits at lists.digium.com]

Author: russell
Date: Fri Apr  6 14:56:37 2007
New Revision: 60567

URL: http://svn.digium.com/view/asterisk?view=rev&rev=60567
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:
    team/group/http_mods/   (props changed)
    team/group/http_mods/apps/app_meetme.c

Propchange: team/group/http_mods/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Apr  6 14:56:37 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-60541
+/branches/1.4:1-60566

Modified: team/group/http_mods/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/group/http_mods/apps/app_meetme.c?view=diff&rev=60567&r1=60566&r2=60567
==============================================================================
--- team/group/http_mods/apps/app_meetme.c (original)
+++ team/group/http_mods/apps/app_meetme.c Fri Apr  6 14:56:37 2007
@@ -4182,6 +4182,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);